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

gsdx: new dependency on linux => png++ 

Note: it is only header file that wrap the standard png (which was
already mandatory for wx/sdl)
This commit is contained in:
Gregory Hainaut 2015-05-16 12:33:58 +02:00
parent cab59587e8
commit 8cd533304c
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/SelectPcsx2Plugins.cmake
View File

@ -5,7 +5,7 @@ set(msg_dep_common_libs "check these libraries -> wxWidgets (>=2.8.10), aio")
set(msg_dep_pcsx2 "check these libraries -> wxWidgets (>=2.8.10), gtk2 (>=2.16), zlib (>=1.2.4), pcsx2 common libs") set(msg_dep_pcsx2 "check these libraries -> wxWidgets (>=2.8.10), gtk2 (>=2.16), zlib (>=1.2.4), pcsx2 common libs")
set(msg_dep_cdvdiso "check these libraries -> bzip2 (>=1.0.5), gtk2 (>=2.16)") set(msg_dep_cdvdiso "check these libraries -> bzip2 (>=1.0.5), gtk2 (>=2.16)")
set(msg_dep_zerogs "check these libraries -> glew (>=1.6), opengl, X11, nvidia-cg-toolkit (>=2.1)") set(msg_dep_zerogs "check these libraries -> glew (>=1.6), opengl, X11, nvidia-cg-toolkit (>=2.1)")
set(msg_dep_gsdx "check these libraries -> opengl, egl, X11") set(msg_dep_gsdx "check these libraries -> opengl, png++, X11")
set(msg_dep_onepad "check these libraries -> sdl (>=1.2), X11") set(msg_dep_onepad "check these libraries -> sdl (>=1.2), X11")
set(msg_dep_spu2x "check these libraries -> soundtouch (>=1.5), alsa, portaudio (>=1.9), sdl (>=1.2) pcsx2 common libs") 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") set(msg_dep_zerospu2 "check these libraries -> soundtouch (>=1.5), alsa")
@ -144,12 +144,12 @@ endif()
# requires: -OpenGL # requires: -OpenGL
# -X11 # -X11
#--------------------------------------- #---------------------------------------
if(OPENGL_FOUND AND X11_FOUND AND GTKn_FOUND AND (EGL_FOUND OR NOT EGL_API)) if(OPENGL_FOUND AND X11_FOUND AND PNGPP_FOUND AND GTKn_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)
else() else()
set(GSdx FALSE) set(GSdx FALSE)
message(STATUS "Skip build of GSdx: miss some dependencies") message(STATUS "Skip build of GSdx: miss some dependencies")
message(STATUS "${msg_dep_gsdx}") message(STATUS "${msg_dep_gsdx}")
endif() endif()

1
debian-packager/control
View File

@ -12,6 +12,7 @@ Build-Depends: cmake (>= 2.8.5),
libglew-dev, libglew-dev,
libglu1-mesa-dev, libglu1-mesa-dev,
libgtk2.0-dev (>= 2.16), libgtk2.0-dev (>= 2.16),
libpng++-dev,
libpulse-dev, libpulse-dev,
libsdl1.2-dev, libsdl1.2-dev,
libsoundtouch-dev, libsoundtouch-dev,

13
plugins/GSdx/CMakeLists.txt
View File

@ -36,10 +36,6 @@ if(XDG_STD)
set(GSdxFinalFlags ${GSdxFinalFlags} -DXDG_STD) set(GSdxFinalFlags ${GSdxFinalFlags} -DXDG_STD)
endif() endif()
if(PNGPP_FOUND)
set(GSdxFinalFlags ${GSdxFinalFlags} -DPNGPP_SUPPORTED)
endif()
if(EGL_API AND EGL_FOUND) if(EGL_API AND EGL_FOUND)
set(GSdxFinalFlags ${GSdxFinalFlags} -DEGL_SUPPORTED) set(GSdxFinalFlags ${GSdxFinalFlags} -DEGL_SUPPORTED)
endif() endif()
@ -88,6 +84,7 @@ set(GSdxSources
GSLinuxDialog.cpp GSLinuxDialog.cpp
GSLocalMemory.cpp GSLocalMemory.cpp
GSPerfMon.cpp GSPerfMon.cpp
GSPng.cpp
GSRasterizer.cpp GSRasterizer.cpp
GSRenderer.cpp GSRenderer.cpp
GSRendererCL.cpp GSRendererCL.cpp
@ -202,9 +199,10 @@ set(GSdxFinalLibs
) )
set(GSdxFinalLibs ${GSdxFinalLibs} set(GSdxFinalLibs ${GSdxFinalLibs}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${GTK2_LIBRARIES} ${GTK2_LIBRARIES}
${LIBC_LIBRARIES} ${LIBC_LIBRARIES}
"-lpng" # yes it sucks
) )
if(EGL_API AND EGL_FOUND) if(EGL_API AND EGL_FOUND)
@ -213,11 +211,6 @@ if(EGL_API AND EGL_FOUND)
) )
endif() endif()
if(PNGPP_FOUND)
set(GSdxFinalLibs ${GSdxFinalLibs}
"-lpng")
endif()
# Generate Glsl header file. Protect with REBUILD_SHADER to avoid build-dependency on PERL # Generate Glsl header file. Protect with REBUILD_SHADER to avoid build-dependency on PERL
if (REBUILD_SHADER) if (REBUILD_SHADER)
add_custom_command(OUTPUT res/glsl_source.h COMMAND perl ${CMAKE_SOURCE_DIR}/linux_various/glsl2h.pl) add_custom_command(OUTPUT res/glsl_source.h COMMAND perl ${CMAKE_SOURCE_DIR}/linux_various/glsl2h.pl)