diff --git a/bin/launch_pcsx2_linux.sh b/bin/launch_pcsx2_linux.sh index f18241ea83..6a3681dbbd 100755 --- a/bin/launch_pcsx2_linux.sh +++ b/bin/launch_pcsx2_linux.sh @@ -72,9 +72,15 @@ then fi # Launch PCSX2 -if [ -x pcsx2 ] +if [ -x "pcsx2" ] then ./pcsx2 $@ +elif [ -x "pcsx2-dev" ] +then + ./pcsx2-dev $@ +elif [ -x "pcsx2-dbg" ] +then + ./pcsx2-dbg $@ else echo "Error PCSX2 not found" echo "Maybe the script was directly 'called'" diff --git a/cmake/SelectPcsx2Plugins.cmake b/cmake/SelectPcsx2Plugins.cmake index a097c60c9e..101c49356a 100644 --- a/cmake/SelectPcsx2Plugins.cmake +++ b/cmake/SelectPcsx2Plugins.cmake @@ -1,7 +1,7 @@ #------------------------------------------------------------------------------- # 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_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)") diff --git a/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh b/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh index 6f81365ebf..3f8aab00cf 100755 --- a/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh +++ b/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh @@ -136,6 +136,8 @@ echo "Copy the subversion repository to a temporary directory" rm -fr $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)" # => pcsx2/windows # Copyright header must be updated