diff options
| author | 2014-12-24 10:34:25 +0100 | |
|---|---|---|
| committer | 2015-01-09 15:50:46 +0100 | |
| commit | 7d7ab70279df554959eec29ff43a2eb304a3d578 (patch) | |
| tree | 13443156725388ffc3fe8b1208a7a39c6d29ea93 /src | |
| parent | Merge pull request #255 from Subv/cbranch_3 (diff) | |
| download | yuzu-7d7ab70279df554959eec29ff43a2eb304a3d578.tar.gz yuzu-7d7ab70279df554959eec29ff43a2eb304a3d578.tar.xz yuzu-7d7ab70279df554959eec29ff43a2eb304a3d578.zip | |
Generic PLATFORM_LIBRARIES var
This both reduces redundancy in add_executable definitions, and makes it easier to link additional libraries. In particular, extra libraries are needed on OSX - see next commit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 9 |
2 files changed, 2 insertions, 19 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index bbb3374f2..7f3ab3e07 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt | |||
| @@ -16,20 +16,10 @@ create_directory_groups(${SRCS} ${HEADERS}) | |||
| 16 | add_executable(citra ${SRCS} ${HEADERS}) | 16 | add_executable(citra ${SRCS} ${HEADERS}) |
| 17 | target_link_libraries(citra core common video_core) | 17 | target_link_libraries(citra core common video_core) |
| 18 | target_link_libraries(citra ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih) | 18 | target_link_libraries(citra ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih) |
| 19 | target_link_libraries(citra ${PLATFORM_LIBRARIES}) | ||
| 19 | 20 | ||
| 20 | if (UNIX) | 21 | if (UNIX) |
| 21 | target_link_libraries(citra -pthread) | 22 | target_link_libraries(citra -pthread) |
| 22 | endif() | 23 | endif() |
| 23 | 24 | ||
| 24 | if (APPLE) | ||
| 25 | target_link_libraries(citra iconv ${COREFOUNDATION_LIBRARY}) | ||
| 26 | elseif (WIN32) | ||
| 27 | target_link_libraries(citra winmm wsock32 ws2_32) | ||
| 28 | if (MINGW) # GCC does not support codecvt, so use iconv instead | ||
| 29 | target_link_libraries(citra iconv) | ||
| 30 | endif() | ||
| 31 | else() # Unix | ||
| 32 | target_link_libraries(citra rt) | ||
| 33 | endif() | ||
| 34 | |||
| 35 | #install(TARGETS citra RUNTIME DESTINATION ${bindir}) | 25 | #install(TARGETS citra RUNTIME DESTINATION ${bindir}) |
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index a0ba252b3..420bede1e 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt | |||
| @@ -60,17 +60,10 @@ endif() | |||
| 60 | add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS}) | 60 | add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS}) |
| 61 | target_link_libraries(citra-qt core common video_core qhexedit) | 61 | target_link_libraries(citra-qt core common video_core qhexedit) |
| 62 | target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS}) | 62 | target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS}) |
| 63 | target_link_libraries(citra-qt ${PLATFORM_LIBRARIES}) | ||
| 63 | 64 | ||
| 64 | if (UNIX) | 65 | if (UNIX) |
| 65 | target_link_libraries(citra-qt -pthread) | 66 | target_link_libraries(citra-qt -pthread) |
| 66 | endif() | 67 | endif() |
| 67 | 68 | ||
| 68 | if (APPLE) | ||
| 69 | target_link_libraries(citra-qt iconv ${COREFOUNDATION_LIBRARY}) | ||
| 70 | elseif (WIN32) | ||
| 71 | target_link_libraries(citra-qt winmm wsock32 ws2_32) | ||
| 72 | else() # Unix | ||
| 73 | target_link_libraries(citra-qt rt) | ||
| 74 | endif() | ||
| 75 | |||
| 76 | #install(TARGETS citra-qt RUNTIME DESTINATION ${bindir}) | 69 | #install(TARGETS citra-qt RUNTIME DESTINATION ${bindir}) |