diff options
| author | archshift <admin@archshift.com> | 2014-04-29 04:40:39 +0200 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-04-29 04:40:39 +0200 |
| commit | 5a9c2ce5ea1b272d73001acaf9ec15f1c0e5e041 (patch) | |
| tree | fb68ecea60a4b06ab7142bedc22eb67913a63449 /src/citra | |
| parent | Fix complaints about functions that could not be found (diff) | |
| download | yuzu-5a9c2ce5ea1b272d73001acaf9ec15f1c0e5e041.tar yuzu-5a9c2ce5ea1b272d73001acaf9ec15f1c0e5e041.tar.gz yuzu-5a9c2ce5ea1b272d73001acaf9ec15f1c0e5e041.tar.bz2 yuzu-5a9c2ce5ea1b272d73001acaf9ec15f1c0e5e041.tar.lz yuzu-5a9c2ce5ea1b272d73001acaf9ec15f1c0e5e041.tar.xz yuzu-5a9c2ce5ea1b272d73001acaf9ec15f1c0e5e041.tar.zst yuzu-5a9c2ce5ea1b272d73001acaf9ec15f1c0e5e041.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/citra/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 25 |
2 files changed, 26 insertions, 3 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index 0023da2bf..d7478a2d2 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -1,12 +1,14 @@ set(SRCS citra.cpp emu_window/emu_window_glfw.cpp) +set(HEADS citra.h + resource.h) # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) if (NOT X11_xf86vmode_LIB) set(X11_xv86vmode_LIB Xxf86vm) endif() -add_executable(citra ${SRCS}) +add_executable(citra ${SRCS} ${HEADS}) target_link_libraries(citra core common video_core GLEW pthread X11 Xxf86vm Xi ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) #install(TARGETS citra RUNTIME DESTINATION ${bindir}) diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index 594460a71..abca202ea 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 (HEADS + 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} ${HEADS} ${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() + +endif() #install(TARGETS citra-qt RUNTIME DESTINATION ${bindir}) |