From b6954701e84b0fddd0bcd650c5a7eae90eeff10a Mon Sep 17 00:00:00 2001 From: "gregory.hainaut" Date: Fri, 30 Mar 2012 19:04:26 +0000 Subject: [PATCH] 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 --- cmake/SelectPcsx2Plugins.cmake | 19 ++++--------------- debian-unstable-upstream/control | 4 ++-- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/cmake/SelectPcsx2Plugins.cmake b/cmake/SelectPcsx2Plugins.cmake index b4cf72779e..060bf06815 100644 --- a/cmake/SelectPcsx2Plugins.cmake +++ b/cmake/SelectPcsx2Plugins.cmake @@ -188,20 +188,6 @@ else(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 #--------------------------------------- @@ -235,7 +221,10 @@ endif(ALSA_FOUND AND PORTAUDIO_FOUND AND SOUNDTOUCH_FOUND AND common_libs) # -PortAudio #--------------------------------------- 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) set(zerospu2 FALSE) message(STATUS "Skip build of zerospu2: miss some dependencies") diff --git a/debian-unstable-upstream/control b/debian-unstable-upstream/control index 9fe07dd28f..b33dfba216 100644 --- a/debian-unstable-upstream/control +++ b/debian-unstable-upstream/control @@ -23,7 +23,7 @@ Build-Depends: cmake (>= 2.8), libx11-dev, locales | locales-all, # package was split in precise to allow multiarch support - libcg |nvidia-cg-toolkit (>= 3), + libcg, nvidia-cg-toolkit (>= 3), portaudio19-dev, zlib1g-dev (>= 1:1.2.3.3) Standards-Version: 3.9.2 @@ -49,7 +49,7 @@ Package: pcsx2-plugins-unstable Architecture: i386 # manually add nvidia-cg-toolkit for zzogl (cg pacakge does not provide symbol or shlibs files) 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}), Conflicts: pcsx2-plugins, pcsx2-data-unstable