diff options
| author | 2014-04-30 18:44:48 -0700 | |
|---|---|---|
| committer | 2014-04-30 18:44:48 -0700 | |
| commit | dade106aa92cd82864aeda2f17ef10da1ed8b49d (patch) | |
| tree | 8fb7233a41956912eabf01ff7cc1ea228df54ef4 /src | |
| parent | Merge branch 'issue-7-fix' of https://github.com/archshift/citra into issue-7... (diff) | |
| download | yuzu-dade106aa92cd82864aeda2f17ef10da1ed8b49d.tar.gz yuzu-dade106aa92cd82864aeda2f17ef10da1ed8b49d.tar.xz yuzu-dade106aa92cd82864aeda2f17ef10da1ed8b49d.zip | |
Linux support
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index ee3cb55cf..2e4fbe353 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt | |||
| @@ -3,12 +3,17 @@ set(SRCS citra.cpp | |||
| 3 | set(HEADS citra.h | 3 | set(HEADS citra.h |
| 4 | resource.h) | 4 | resource.h) |
| 5 | 5 | ||
| 6 | # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) | ||
| 7 | if (NOT X11_xf86vmode_LIB) | ||
| 8 | set(X11_xv86vmode_LIB Xxf86vm) | ||
| 9 | endif() | ||
| 10 | |||
| 6 | add_executable(citra ${SRCS} ${HEADS}) | 11 | add_executable(citra ${SRCS} ${HEADS}) |
| 7 | 12 | ||
| 8 | if (APPLE) | 13 | if (APPLE) |
| 9 | target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLFW_LIBRARIES}) | 14 | target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLFW_LIBRARIES}) |
| 10 | else() | 15 | else() |
| 11 | target_link_libraries(citra core common video_core pthread ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLFW_LIBRARIES}) | 16 | target_link_libraries(citra core common video_core GLEW pthread X11 Xxf86vm Xi Xcursor ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) |
| 12 | endif() | 17 | endif() |
| 13 | 18 | ||
| 14 | #install(TARGETS citra RUNTIME DESTINATION ${bindir}) | 19 | #install(TARGETS citra RUNTIME DESTINATION ${bindir}) |
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index b06be56fe..3a1335544 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt | |||
| @@ -53,7 +53,7 @@ add_executable(citra-qt ${SRCS} ${HEADS} ${MOC_SRCS} ${UI_HDRS}) | |||
| 53 | if (APPLE) | 53 | if (APPLE) |
| 54 | target_link_libraries(citra-qt core common video_core qhexedit iconv ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES}) | 54 | target_link_libraries(citra-qt core common video_core qhexedit iconv ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES}) |
| 55 | else() | 55 | else() |
| 56 | target_link_libraries(citra-qt core common video_core qhexedit ${QT_LIBRARIES} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES}) | 56 | target_link_libraries(citra-qt core common video_core qhexedit ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${SDL2_LIBRARY} rt GLEW ${GLFW_LIBRARIES}) |
| 57 | endif() | 57 | endif() |
| 58 | 58 | ||
| 59 | #install(TARGETS citra-qt RUNTIME DESTINATION ${bindir}) | 59 | #install(TARGETS citra-qt RUNTIME DESTINATION ${bindir}) |