diff options
author | darkf <lw9k123@gmail.com> | 2014-12-29 19:47:41 -0800 |
---|---|---|
committer | darkf <lw9k123@gmail.com> | 2014-12-29 19:47:41 -0800 |
commit | 8ba9ac0f74abb0408a26207a76a0c1808bad8de0 (patch) | |
tree | f1c7c3393fa726435b5b90bf335567c93e528ef1 /src/citra/CMakeLists.txt | |
parent | a19354acedbfeafd28219c48a1ec32f76dd17a54 (diff) | |
parent | 3d14eb285382740b144e5b047cb2ad072f6129ea (diff) |
Fix merge conflicts
Diffstat (limited to 'src/citra/CMakeLists.txt')
-rw-r--r-- | src/citra/CMakeLists.txt | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index c4cbf9fe..0e03212d 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -12,25 +12,23 @@ set(HEADERS create_directory_groups(${SRCS} ${HEADERS}) -# 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} ${HEADERS}) target_link_libraries(citra core common video_core) target_link_libraries(citra ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih) +if (UNIX) + target_link_libraries(citra -pthread) +endif() + if (APPLE) - target_link_libraries(citra iconv pthread ${COREFOUNDATION_LIBRARY}) + target_link_libraries(citra iconv ${COREFOUNDATION_LIBRARY}) elseif (WIN32) target_link_libraries(citra winmm) if (MINGW) target_link_libraries(citra iconv) endif() else() # Unix - target_link_libraries(citra pthread rt) - target_link_libraries(citra ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_Xcursor_LIB} ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) + target_link_libraries(citra rt) endif() #install(TARGETS citra RUNTIME DESTINATION ${bindir}) |