summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohannes Ekberg <uppfinnarn@gmail.com>2014-12-24 10:34:25 +0100
committerJohannes Ekberg <uppfinnarn@gmail.com>2015-01-09 15:50:46 +0100
commit7d7ab70279df554959eec29ff43a2eb304a3d578 (patch)
tree13443156725388ffc3fe8b1208a7a39c6d29ea93 /src
parentMerge pull request #255 from Subv/cbranch_3 (diff)
downloadyuzu-7d7ab70279df554959eec29ff43a2eb304a3d578.tar
yuzu-7d7ab70279df554959eec29ff43a2eb304a3d578.tar.gz
yuzu-7d7ab70279df554959eec29ff43a2eb304a3d578.tar.bz2
yuzu-7d7ab70279df554959eec29ff43a2eb304a3d578.tar.lz
yuzu-7d7ab70279df554959eec29ff43a2eb304a3d578.tar.xz
yuzu-7d7ab70279df554959eec29ff43a2eb304a3d578.tar.zst
yuzu-7d7ab70279df554959eec29ff43a2eb304a3d578.zip
Diffstat (limited to 'src')
-rw-r--r--src/citra/CMakeLists.txt12
-rw-r--r--src/citra_qt/CMakeLists.txt9
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})
add_executable(citra ${SRCS} ${HEADERS})
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()
-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()
-
#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()
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})
+target_link_libraries(citra-qt ${PLATFORM_LIBRARIES})
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()
-
#install(TARGETS citra-qt RUNTIME DESTINATION ${bindir})