diff options
| author |  bunnei <bunneidev@gmail.com> | 2014-05-19 21:46:57 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-05-19 21:46:57 -0400 |
| commit | 204c6bfeca2d3bccfe6602699c0b3420f88aaf07 (patch) | |
| tree | 4ece05e69f90f50e3390eb93a0790180aafcdbc6 /src/citra_qt/CMakeLists.txt | |
| parent | b5d2ff9b26560b3f2bfdcd311ada661313eaba83 (diff) | |
| parent | 5a8ed196e6e9416134a85fbc7da14fed3af307e4 (diff) | |
Merge pull request #2 from archshift/issue-7-fix
Fixes issues with building Citra on OSX
Diffstat (limited to 'src/citra_qt/CMakeLists.txt')
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index 594460a7..549f6921 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt @@ -8,6 +8,23 @@ set(SRCS main.cpp config/controller_config.cpp config/controller_config_util.cpp) +set (HEADERS + bootmanager.hxx + debugger/callstack.hxx + debugger/disassembler.hxx + debugger/ramview.hxx + debugger/registers.hxx + hotkeys.hxx + main.hxx + ui_callstack.h + ui_controller_config.h + ui_disassembler.h + ui_hotkeys.h + ui_main.h + ui_registers.h + version.h + config/controller_config.hxx + config/controller_config_util.hxx) qt4_wrap_ui(UI_HDRS debugger/callstack.ui @@ -32,7 +49,11 @@ qt4_wrap_cpp(MOC_SRCS include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(./) -add_executable(citra-qt ${SRCS} ${MOC_SRCS} ${UI_HDRS}) -target_link_libraries(citra-qt core common video_core qhexedit ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${SDL2_LIBRARY} rt GLEW ${GLFW_LIBRARIES}) +add_executable(citra-qt ${SRCS} ${HEADERS} ${MOC_SRCS} ${UI_HDRS}) +if (APPLE) + target_link_libraries(citra-qt core common video_core qhexedit iconv ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES}) +else() + target_link_libraries(citra-qt core common video_core qhexedit ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${SDL2_LIBRARY} rt GLEW ${GLFW_LIBRARIES}) +endif() #install(TARGETS citra-qt RUNTIME DESTINATION ${bindir}) |