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

Fix a bug in the Common CMakeLists file

Browse Source 
We were overwriting the LIBS variable. Effectively dropping libiconv from the libs.
This commit is contained in:
Ryan Houdek
2016-02-05 10:51:56 -06:00
parent 19cd9ecf16
commit 38cb6ba6dc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ else()
Logging/ConsoleListenerNix.cpp) Logging/ConsoleListenerNix.cpp)
endif() endif()
set(LIBS enet) list(APPEND LIBS enet)
if(_M_ARM_64) if(_M_ARM_64)
set(SRCS ${SRCS} set(SRCS ${SRCS}
Arm64Emitter.cpp Arm64Emitter.cpp
@ -60,13 +60,13 @@ else()
endif() endif()
endif() endif()
set(LIBS "${CMAKE_THREAD_LIBS_INIT}" ${VTUNE_LIBRARIES}) list(APPEND LIBS "${CMAKE_THREAD_LIBS_INIT}" ${VTUNE_LIBRARIES})
if(NOT APPLE AND NOT ANDROID) if(NOT APPLE AND NOT ANDROID)
set(LIBS ${LIBS} rt) list(APPEND LIBS rt)
endif() endif()
# OpenGL Interface # OpenGL Interface
set(SRCS ${SRCS} set(SRCS ${SRCS}
GL/GLUtil.cpp GL/GLUtil.cpp
GL/GLExtensions/GLExtensions.cpp GL/GLExtensions/GLExtensions.cpp
GL/GLInterface/GLInterface.cpp) GL/GLInterface/GLInterface.cpp)