ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gsdx: make png++ optional 

Some distributions (Fedora) doesn't have a png++ package...
This commit is contained in:
Gregory Hainaut 2015-06-04 20:22:05 +02:00
parent bd2c04a0ec
commit 979ea92754
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/SelectPcsx2Plugins.cmake
View File

@ -144,7 +144,7 @@ endif()
# requires: -OpenGL # requires: -OpenGL
# -X11 # -X11
#--------------------------------------- #---------------------------------------
if(OPENGL_FOUND AND X11_FOUND AND PNGPP_FOUND AND GTKn_FOUND AND PNG_FOUND AND (EGL_FOUND OR NOT EGL_API)) if(OPENGL_FOUND AND X11_FOUND AND GTKn_FOUND AND PNG_FOUND AND (EGL_FOUND OR NOT EGL_API))
set(GSdx TRUE) set(GSdx TRUE)
elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/GSdx") elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/GSdx")
set(GSdx FALSE) set(GSdx FALSE)

4
plugins/GSdx/CMakeLists.txt
View File

@ -44,6 +44,10 @@ if(LIBLZMA_FOUND)
set(GSdxFinalFlags ${GSdxFinalFlags} -DLZMA_SUPPORTED) set(GSdxFinalFlags ${GSdxFinalFlags} -DLZMA_SUPPORTED)
endif() endif()
if(PNGPP_FOUND)
set(GSdxFinalFlags ${GSdxFinalFlags} -DPNGPP_SUPPORTED)
endif()
#Clang doesn't support a few common flags that GCC does. #Clang doesn't support a few common flags that GCC does.
if(NOT USE_CLANG) if(NOT USE_CLANG)
set(GSdxFinalFlags ${GSdxFinalFlags} -fabi-version=6) set(GSdxFinalFlags ${GSdxFinalFlags} -fabi-version=6)

2
plugins/GSdx/config.h
View File

@ -49,7 +49,7 @@
//#define ENABLE_OPENCL //#define ENABLE_OPENCL
#endif #endif
#if defined(__linux__) #if defined(__linux__) && PNGPP_SUPPORTED
// Allow to dump texture as PNG (require libpng++). It reduces the size of the dump // Allow to dump texture as PNG (require libpng++). It reduces the size of the dump
// and alpha is well supported (on linux) // and alpha is well supported (on linux)
#define ENABLE_OGL_PNG #define ENABLE_OGL_PNG