diff options
| author | 2016-03-27 11:59:50 +0800 | |
|---|---|---|
| committer | 2016-04-23 11:48:58 +0800 | |
| commit | d051bd303225838e0e50a3e3ddc22337c1fc0f0c (patch) | |
| tree | d054f69d2cc8f03c4d73c2e74deb42ee5556be0d | |
| parent | Merge pull request #1697 from tfarley/hw-lighting-sync (diff) | |
| download | yuzu-d051bd303225838e0e50a3e3ddc22337c1fc0f0c.tar.gz yuzu-d051bd303225838e0e50a3e3ddc22337c1fc0f0c.tar.xz yuzu-d051bd303225838e0e50a3e3ddc22337c1fc0f0c.zip | |
CMakeLists: Use CMAKE_THREAD_LIBS_INIT
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/citra/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a0a161e7..ddde19760 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -65,8 +65,8 @@ endif() | |||
| 65 | message(STATUS "Target architecture: ${ARCHITECTURE}") | 65 | message(STATUS "Target architecture: ${ARCHITECTURE}") |
| 66 | 66 | ||
| 67 | if (NOT MSVC) | 67 | if (NOT MSVC) |
| 68 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -Wno-attributes -pthread") | 68 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -Wno-attributes") |
| 69 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") | 69 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") |
| 70 | 70 | ||
| 71 | if (ARCHITECTURE_x86_64) | 71 | if (ARCHITECTURE_x86_64) |
| 72 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1") | 72 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1") |
| @@ -135,6 +135,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/cmake-modules") | |||
| 135 | find_package(OpenGL REQUIRED) | 135 | find_package(OpenGL REQUIRED) |
| 136 | include_directories(${OPENGL_INCLUDE_DIR}) | 136 | include_directories(${OPENGL_INCLUDE_DIR}) |
| 137 | 137 | ||
| 138 | find_package(Threads REQUIRED) | ||
| 139 | |||
| 138 | if (ENABLE_SDL2) | 140 | if (ENABLE_SDL2) |
| 139 | if (CITRA_USE_BUNDLED_SDL2) | 141 | if (CITRA_USE_BUNDLED_SDL2) |
| 140 | # Detect toolchain and platform | 142 | # Detect toolchain and platform |
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index fa615deb9..351752c1c 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt | |||
| @@ -21,7 +21,7 @@ target_link_libraries(citra ${SDL2_LIBRARY} ${OPENGL_gl_LIBRARY} inih glad) | |||
| 21 | if (MSVC) | 21 | if (MSVC) |
| 22 | target_link_libraries(citra getopt) | 22 | target_link_libraries(citra getopt) |
| 23 | endif() | 23 | endif() |
| 24 | target_link_libraries(citra ${PLATFORM_LIBRARIES}) | 24 | target_link_libraries(citra ${PLATFORM_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) |
| 25 | 25 | ||
| 26 | if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD|NetBSD") | 26 | if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD|NetBSD") |
| 27 | install(TARGETS citra RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") | 27 | install(TARGETS citra RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") |