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

ci|cmake|debian: Remove png++ build dependencies 

GSdx now uses libpng directly. png++ is now unused, so let's remove it.
This commit is contained in:
Jonathan Li 2016-02-21 10:50:55 +00:00
parent ee5861efc8
commit 97215008c9
5 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/SearchForStuff.cmake
View File

@ -74,7 +74,6 @@ if(EGL_API)
endif()
check_lib(PORTAUDIO portaudio portaudio.h pa_linux_alsa.h)
check_lib(SOUNDTOUCH SoundTouch soundtouch/SoundTouch.h)
check_lib(PNGPP FALSE png++/png.hpp)
if(SDL2_API)
check_lib(SDL2 SDL2 SDL.h PATH_SUFFIXES SDL2)

2
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_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_gsdx "check these libraries -> opengl, png++, X11")
set(msg_dep_gsdx "check these libraries -> opengl, png (>=1.2), zlib (>=1.2.4), X11")
set(msg_dep_onepad "check these libraries -> sdl (>=1.2), X11, gtk2 (>=2.16)")
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")

1
debian-packager/control
View File

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

4
plugins/GSdx/CMakeLists.txt
View File

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

5
travis.sh
View File

@ -48,10 +48,6 @@ linux_32_before_install() {
portaudio19-dev:i386 \
zlib1g-dev:i386 \
${COMPILER_PACKAGE}
# libpng++-dev is noarch but doesn't install nicely.
apt-get download libpng++-dev
sudo dpkg --force-all -i $(ls | grep 'libpng++-dev')
}
linux_32_script() {
@ -91,7 +87,6 @@ linux_64_before_install() {
libaio-dev \
libasound2-dev \
libgtk2.0-dev \
libpng++-dev \
libpng12-dev \
libsdl2-dev \
libsoundtouch-dev \