summaryrefslogtreecommitdiffstats
path: root/src/citra
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-05-01 03:44:48 +0200
committerarchshift <admin@archshift.com>2014-05-01 03:44:48 +0200
commitdade106aa92cd82864aeda2f17ef10da1ed8b49d (patch)
tree8fb7233a41956912eabf01ff7cc1ea228df54ef4 /src/citra
parentMerge branch 'issue-7-fix' of https://github.com/archshift/citra into issue-7-fix (diff)
downloadyuzu-dade106aa92cd82864aeda2f17ef10da1ed8b49d.tar
yuzu-dade106aa92cd82864aeda2f17ef10da1ed8b49d.tar.gz
yuzu-dade106aa92cd82864aeda2f17ef10da1ed8b49d.tar.bz2
yuzu-dade106aa92cd82864aeda2f17ef10da1ed8b49d.tar.lz
yuzu-dade106aa92cd82864aeda2f17ef10da1ed8b49d.tar.xz
yuzu-dade106aa92cd82864aeda2f17ef10da1ed8b49d.tar.zst
yuzu-dade106aa92cd82864aeda2f17ef10da1ed8b49d.zip
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/CMakeLists.txt7
1 files changed, 6 insertions, 1 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
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} ${HEADS})
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})
+ 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})
endif()
#install(TARGETS citra RUNTIME DESTINATION ${bindir})