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

cmake linux: don't build zerospu2. Too much issue on linux, uses spu2x instead. 

debian: fix nvidia cg dependency for latest Ubuntu


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5138 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2012-03-30 19:04:26 +00:00
parent 176e1de80c
commit b6954701e8
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmake/SelectPcsx2Plugins.cmake
View File

@ -188,20 +188,6 @@ else(SDL_FOUND)
endif(SDL_FOUND) endif(SDL_FOUND)
#--------------------------------------- #---------------------------------------
#---------------------------------------
# zeropad
#---------------------------------------
# requires: -SDL
#---------------------------------------
if(SDL_FOUND)
set(zeropad TRUE)
else(SDL_FOUND)
set(zeropad FALSE)
message(STATUS "Skip build of zeropad: miss some dependencies")
message(STATUS "${msg_dep_zeropad}")
endif(SDL_FOUND)
#---------------------------------------
#--------------------------------------- #---------------------------------------
# SPU2null # SPU2null
#--------------------------------------- #---------------------------------------
@ -235,7 +221,10 @@ endif(ALSA_FOUND AND PORTAUDIO_FOUND AND SOUNDTOUCH_FOUND AND common_libs)
# -PortAudio # -PortAudio
#--------------------------------------- #---------------------------------------
if(SOUNDTOUCH_FOUND AND ALSA_FOUND) if(SOUNDTOUCH_FOUND AND ALSA_FOUND)
set(zerospu2 TRUE) set(zerospu2 TRUE)
# Comment the next line, if you want to compile spu2x
set(zerospu2 FALSE)
message(STATUS "Don't build zerospu2. It is super-seeded by spu2x")
else(SOUNDTOUCH_FOUND AND ALSA_FOUND) else(SOUNDTOUCH_FOUND AND ALSA_FOUND)
set(zerospu2 FALSE) set(zerospu2 FALSE)
message(STATUS "Skip build of zerospu2: miss some dependencies") message(STATUS "Skip build of zerospu2: miss some dependencies")

4
debian-unstable-upstream/control
View File

@ -23,7 +23,7 @@ Build-Depends: cmake (>= 2.8),
libx11-dev, libx11-dev,
locales | locales-all, locales | locales-all,
# package was split in precise to allow multiarch support # package was split in precise to allow multiarch support
libcg |nvidia-cg-toolkit (>= 3), libcg, nvidia-cg-toolkit (>= 3),
portaudio19-dev, portaudio19-dev,
zlib1g-dev (>= 1:1.2.3.3) zlib1g-dev (>= 1:1.2.3.3)
Standards-Version: 3.9.2 Standards-Version: 3.9.2
@ -49,7 +49,7 @@ Package: pcsx2-plugins-unstable
Architecture: i386 Architecture: i386
# manually add nvidia-cg-toolkit for zzogl (cg pacakge does not provide symbol or shlibs files) # manually add nvidia-cg-toolkit for zzogl (cg pacakge does not provide symbol or shlibs files)
Depends: ${shlibs:Depends}, ${misc:Depends}, Depends: ${shlibs:Depends}, ${misc:Depends},
nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1) libcg | nvidia-cg-toolkit (>= 2.1)
Recommends: pcsx2-unstable (>= ${binary:Version}), Recommends: pcsx2-unstable (>= ${binary:Version}),
Conflicts: pcsx2-plugins, Conflicts: pcsx2-plugins,
pcsx2-data-unstable pcsx2-data-unstable