From b01583f54bb288ed30f136cb1e2c5df1c85c9760 Mon Sep 17 00:00:00 2001 From: Danila Malyutin Date: Sat, 22 Aug 2015 16:20:51 +0300 Subject: [PATCH] Some fixes for possible *nix compiler errors --- rpcs3/CMakeLists.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 7d7677ff3d..39dd5620ef 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -46,7 +46,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") elseif(UNIX) #it seems like glibc includes the iconv functions we use but other libc #implementations like the one on OSX don't seem implement them - set(ADDITIONAL_LIBS "iconv" "z") + set(ADDITIONAL_LIBS "iconv") else() set(ADDITIONAL_LIBS "") endif() @@ -80,6 +80,7 @@ if(NOT WIN32) ) endif() find_package(GLEW REQUIRED) + find_package(ZLIB REQUIRED) endif() find_package(OpenGL REQUIRED) find_package(OpenAL REQUIRED) @@ -164,10 +165,12 @@ if(WIN32) # I'm not sure we need all of these libs, but we link them in vs endif() else() if(LLVM_FOUND) - target_link_libraries(rpcs3 asmjit.a ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES} libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a ${LLVM_LIBS} ${ADDITIONAL_LIBS}) + target_link_libraries(rpcs3 asmjit.a ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES} ${ZLIB_LIBRARIES}) + target_link_libraries(rpcs3 libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a ${LLVM_LIBS} ${ADDITIONAL_LIBS}) else() - target_link_libraries(rpcs3 asmjit.a ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES} libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a ${ADDITIONAL_LIBS}) - endif() + target_link_libraries(rpcs3 asmjit.a ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES} ${ZLIB_LIBRARIES}) + target_link_libraries(rpcs3 libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a ${ADDITIONAL_LIBS}) + endif() endif() set_target_properties(rpcs3 PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h")