Merge pull request #2124 from chaserhkj/linux-fix

Fixed a build error on non-win32 platfroms
This commit is contained in:
Henrik Rydgård committed 2013-06-10 07:22:16 -07:00
commit c98d2eb707
1 file changed
+8 -1
+8 -1
View File
@@ -669,6 +669,7 @@ add_library(xbrz STATIC
include_directories(ext/xbrz)
set(CoreExtra)
set(CoreExtraLibs)
if(ARM)
set(CoreExtra ${CoreExtra}
Core/MIPS/ARM/ArmAsm.cpp
@@ -702,6 +703,12 @@ elseif(X86)
Core/MIPS/x86/RegCacheFPU.h)
endif()
# atrac3plus.cpp used dl* functions on non-win32 platforms
# Core needs to be linked with dl on these platforms
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(CoreExtraLibs ${CoreExtraLibs} ${CMAKE_DL_LIBS})
endif()
# 'ppsspp_jni' on ANDROID, 'Core' everywhere else
# SHARED on ANDROID, STATIC everywhere else
add_library(${CoreLibName} ${CoreLinkType}
@@ -925,7 +932,7 @@ add_library(${CoreLibName} ${CoreLinkType}
Globals.h
git-version.cpp)
target_link_libraries(${CoreLibName} Common native kirk cityhash xbrz
${GLEW_LIBRARIES} ${OPENGL_LIBRARIES})
${CoreExtraLibs} ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES})
setup_target_project(${CoreLibName} Core)
# Generate git-version.cpp at build time.