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

debian: don't ship null plugins 

build.sh: fix shell bug & update the help


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5263 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2012-06-02 08:01:04 +00:00
parent 77f0422e7d
commit ef976706f6
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build.sh
View File

@ -15,7 +15,6 @@
# If not, see <http://www.gnu.org/licenses/>. # If not, see <http://www.gnu.org/licenses/>.
flags="" flags=""
args="$@"
clean_build=false clean_build=false
for f in $* for f in $*
@ -25,10 +24,7 @@ do
flags="$flags -DFORCE_INTERNAL_SDL=TRUE" flags="$flags -DFORCE_INTERNAL_SDL=TRUE"
echo "Warning SDL is not supported anymore" echo "Warning SDL is not supported anymore"
;; ;;
--dev) --dev|--devel)
flags="$flags -DCMAKE_BUILD_TYPE=Devel"
;;
--devel)
flags="$flags -DCMAKE_BUILD_TYPE=Devel" flags="$flags -DCMAKE_BUILD_TYPE=Devel"
;; ;;
--debug) --debug)
@ -39,24 +35,26 @@ do
;; ;;
--glsl) --glsl)
flags="$flags -DGLSL_API=TRUE" flags="$flags -DGLSL_API=TRUE"
;;
--clean) --clean)
clean_build=true clean_build=true
;; ;;
*) *)
# unknown option # unknown option
echo "Valid options are:" echo "Valid options are:"
echo "--dev / --devel - Build pcsx2 as a Development build." echo "--dev / --devel - Build PCSX2 as a Development build."
echo "--debug - Build pcsx2 as a Debug build." echo "--debug - Build PCSX2 as a Debug build."
echo "--release - Build pcsx2 as a Release build." echo "--release - Build PCSX2 as a Release build."
echo "--clean - Do a clean build." echo "--clean - Do a clean build."
echo "--sdl13 - Use the internal copy of sdl (needed for gsdx to use sdl)." echo "--glsl - Replace CG backend of ZZogl by GLSL"
echo "--sdl13 - Use the internal copy of SDL (add sdl backend to gsdx)."
exit 1;; exit 1;;
esac esac
done done
rm install_log.txt rm install_log.txt
if [ $flags ]; then if [ "$flags" != "" ]; then
echo "Building pcsx2 with $flags" echo "Building pcsx2 with $flags"
echo "Building pcsx2 with $flags" > install_log.txt echo "Building pcsx2 with $flags" > install_log.txt
fi fi
@ -67,7 +65,7 @@ fi
cd build cd build
cmake $flags .. 2>&1 | tee -a ../install_log.txt cmake $flags .. 2>&1 | tee -a ../install_log.txt
if [ $clean_build = true ]; then if [ "$clean_build" = true ]; then
echo "Doing a clean build." echo "Doing a clean build."
make clean 2>&1 | tee -a ../install_log.txt make clean 2>&1 | tee -a ../install_log.txt
fi fi

6
debian-unstable-upstream/control
View File

@ -20,7 +20,7 @@ Build-Depends: cmake (>= 2.8.5),
libwxgtk2.8-dev, libwxgtk2.8-dev,
libx11-dev, libx11-dev,
locales | locales-all, locales | locales-all,
# package was split in precise to allow multiarch support # Future: depends on "nvidia-cg-dev" directly
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)
@ -29,10 +29,8 @@ Homepage: http://pcsx2.net/
Package: pcsx2-unstable Package: pcsx2-unstable
Architecture: i386 Architecture: i386
# manually add nvidia-cg-toolkit for zzogl (cg pacakge does not provide symbol or shlibs files)
# recommand libasound for alsa plugin for pulseaudio # recommand libasound for alsa plugin for pulseaudio
Depends: ${shlibs:Depends}, ${misc:Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}
libcg | nvidia-cg-toolkit (>= 2.1)
Recommends: libasound2-plugins Recommends: libasound2-plugins
Conflicts: pcsx2, Conflicts: pcsx2,
pcsx2-data-unstable, pcsx2-data-unstable,

6
debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh
View File

@ -123,9 +123,9 @@ mkdir -p $ROOT_DIR/plugins
get_svn_dir plugins/CDVDnull; get_svn_dir plugins/CDVDnull;
# Potential copyright issue. Optional anyway # Potential copyright issue. Optional anyway
# get_svn_dir plugins/CDVDnull plugins/CDVDiso; # get_svn_dir plugins/CDVDnull plugins/CDVDiso;
get_svn_dir plugins/PadNull plugins/onepad; get_svn_dir plugins/onepad;
get_svn_dir plugins/SPU2null plugins/spu2-x; get_svn_dir plugins/spu2-x;
get_svn_dir plugins/GSnull plugins/zzogl-pg plugins/zzogl-pg-cg plugins/GSdx; get_svn_dir plugins/zzogl-pg plugins/zzogl-pg-cg plugins/GSdx;
get_svn_dir plugins/dev9null plugins/FWnull plugins/USBnull; get_svn_dir plugins/dev9null plugins/FWnull plugins/USBnull;
echo "Note: some plugins are more or less deprecated CDVDisoEFP, CDVDlinuz, Zerogs, Zeropad ..."; echo "Note: some plugins are more or less deprecated CDVDisoEFP, CDVDlinuz, Zerogs, Zeropad ...";
echo "Done") echo "Done")