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

linux various: 

* Try to launch dev/debug version when pcsx2 isn't found
* remove svn metadata from the linux tarball
* Add libaio on the cmake dependency message


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5624 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2013-05-01 16:02:11 +00:00
parent 4548e916fa
commit 43fb0a9a5e
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/launch_pcsx2_linux.sh
View File

@ -72,9 +72,15 @@ then
fi fi
# Launch PCSX2 # Launch PCSX2
if [ -x pcsx2 ] if [ -x "pcsx2" ]
then then
./pcsx2 $@ ./pcsx2 $@
elif [ -x "pcsx2-dev" ]
then
./pcsx2-dev $@
elif [ -x "pcsx2-dbg" ]
then
./pcsx2-dbg $@
else else
echo "Error PCSX2 not found" echo "Error PCSX2 not found"
echo "Maybe the script was directly 'called'" echo "Maybe the script was directly 'called'"

2
cmake/SelectPcsx2Plugins.cmake
View File

@ -1,7 +1,7 @@
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Dependency message print # Dependency message print
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
set(msg_dep_common_libs "check these libraries -> wxWidgets (>=2.8.10), sparsehash (>=1.5)") set(msg_dep_common_libs "check these libraries -> wxWidgets (>=2.8.10), sparsehash (>=1.5), 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)")

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

@ -136,6 +136,8 @@ echo "Copy the subversion repository to a temporary directory"
rm -fr $NEW_DIR rm -fr $NEW_DIR
cp -r $ROOT_DIR $NEW_DIR cp -r $ROOT_DIR $NEW_DIR
echo "Remove .svn directories"
find $NEW_DIR -name ".svn" -type d -exec rm -fr {} \; 2> /dev/null
echo "Remove windows files (useless & potential copyright issues)" echo "Remove windows files (useless & potential copyright issues)"
# => pcsx2/windows # => pcsx2/windows
# Copyright header must be updated # Copyright header must be updated