diff options
| author |  bunnei <bunneidev@gmail.com> | 2015-01-10 02:03:07 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-01-10 02:03:07 -0500 |
| commit | e7d21188588266cc6846f73a2f20b4a6aea6d750 (patch) | |
| tree | ba24bb1c44b9aa926563cd9f39c7495bc2a52858 /src | |
| parent | d0ed01bc7f679d650322d4c299921c8a2a9f01f2 (diff) | |
| parent | b027f7fe1537c9437f43782c6aa0bc6c98649831 (diff) | |
Merge pull request #342 from uppfinnarn/master
Build improvements
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 13 |
2 files changed, 2 insertions, 27 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index bbb3374f..713f4919 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -16,20 +16,6 @@ create_directory_groups(${SRCS} ${HEADERS}) 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 ${COREFOUNDATION_LIBRARY}) -elseif (WIN32) - target_link_libraries(citra winmm wsock32 ws2_32) - if (MINGW) # GCC does not support codecvt, so use iconv instead - target_link_libraries(citra iconv) - endif() -else() # Unix - target_link_libraries(citra rt) -endif() +target_link_libraries(citra ${PLATFORM_LIBRARIES}) #install(TARGETS citra RUNTIME DESTINATION ${bindir}) diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index a0ba252b..bbc521f8 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt @@ -60,17 +60,6 @@ endif() 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) - target_link_libraries(citra-qt winmm wsock32 ws2_32) -else() # Unix - target_link_libraries(citra-qt rt) -endif() +target_link_libraries(citra-qt ${PLATFORM_LIBRARIES}) #install(TARGETS citra-qt RUNTIME DESTINATION ${bindir}) |