summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt13
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/citra/CMakeLists.txt4
-rw-r--r--src/citra/citra.h9
-rw-r--r--src/common/CMakeLists.txt33
-rw-r--r--src/common/emu_window.h2
-rw-r--r--src/common/scm_rev.h4
-rw-r--r--src/core/CMakeLists.txt29
-rw-r--r--src/video_core/CMakeLists.txt20
9 files changed, 47 insertions, 68 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80acc1cb7..6f886b21b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,15 +9,9 @@ add_definitions(-DSINGLETHREADED)
# dependency checking
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests)
include(FindOpenGL REQUIRED)
-include(FindGLFW REQUIRED)
include(FindX11 REQUIRED)
-if(NOT GLFW_FOUND)
- message(FATAL_ERROR "glfw not found")
-else()
- include_directories(${GLFW_INCLUDE_DIRS})
-endif()
-
+include_directories(${GLFW_INCLUDE_DIRS})
option(DISABLE_QT4 "Disable Qt4 GUI" OFF)
if(NOT DISABLE_QT4)
include(FindQt4)
@@ -33,13 +27,10 @@ if(NOT DISABLE_QT4)
endif()
# external includes
-include_directories(${SDL2_INCLUDE_DIR})
include_directories(${OPENGL_INCLUDE_DIR})
# internal includes
-include_directories(src/common/src)
-include_directories(src/core/src)
-include_directories(src/citra/src)
+include_directories(src)
# process subdirectories
if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f988bf34e..0816147b8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,7 @@
add_subdirectory(common)
add_subdirectory(core)
add_subdirectory(citra)
+add_subdirectory(video_core)
if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4)
#add_subdirectory(citra_qt)
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt
index 3a76b5045..c6913df57 100644
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(SRCS src/citra.cpp
- src/emuwindow/emuwindow_glfw.cpp)
+set(SRCS citra.cpp
+ emu_window/emu_window_glfw.cpp)
# NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable)
if (NOT X11_xf86vmode_LIB)
diff --git a/src/citra/citra.h b/src/citra/citra.h
index b9254c5da..b3b78a2dc 100644
--- a/src/citra/citra.h
+++ b/src/citra/citra.h
@@ -4,12 +4,3 @@
#pragma once
-#include <string>
-
-#include "common/common.h"
-
-#define APP_NAME std::string("citra")
-#define APP_VERSION std::string("0.01-") + std::string(g_scm_rev_str)
-#define APP_TITLE (APP_NAME + " " + APP_VERSION)
-#define COPYRIGHT "Copyright (C) 2014 Citra Emulator"
-
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index c4f060db0..6cf0e61c8 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,18 +1,19 @@
-set(SRCS src/break_points.cpp
- src/console_listener.cpp
- src/extended_trace.cpp
- src/file_search.cpp
- src/file_util.cpp
- src/hash.cpp
- src/log_manager.cpp
- src/math_util.cpp
- src/mem_arena.cpp
- src/memory_util.cpp
- src/misc.cpp
- src/msg_handler.cpp
- src/string_util.cpp
- src/thread.cpp
- src/timer.cpp
- src/version.cpp)
+set(SRCS break_points.cpp
+ console_listener.cpp
+ extended_trace.cpp
+ file_search.cpp
+ file_util.cpp
+ hash.cpp
+ log_manager.cpp
+ math_util.cpp
+ mem_arena.cpp
+ memory_util.cpp
+ misc.cpp
+ msg_handler.cpp
+ string_util.cpp
+ thread.cpp
+ timer.cpp
+ utf8.cpp
+ version.cpp)
add_library(common STATIC ${SRCS})
diff --git a/src/common/emu_window.h b/src/common/emu_window.h
index 731784756..e70b99ec1 100644
--- a/src/common/emu_window.h
+++ b/src/common/emu_window.h
@@ -55,7 +55,7 @@ public:
m_client_area_height = val;
}
- std::string GetWindowTitle() {
+ std::string GetWindowTitle() const {
return m_window_title;
}
diff --git a/src/common/scm_rev.h b/src/common/scm_rev.h
deleted file mode 100644
index cd5df9ca8..000000000
--- a/src/common/scm_rev.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define SCM_REV_STR "d0674cc98bfa5729168274cde62a4e69343f8524"
-#define SCM_DESC_STR "d0674cc"
-#define SCM_BRANCH_STR "master"
-#define SCM_IS_MASTER 1
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 29a6aea82..9cfb9b1c8 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,10 +1,23 @@
-set(SRCS src/core.cpp
- src/memory.cpp
- src/boot/apploader.cpp
- src/boot/bootrom.cpp
- src/boot/loader.cpp
- src/hle/hle.cpp
- src/hw/hw.cpp
- )
+set(SRCS core.cpp
+ core_timing.cpp
+ loader.cpp
+ mem_map.cpp
+ mem_map_funcs.cpp
+ system.cpp
+ arm/disassembler/arm_disasm.cpp
+ arm/interpreter/arm_interpreter.cpp
+ arm/interpreter/armemu.cpp
+ arm/interpreter/arminit.cpp
+ arm/interpreter/armmmu.cpp
+ arm/interpreter/armos.cpp
+ arm/interpreter/armsupp.cpp
+ arm/interpreter/armvirt.cpp
+ arm/interpreter/thumbemu.cpp
+ arm/mmu/arm1176jzf_s_mmu.cpp
+ elf/elf_reader.cpp
+ file_sys/directory_file_system.cpp
+ file_sys/meta_file_system.cpp
+ hw/hw.cpp
+ hw/hw_lcd.cpp)
add_library(core STATIC ${SRCS})
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index 3f486b8fe..56394b930 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -1,19 +1,5 @@
-set(SRCS
- src/bp_mem.cpp
- src/cp_mem.cpp
- src/xf_mem.cpp
- src/fifo.cpp
- src/fifo_player.cpp
- src/vertex_loader.cpp
- src/vertex_manager.cpp
- src/video_core.cpp
- src/shader_manager.cpp
- src/texture_decoder.cpp
- src/texture_manager.cpp
- src/utils.cpp
- src/renderer_gl3/renderer_gl3.cpp
- src/renderer_gl3/shader_interface.cpp
- src/renderer_gl3/texture_interface.cpp
- src/renderer_gl3/uniform_manager.cpp)
+set(SRCS video_core.cpp
+ utils.cpp
+ renderer_opengl/renderer_opengl.cpp)
add_library(video_core STATIC ${SRCS})