INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-24 12:18:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #342 from uppfinnarn/master

Browse Source 
Build improvements
This commit is contained in:
bunnei
2015-01-10 02:03:07 -05:00
parent d0ed01bc7f b027f7fe15
commit e7d2118858
3 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/citra/CMakeLists.txt
View File

@ -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})

13
src/citra_qt/CMakeLists.txt
View File

@ -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})