diff options
| author |  Johannes Ekberg <uppfinnarn@gmail.com> | 2014-12-25 11:49:00 +0100 |
|---|---|---|
| committer | Johannes Ekberg <uppfinnarn@gmail.com> | 2015-01-09 15:50:46 +0100 |
| commit | d7ad14ae2088789a853d36fb3a465a920c0116ee (patch) | |
| tree | 0fcbc50097f50ac5e460467a3ea89cdf5fc2e91c | |
| parent | 13518198109fad9f19cc81aa1d06c3d85d1126f5 (diff) | |
Use -pthread where and only where needed
Passing -pthread to GCC as a flag makes it both link to libpthread, and make C standard library routines reentrant. This makes the additional explicit links unnecessary.
Additionally, on OSX, this is the default behavior, and clang will print a message about it being unused if it's present there.
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/citra/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c6423909..81a793dc 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 7f3ab3e0..713f4919 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 420bede1..bbc521f8 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}) |