diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-12-13 23:02:22 +0100 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-12-15 22:34:17 +0100 |
| commit | 06f31e8b471d5b54fee80568db2583d41e81fdb0 (patch) | |
| tree | f3cbe39ae7bbcf4be2d40e3394c1b60939baeaaa | |
| parent | Merge pull request #276 from lioncash/decrappify (diff) | |
| download | yuzu-06f31e8b471d5b54fee80568db2583d41e81fdb0.tar yuzu-06f31e8b471d5b54fee80568db2583d41e81fdb0.tar.gz yuzu-06f31e8b471d5b54fee80568db2583d41e81fdb0.tar.bz2 yuzu-06f31e8b471d5b54fee80568db2583d41e81fdb0.tar.lz yuzu-06f31e8b471d5b54fee80568db2583d41e81fdb0.tar.xz yuzu-06f31e8b471d5b54fee80568db2583d41e81fdb0.tar.zst yuzu-06f31e8b471d5b54fee80568db2583d41e81fdb0.zip | |
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/citra/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 4 |
3 files changed, 11 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 61d5d524a..0e48645d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ project(citra) if (NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-attributes") + add_definitions(-pthread) else() # Silence deprecation warnings add_definitions(/D_CRT_SECURE_NO_WARNINGS) @@ -75,10 +76,6 @@ if (ENABLE_GLFW) set(GLFW_LIBRARIES glfw3) else() - if (NOT APPLE) - find_package(X11 REQUIRED) - endif() - find_package(PkgConfig REQUIRED) pkg_search_module(GLFW REQUIRED glfw3) endif() 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 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 ${OPENGL_gl_LIBRARY} ${GLFW_LIBRARIES} 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) 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}) diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index 90e5c6aa6..54d0a1271 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt @@ -60,6 +60,10 @@ add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS}) target_link_libraries(citra-qt core common video_core qhexedit) target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS}) +if (UNIX) + target_link_libraries(citra-qt -pthread) +endif() + if (APPLE) target_link_libraries(citra-qt iconv ${COREFOUNDATION_LIBRARY}) elseif (WIN32) |