diff --git a/cmake/SelectPcsx2Plugins.cmake b/cmake/SelectPcsx2Plugins.cmake index 68a0ab5806..c0e395dfbf 100644 --- a/cmake/SelectPcsx2Plugins.cmake +++ b/cmake/SelectPcsx2Plugins.cmake @@ -5,7 +5,7 @@ set(msg_dep_common_libs "check these libraries -> wxWidgets (>=3.0), aio") set(msg_dep_pcsx2 "check these libraries -> wxWidgets (>=3.0), gtk2, zlib (>=1.2.4), pcsx2 common libs") set(msg_dep_cdvdgiga "check these libraries -> gtk2, libudev") set(msg_dep_zerogs "check these libraries -> glew, opengl, X11, nvidia-cg-toolkit (>=2.1)") -set(msg_dep_gsdx "check these libraries -> opengl, png (>=1.2), zlib (>=1.2.4), X11") +set(msg_dep_gsdx "check these libraries -> opengl, png (>=1.2), zlib (>=1.2.4), X11, liblzma") set(msg_dep_onepad "check these libraries -> sdl2, X11, gtk2") set(msg_dep_spu2x "check these libraries -> soundtouch (>=1.5), alsa, portaudio (>=1.9), sdl (>=1.2) pcsx2 common libs") set(msg_dep_zerospu2 "check these libraries -> soundtouch (>=1.5), alsa") @@ -141,7 +141,7 @@ endif() # -X11 # -zlib #--------------------------------------- -if(OPENGL_FOUND AND X11_FOUND AND GTKn_FOUND AND ZLIB_FOUND AND PNG_FOUND AND FREETYPE_FOUND AND (EGL_FOUND OR NOT EGL_API)) +if(OPENGL_FOUND AND X11_FOUND AND GTKn_FOUND AND ZLIB_FOUND AND PNG_FOUND AND FREETYPE_FOUND AND LIBLZMA_FOUND AND (EGL_FOUND OR NOT EGL_API)) set(GSdx TRUE) elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/GSdx") set(GSdx FALSE) diff --git a/debian-packager/control b/debian-packager/control index 48b56363ff..c8f26ce621 100644 --- a/debian-packager/control +++ b/debian-packager/control @@ -10,6 +10,7 @@ Build-Depends: cmake (>= 2.8.5), libgl1-mesa-dev, libglu1-mesa-dev, libgtk2.0-dev, + liblzma-dev, libpng12-dev | libpng-dev, libpulse-dev, libsdl2-dev, diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt index 6cc334daee..0d5a905af5 100644 --- a/plugins/GSdx/CMakeLists.txt +++ b/plugins/GSdx/CMakeLists.txt @@ -14,10 +14,11 @@ set(CommonFlags -Wno-unknown-pragmas -Wno-parentheses -Wunused-variable # __dummy variable need to be investigated + -DLZMA_SUPPORTED # must be always supported on linux ) if(USE_ICC) - set(CommonFlags "${CommonFlags} -restrict") + set(CommonFlags "${CommonFlags} -restrict") endif() set(GSdxFinalFlags ${CommonFlags}) @@ -41,9 +42,6 @@ if(EGL_API AND EGL_FOUND) set(GSdxFinalFlags ${GSdxFinalFlags} -DEGL_SUPPORTED) endif() -if(LIBLZMA_FOUND) - set(GSdxFinalFlags ${GSdxFinalFlags} -DLZMA_SUPPORTED) -endif() if(OPENCL_API) set(GSdxFinalFlags ${GSdxFinalFlags} -DENABLE_OPENCL) @@ -276,16 +274,13 @@ set(GSdxFinalLibs ${LIBC_LIBRARIES} ${PNG_LIBRARIES} ${FREETYPE_LIBRARIES} + ${LIBLZMA_LIBRARIES} ) if(EGL_API AND EGL_FOUND) set(GSdxFinalLibs ${GSdxFinalLibs} ${EGL_LIBRARIES}) endif() -if(LIBLZMA_FOUND) - set(GSdxFinalLibs ${GSdxFinalLibs} ${LIBLZMA_LIBRARIES}) -endif() - if(USE_VTUNE) set(GSdxFinalLibs ${GSdxFinalLibs} ${VTUNE_LIBRARIES}) endif()