diff --git a/3rdparty/SDL-1.3.0-5387/CMakeLists.txt b/3rdparty/SDL-1.3.0-5387/CMakeLists.txt index 2c60c76569..13ab814fe4 100644 --- a/3rdparty/SDL-1.3.0-5387/CMakeLists.txt +++ b/3rdparty/SDL-1.3.0-5387/CMakeLists.txt @@ -14,15 +14,13 @@ set(CommonFlags -msse2 -fvisibility=hidden -pipe - -Wno-format - -Wno-unused-parameter - -Wno-unused-value - -Wunused-variable) + -w + ) # set warning flags set(DebugFlags - -W - -g) + -g + ) # set optimization flags set(OptimizationFlags diff --git a/debian-unstable-upstream/README.Debian b/debian-unstable-upstream/README.Debian index 25e78326f2..fa970c355c 100644 --- a/debian-unstable-upstream/README.Debian +++ b/debian-unstable-upstream/README.Debian @@ -1,13 +1,13 @@ pcsx2 for debian ========================= -* This version has some major modifications against the default upstream version. +* This version has some major modifications against the default upstream code. -> documents are stored in $XDG_CONFIG_HOME instead of $HOME/pcsx2 * Documentation needs some love. Feel free to help. -* -fPIC option was removed for multiple reason. - - Code only support x86 architecture. +* -fPIC option was removed for multiple reasons. + - Code only supports the x86 architecture. - Upstream code uses the ebx register so it's not compliant with PIC. - Impacts the performance too much. - Only plugins. No package will link to them. diff --git a/debian-unstable-upstream/changelog_ubuntu_lucid b/debian-unstable-upstream/changelog_ubuntu_lucid deleted file mode 100644 index 05294a9956..0000000000 --- a/debian-unstable-upstream/changelog_ubuntu_lucid +++ /dev/null @@ -1,6 +0,0 @@ -pcsx2.snapshot (3351-0ubuntu1) lucid; urgency=low - - * Initial release - - -- Gregory Hainaut Thu, 13 May 2010 14:27:56 +0200 - diff --git a/debian-unstable-upstream/control b/debian-unstable-upstream/control index cbe8532a4a..6ea9de4dcb 100644 --- a/debian-unstable-upstream/control +++ b/debian-unstable-upstream/control @@ -1,31 +1,37 @@ -Source: pcsx2.snapshot +Source: pcsx2-unstable Section: contrib/games Priority: optional Maintainer: Gregory Hainaut # WARNING we need dpkg-dev 1.15.7 to support dpkg-buildflags but ubunutu 10.04 have only 1.15.5.6... # WARNING Natty need at least cmake 2.8.5 (multiarch issue) -Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8), - locales|locales-all, - zlib1g-dev (>= 1:1.2.3.3), - libbz2-dev, - libsdl1.2-dev, - libjpeg-dev, - libwxbase2.8-dev, - libwxgtk2.8-dev, - libgtk2.0-dev (>= 2.16), +Build-Depends: cmake (>= 2.8), + debhelper (>= 7.0.50), + dpkg-dev (>= 1.15.5.6), + gcc-multilib [amd64], + g++-multilib [amd64], + ia32-libs-dev [amd64], + lib32asound2-dev [amd64], + lib32bz2-dev [amd64], + lib32z1-dev (>= 1:1.2.3.3) [amd64], libasound2-dev, - portaudio19-dev, -# Virtual package must be enough for all -# libsoundtouch-dev | libsoundtouch1-dev | libsoundtouch0-dev, + libbz2-dev, + libgl1-mesa-dev, + libglew1.5-dev, + libglu1-mesa-dev, + libgtk2.0-dev (>= 2.16), + libjpeg-dev, + libsdl1.2-dev, libsoundtouch-dev, libsparsehash-dev, + libwxbase2.8-dev, + libwxgtk2.8-dev, libx11-dev, - libglew1.5-dev, - libgl1-mesa-dev, - libglu1-mesa-dev, + locales | locales-all, # Note lucid need nvidia-cg-toolkit-pcsx2 to be compatible with ppa - nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 3) -Standards-Version: 3.9.1 + nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 3), + portaudio19-dev, + zlib1g-dev (>= 1:1.2.3.3) +Standards-Version: 3.9.2 Homepage: http://pcsx2.net/ Package: pcsx2-unstable @@ -53,7 +59,7 @@ Recommends: pcsx2-unstable (>= ${binary:Version}), Conflicts: pcsx2-plugins, pcsx2-data-unstable Replaces: pcsx2-data-unstable -Description: Various plugins for pcsx2 +Description: Various plugins for PCSX2 PCSX2 is a PlayStation 2 emulator for Windows and Linux. . WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support @@ -63,7 +69,7 @@ Description: Various plugins for pcsx2 This package includes the plugins for PCSX2. Package: pcsx2-unstable-dbg -Section: debug +Section: contrib/debug Priority: extra Architecture: i386 Depends: ${misc:Depends}, pcsx2-unstable (= ${binary:Version}) @@ -75,10 +81,10 @@ Description: Debug symbols for pcsx2 this instruction set, it does not have enough horse power to run this emulator anyway. . - This package contains the debug symbol of pcsx2. + This package contains the debug symbols for PCSX2. Package: pcsx2-plugins-unstable-dbg -Section: debug +Section: contrib/debug Priority: extra Architecture: i386 Depends: ${misc:Depends}, pcsx2-plugins-unstable (= ${binary:Version}) @@ -90,16 +96,15 @@ Description: Debug symbols of the pcsx2-plugins this instruction set, it does not have enough horse power to run this emulator anyway. . - This package contains the debug symbols of the pcsx2 plugins. + This package contains the debug symbols for the PCSX2 plugins. Package: pcsx2-l10n-unstable -Section: localization -Priority: optional +Section: contrib/localization Architecture: all Depends: ${misc:Depends} Recommends: pcsx2-unstable (>= ${source:Version}) Conflicts: pcsx2-l10n -Description: Languages package for pcsx2 +Description: Language files for PCSX2 PCSX2 is a PlayStation 2 emulator for Windows and Linux. . WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support 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 48c4db0e7f..0c8af50fdb 100755 --- a/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh +++ b/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh @@ -38,7 +38,7 @@ while [ -n "$1" ]; do case $1 in -help|-h) help;shift 1;; -rev|-r) SVN_CO_VERSION=$2; shift 2;; - -branch|-b) BRANCH=$2; shift 1;; + -branch|-b) BRANCH=$2; shift 2;; -local|-l) LOCAL=1;shift 1;; --) shift;break;; -*) echo "ERROR: $1 option does not exists. Use -h for help";exit 1;; @@ -115,13 +115,13 @@ mkdir -p $ROOT_DIR/bin; get_svn_file bin/GameIndex.dbf; get_svn_dir bin/docs;) -echo "Downloading Linux compatible plugins revision ${SVN_CO_VERSION}" +echo "Downloading Linux compatible plugins for revision ${SVN_CO_VERSION}" # Note: Other plugins exist but they are not 100% copyright free. mkdir -p $ROOT_DIR/plugins (cd $ROOT_DIR/plugins; get_svn_file plugins/CMakeLists.txt; get_svn_dir plugins/CDVDnull; - # Potential copyrigh issue. Optional anyway + # Potential copyright issue. Optional anyway # get_svn_dir plugins/CDVDnull plugins/CDVDiso; get_svn_dir plugins/PadNull plugins/onepad; get_svn_dir plugins/SPU2null plugins/spu2-x; @@ -155,7 +155,7 @@ find $NEW_DIR -name "missing" -exec rm -f {} \; find $NEW_DIR -name "aclocal.m4" -exec rm -f {} \; find $NEW_DIR -name "configure.ac" -exec rm -f {} \; find $NEW_DIR -name "Makefile.am" -exec rm -f {} \; -echo "Remove windows file (useless & copyright issue)" +echo "Remove windows files (useless & copyright issues)" find $NEW_DIR -iname "windows" -type d -exec rm -fr {} \; 2> /dev/null find $NEW_DIR -name "Win32" -type d -exec rm -fr {} \; 2> /dev/null rm -fr "${NEW_DIR}/plugins/zzogl-pg/opengl/Win32" diff --git a/debian-unstable-upstream/pcsx2-l10n-unstable.dirs b/debian-unstable-upstream/pcsx2-l10n-unstable.dirs deleted file mode 100644 index 3ce4f58c9b..0000000000 --- a/debian-unstable-upstream/pcsx2-l10n-unstable.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/games/pcsx2/shaders -var/games/pcsx2/ diff --git a/debian-unstable-upstream/pcsx2-plugins-unstable.dirs b/debian-unstable-upstream/pcsx2-plugins-unstable.dirs deleted file mode 100644 index 7f244277b2..0000000000 --- a/debian-unstable-upstream/pcsx2-plugins-unstable.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib/games/pcsx2 diff --git a/debian-unstable-upstream/pcsx2-unstable.dirs b/debian-unstable-upstream/pcsx2-unstable.dirs deleted file mode 100644 index ee80825731..0000000000 --- a/debian-unstable-upstream/pcsx2-unstable.dirs +++ /dev/null @@ -1,4 +0,0 @@ -usr/bin -usr/share/pixmaps -usr/share/applications -var/games/pcsx2 diff --git a/debian-unstable-upstream/rules b/debian-unstable-upstream/rules index 0b9a426cbc..d18928459e 100755 --- a/debian-unstable-upstream/rules +++ b/debian-unstable-upstream/rules @@ -10,7 +10,6 @@ else CMAKE_BUILD_TYPE=Release endif - override_dh_auto_configure: dh_auto_configure -- \ -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \ @@ -24,15 +23,10 @@ clean: dh_testroot dh_auto_clean - rm -fr obj-* # cmake stuff is not always removed (fixed in debhelper 0.9.4) + rm -fr obj-* # cmake stuff is not always removed (fixed in debhelper 8.9.4) dh_clean -## Uncomment this, if fglrx driver is installed. -## Need a confirmation but I think it is useless in recent system -#override_dh_shlibdeps: -# dh_shlibdeps -- --ignore-missing-info - override_dh_strip: dh_strip --package=pcsx2-unstable --dbg-package=pcsx2-unstable-dbg dh_strip --package=pcsx2-plugins-unstable --dbg-package=pcsx2-plugins-unstable-dbg diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 1c6f5a7c56..d00daf377b 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -24,7 +24,7 @@ set(CommonFlags -Wno-format -Wno-unused-parameter -Wno-unused-value - -Wunused-variable) + -Wno-unused-variable) # set warning flags set(DebugFlags diff --git a/plugins/GSnull/CMakeLists.txt b/plugins/GSnull/CMakeLists.txt index f4f7322c4c..ea00dc1d52 100644 --- a/plugins/GSnull/CMakeLists.txt +++ b/plugins/GSnull/CMakeLists.txt @@ -93,11 +93,13 @@ add_library(${Output} SHARED ${GSnullLinuxSources} ${GSnullLinuxHeaders}) -# set output directory -set_target_properties(${Output} PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins) - # User flags options if(NOT USER_CMAKE_LD_FLAGS STREQUAL "") target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}") endif(NOT USER_CMAKE_LD_FLAGS STREQUAL "") + +if(PACKAGE_MODE) + install(TARGETS ${Output} DESTINATION ${PLUGIN_DIR}) +else(PACKAGE_MODE) + install(TARGETS ${Output} DESTINATION ${CMAKE_SOURCE_DIR}/bin/plugins) +endif(PACKAGE_MODE)