citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

A bit of Cmake love

This commit is contained in:
archshift 2014-04-30 16:56:25 -07:00
parent 52377cf0d2
commit a7f3ed003d
4 changed files with 53 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -26,7 +26,14 @@ IF (APPLE)
SET(CMAKE_CXX_FLAGS_RELEASE "-stdlib=libc++") SET(CMAKE_CXX_FLAGS_RELEASE "-stdlib=libc++")
ENDIF (APPLE) ENDIF (APPLE)
#external includes
include_directories(${GLFW_INCLUDE_DIRS}) include_directories(${GLFW_INCLUDE_DIRS})
include_directories(${OPENGL_INCLUDE_DIR})
include_directories(${GLEW_INCLUDE_DIR})
#use pkg_search_module library dirs
link_directories(${GLFW_LIBRARY_DIRS})
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)
@ -48,10 +55,6 @@ get_git_head_revision(GIT_REF_SPEC GIT_REV)
git_describe(GIT_DESC --always --long --dirty) git_describe(GIT_DESC --always --long --dirty)
git_branch_name(GIT_BRANCH) git_branch_name(GIT_BRANCH)
# external includes
include_directories(${OPENGL_INCLUDE_DIR})
include_directories(${GLEW_INCLUDE_DIR})
# internal includes # internal includes
include_directories(src) include_directories(src)

12
src/citra/CMakeLists.txt
View File

@ -3,12 +3,12 @@ set(SRCS citra.cpp
set(HEADS citra.h set(HEADS citra.h
resource.h) resource.h)
# NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) add_executable(citra ${SRCS} ${HEADS})
if (NOT X11_xf86vmode_LIB)
set(X11_xv86vmode_LIB Xxf86vm) if (APPLE)
target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLFW_LIBRARIES})
else()
target_link_libraries(citra core common video_core pthread ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLFW_LIBRARIES})
endif() endif()
add_executable(citra ${SRCS} ${HEADS})
target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLFW_LIBRARIES})
#install(TARGETS citra RUNTIME DESTINATION ${bindir}) #install(TARGETS citra RUNTIME DESTINATION ${bindir})

2
src/citra_qt/CMakeLists.txt
View File

@ -53,7 +53,7 @@ add_executable(citra-qt ${SRCS} ${HEADS} ${MOC_SRCS} ${UI_HDRS})
if (APPLE) if (APPLE)
target_link_libraries(citra-qt core common video_core qhexedit iconv ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES}) target_link_libraries(citra-qt core common video_core qhexedit iconv ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES})
else() else()
target_link_libraries(citra-qt core common video_core qhexedit ${QT_LIBRARIES} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES})
endif() endif()
#install(TARGETS citra-qt RUNTIME DESTINATION ${bindir}) #install(TARGETS citra-qt RUNTIME DESTINATION ${bindir})

39
src/core/CMakeLists.txt
View File

@ -29,4 +29,41 @@ set(SRCS core.cpp
hw/lcd.cpp hw/lcd.cpp
hw/ndma.cpp) hw/ndma.cpp)
add_library(core STATIC ${SRCS}) set(HEADS core.h
core_timing.h
loader.h
mem_map.h
system.h
arm/disassembler/arm_disasm.h
arm/interpreter/arm_interpreter.h
arm/interpreter/arm_regformat.h
arm/interpreter/armcpu.h
arm/interpreter/armdefs.h
arm/interpreter/armemu.h
arm/interpreter/armmmu.h
arm/interpreter/armos.h
arm/interpreter/skyeye_defs.h
arm/mmu/arm1176jzf_s_mmu.h
arm/mmu/cache.h
arm/mmu/rb.h
arm/mmu/tlb.h
arm/mmu/wb.h
elf/elf_reader.h
elf/elf_types.h
file_sys/directory_file_system.h
file_sys/file_sys.h
file_sys/meta_file_system.h
hle/hle.h
hle/mrc.h
hle/syscall.h
hle/function_wrappers.h
hle/service/apt.h
hle/service/gsp.h
hle/service/hid.h
hle/service/service.h
hle/service/srv.h
hw/hw.h
hw/lcd.h
hw/ndma.h)
add_library(core STATIC ${SRCS} ${HEADS})