piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6576 from lioncash/iconv

Browse Source 
CMakeLists: Remove iconv from the LIBS variable
This commit is contained in:
Markus Wick
2018-04-02 11:07:19 +02:00
committed by GitHub
parent 80525cfd4e 8db4ab7dd6
commit dea30e08bf
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -706,7 +706,6 @@ else()
add_subdirectory(Externals/libiconv-1.14) add_subdirectory(Externals/libiconv-1.14)
set(ICONV_LIBRARIES iconv) set(ICONV_LIBRARIES iconv)
endif() endif()
list(APPEND LIBS ${ICONV_LIBRARIES})
if(NOT ANDROID) if(NOT ANDROID)
find_package(HIDAPI) find_package(HIDAPI)

7
Source/Core/Common/CMakeLists.txt
View File

@ -44,12 +44,16 @@ add_library(common
x64Emitter.cpp x64Emitter.cpp
) )
target_link_libraries(common PUBLIC target_link_libraries(common
PUBLIC
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${CURL_LIBRARIES} ${CURL_LIBRARIES}
enet enet
${MBEDTLS_LIBRARIES} ${MBEDTLS_LIBRARIES}
${VTUNE_LIBRARIES} ${VTUNE_LIBRARIES}
PRIVATE
${ICONV_LIBRARIES}
) )
if (APPLE) if (APPLE)
@ -65,7 +69,6 @@ if(ANDROID)
target_sources(common PRIVATE target_sources(common PRIVATE
Logging/ConsoleListenerDroid.cpp Logging/ConsoleListenerDroid.cpp
) )
target_link_libraries(common PRIVATE iconv)
elseif(WIN32) elseif(WIN32)
target_sources(common PRIVATE target_sources(common PRIVATE
Logging/ConsoleListenerWin.cpp Logging/ConsoleListenerWin.cpp