summaryrefslogtreecommitdiff
path: root/src/citra
diff options
context:
space:
mode:
authorGravatar bunnei2014-12-22 11:11:37 -0500
committerGravatar bunnei2014-12-22 11:11:37 -0500
commit949d95659e019d2c1bb58327827e1a9fc39b28ee (patch)
treeeca14a68ab0d253412689ec58f003c014e4d02ae /src/citra
parentMerge pull request #333 from lioncash/qops (diff)
parentBuild GLFW as a shared lib on Travis (diff)
downloadyuzu-949d95659e019d2c1bb58327827e1a9fc39b28ee.tar.gz
yuzu-949d95659e019d2c1bb58327827e1a9fc39b28ee.tar.xz
yuzu-949d95659e019d2c1bb58327827e1a9fc39b28ee.zip
Merge pull request #275 from yuriks/cmake-clean
Clean up CMake library specification
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/CMakeLists.txt14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt
index f2add394f..b06259f5e 100644
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@@ -12,22 +12,20 @@ set(HEADERS
12 12
13create_directory_groups(${SRCS} ${HEADERS}) 13create_directory_groups(${SRCS} ${HEADERS})
14 14
15# NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable)
16if (NOT X11_xf86vmode_LIB)
17 set(X11_xv86vmode_LIB Xxf86vm)
18endif()
19
20add_executable(citra ${SRCS} ${HEADERS}) 15add_executable(citra ${SRCS} ${HEADERS})
21target_link_libraries(citra core common video_core) 16target_link_libraries(citra core common video_core)
22target_link_libraries(citra ${OPENGL_gl_LIBRARY} ${GLFW_LIBRARIES} inih) 17target_link_libraries(citra ${OPENGL_gl_LIBRARY} ${GLFW_LIBRARIES} inih)
23 18
19if (UNIX)
20 target_link_libraries(citra -pthread)
21endif()
22
24if (APPLE) 23if (APPLE)
25 target_link_libraries(citra iconv pthread ${COREFOUNDATION_LIBRARY}) 24 target_link_libraries(citra iconv ${COREFOUNDATION_LIBRARY})
26elseif (WIN32) 25elseif (WIN32)
27 target_link_libraries(citra winmm) 26 target_link_libraries(citra winmm)
28else() # Unix 27else() # Unix
29 target_link_libraries(citra pthread rt) 28 target_link_libraries(citra rt)
30 target_link_libraries(citra ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_Xcursor_LIB} ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB})
31endif() 29endif()
32 30
33#install(TARGETS citra RUNTIME DESTINATION ${bindir}) 31#install(TARGETS citra RUNTIME DESTINATION ${bindir})