Merge branch 'master' into hle-interface

This commit is contained in:
bunnei 2014-04-10 20:10:18 -04:00
commit 95f237a086
9 changed files with 47 additions and 68 deletions

View File

@ -9,15 +9,9 @@ add_definitions(-DSINGLETHREADED)
# dependency checking # dependency checking
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests)
include(FindOpenGL REQUIRED) include(FindOpenGL REQUIRED)
include(FindGLFW REQUIRED)
include(FindX11 REQUIRED) include(FindX11 REQUIRED)
if(NOT GLFW_FOUND) include_directories(${GLFW_INCLUDE_DIRS})
message(FATAL_ERROR "glfw not found")
else()
include_directories(${GLFW_INCLUDE_DIRS})
endif()
option(DISABLE_QT4 "Disable Qt4 GUI" OFF) option(DISABLE_QT4 "Disable Qt4 GUI" OFF)
if(NOT DISABLE_QT4) if(NOT DISABLE_QT4)
include(FindQt4) include(FindQt4)
@ -33,13 +27,10 @@ if(NOT DISABLE_QT4)
endif() endif()
# external includes # external includes
include_directories(${SDL2_INCLUDE_DIR})
include_directories(${OPENGL_INCLUDE_DIR}) include_directories(${OPENGL_INCLUDE_DIR})
# internal includes # internal includes
include_directories(src/common/src) include_directories(src)
include_directories(src/core/src)
include_directories(src/citra/src)
# process subdirectories # process subdirectories
if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4) if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4)

View File

@ -1,6 +1,7 @@
add_subdirectory(common) add_subdirectory(common)
add_subdirectory(core) add_subdirectory(core)
add_subdirectory(citra) 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) if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4)
#add_subdirectory(citra_qt) #add_subdirectory(citra_qt)

View File

@ -1,5 +1,5 @@
set(SRCS src/citra.cpp set(SRCS citra.cpp
src/emuwindow/emuwindow_glfw.cpp) emu_window/emu_window_glfw.cpp)
# NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable)
if (NOT X11_xf86vmode_LIB) if (NOT X11_xf86vmode_LIB)

View File

@ -4,12 +4,3 @@
#pragma once #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"

View File

@ -1,18 +1,19 @@
set(SRCS src/break_points.cpp set(SRCS break_points.cpp
src/console_listener.cpp console_listener.cpp
src/extended_trace.cpp extended_trace.cpp
src/file_search.cpp file_search.cpp
src/file_util.cpp file_util.cpp
src/hash.cpp hash.cpp
src/log_manager.cpp log_manager.cpp
src/math_util.cpp math_util.cpp
src/mem_arena.cpp mem_arena.cpp
src/memory_util.cpp memory_util.cpp
src/misc.cpp misc.cpp
src/msg_handler.cpp msg_handler.cpp
src/string_util.cpp string_util.cpp
src/thread.cpp thread.cpp
src/timer.cpp timer.cpp
src/version.cpp) utf8.cpp
version.cpp)
add_library(common STATIC ${SRCS}) add_library(common STATIC ${SRCS})

View File

@ -55,7 +55,7 @@ public:
m_client_area_height = val; m_client_area_height = val;
} }
std::string GetWindowTitle() { std::string GetWindowTitle() const {
return m_window_title; return m_window_title;
} }

View File

@ -1,4 +0,0 @@
#define SCM_REV_STR "d0674cc98bfa5729168274cde62a4e69343f8524"
#define SCM_DESC_STR "d0674cc"
#define SCM_BRANCH_STR "master"
#define SCM_IS_MASTER 1

View File

@ -1,10 +1,23 @@
set(SRCS src/core.cpp set(SRCS core.cpp
src/memory.cpp core_timing.cpp
src/boot/apploader.cpp loader.cpp
src/boot/bootrom.cpp mem_map.cpp
src/boot/loader.cpp mem_map_funcs.cpp
src/hle/hle.cpp system.cpp
src/hw/hw.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}) add_library(core STATIC ${SRCS})

View File

@ -1,19 +1,5 @@
set(SRCS set(SRCS video_core.cpp
src/bp_mem.cpp utils.cpp
src/cp_mem.cpp renderer_opengl/renderer_opengl.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)
add_library(video_core STATIC ${SRCS}) add_library(video_core STATIC ${SRCS})