summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Ekberg <uppfinnarn@gmail.com>2014-12-25 11:49:00 +0100
committerJohannes Ekberg <uppfinnarn@gmail.com>2015-01-09 15:50:46 +0100
commitd7ad14ae2088789a853d36fb3a465a920c0116ee (patch)
tree0fcbc50097f50ac5e460467a3ea89cdf5fc2e91c
parentLink Cocoa, IOKit and CoreVideo on OSX (diff)
downloadyuzu-d7ad14ae2088789a853d36fb3a465a920c0116ee.tar
yuzu-d7ad14ae2088789a853d36fb3a465a920c0116ee.tar.gz
yuzu-d7ad14ae2088789a853d36fb3a465a920c0116ee.tar.bz2
yuzu-d7ad14ae2088789a853d36fb3a465a920c0116ee.tar.lz
yuzu-d7ad14ae2088789a853d36fb3a465a920c0116ee.tar.xz
yuzu-d7ad14ae2088789a853d36fb3a465a920c0116ee.tar.zst
yuzu-d7ad14ae2088789a853d36fb3a465a920c0116ee.zip
-rw-r--r--CMakeLists.txt6
-rw-r--r--src/citra/CMakeLists.txt4
-rw-r--r--src/citra_qt/CMakeLists.txt4
3 files changed, 5 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c64239092..81a793dc4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,11 @@ project(citra)
if (NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-attributes")
- add_definitions(-pthread)
+
+ if (NOT APPLE)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
+ endif()
else()
# Silence deprecation warnings
add_definitions(/D_CRT_SECURE_NO_WARNINGS)
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt
index 7f3ab3e07..713f49193 100644
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@@ -18,8 +18,4 @@ target_link_libraries(citra core common video_core)
target_link_libraries(citra ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih)
target_link_libraries(citra ${PLATFORM_LIBRARIES})
-if (UNIX)
- target_link_libraries(citra -pthread)
-endif()
-
#install(TARGETS citra RUNTIME DESTINATION ${bindir})
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 420bede1e..bbc521f8a 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -62,8 +62,4 @@ target_link_libraries(citra-qt core common video_core qhexedit)
target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS})
target_link_libraries(citra-qt ${PLATFORM_LIBRARIES})
-if (UNIX)
- target_link_libraries(citra-qt -pthread)
-endif()
-
#install(TARGETS citra-qt RUNTIME DESTINATION ${bindir})