diff --git a/cmake/SelectPcsx2Plugins.cmake b/cmake/SelectPcsx2Plugins.cmake index 5fe49a954e..eba59f360b 100644 --- a/cmake/SelectPcsx2Plugins.cmake +++ b/cmake/SelectPcsx2Plugins.cmake @@ -4,11 +4,9 @@ set(msg_dep_common_libs "check these libraries -> wxWidgets (>=3.0), aio") set(msg_dep_pcsx2 "check these libraries -> wxWidgets (>=3.0), gtk2, zlib (>=1.2.4), pcsx2 common libs") set(msg_dep_cdvdgiga "check these libraries -> gtk2, libudev") -set(msg_dep_zerogs "check these libraries -> glew, opengl, X11, nvidia-cg-toolkit (>=2.1)") set(msg_dep_gsdx "check these libraries -> opengl, png (>=1.2), zlib (>=1.2.4), X11, liblzma") set(msg_dep_onepad "check these libraries -> sdl2, X11, gtk2") set(msg_dep_spu2x "check these libraries -> soundtouch (>=1.5), alsa, portaudio (optional, >=1.9), sdl (>=1.2), pcsx2 common libs") -set(msg_dep_zerospu2 "check these libraries -> soundtouch (>=1.5), alsa") set(msg_dep_dev "check these libraries -> gtk2, pcap, libxml2") macro(print_dep str dep) @@ -162,26 +160,6 @@ else() endif() #--------------------------------------- -#--------------------------------------- -# zerogs -#--------------------------------------- -# requires: -GLEW -# -OpenGL -# -X11 -# -CG -#--------------------------------------- -if(EXTRA_PLUGINS) - if(GLEW_FOUND AND OPENGL_FOUND AND X11_FOUND AND CG_FOUND) - set(zerogs TRUE) - elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/zerogs") - set(zerogs FALSE) - else() - set(zerogs FALSE) - print_dep("Skip build of zerogs: missing dependencies" "${msg_dep_zerogs}") - endif() -endif() -#--------------------------------------- - #--------------------------------------- # PadNull #--------------------------------------- @@ -258,28 +236,6 @@ else() endif() #--------------------------------------- -#--------------------------------------- -# zerospu2 -#--------------------------------------- -# requires: -SoundTouch -# -ALSA -# -PortAudio -#--------------------------------------- -if(EXTRA_PLUGINS) - if(EXISTS "${CMAKE_SOURCE_DIR}/plugins/zerospu2" AND SOUNDTOUCH_FOUND AND ALSA_FOUND) - set(zerospu2 TRUE) - # Comment the next line, if you want to compile zerospu2 - set(zerospu2 FALSE) - message(STATUS "Don't build zerospu2. It is superceded by spu2x") - elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/zerospu2") - set(zerospu2 FALSE) - else() - set(zerospu2 FALSE) - print_dep("Skip build of zerospu2: missing dependencies" "${msg_dep_zerospu2}") - endif() -endif() -#--------------------------------------- - #--------------------------------------- # USBnull #--------------------------------------- diff --git a/debian-packager/copyright b/debian-packager/copyright index 40b1e37546..0b048046f6 100644 --- a/debian-packager/copyright +++ b/debian-packager/copyright @@ -12,7 +12,7 @@ Files: pcsx2/* common/* plugins/spu2-x/* plugins/PadNull/Pad* plugins/USBnull/* Copyright: 2002-2012 PCSX2 Dev Team License: LGPL-3+ -Files: pcsx2/Mdec.cpp pcsx2/Mdec.h pcsx2/RDebug/deci2_drfp.cpp pcsx2/IPU/mpeg2lib/* pcsx2/cheatscpp.h common/include/api/* plugins/onepad/* plugins/PadNull/Linux/* plugins/SPU2null/* plugins/FWnull/FW.cpp plugins/zerospu2/* plugins/GSnull/Registers.h plugins/GSnull/Linux/Linux* plugins/GSnull/Linux/Config* plugins/dev9null/DEV9.h plugins/dev9null/Config.* +Files: pcsx2/Mdec.cpp pcsx2/Mdec.h pcsx2/RDebug/deci2_drfp.cpp pcsx2/IPU/mpeg2lib/* pcsx2/cheatscpp.h common/include/api/* plugins/onepad/* plugins/PadNull/Linux/* plugins/SPU2null/* plugins/GSnull/Registers.h plugins/GSnull/Linux/Linux* plugins/GSnull/Linux/Config* plugins/dev9null/DEV9.h plugins/dev9null/Config.* Copyright: 2002-2012 PCSX2 Dev Team License: GPL-2+ diff --git a/debian-packager/create_built_tarball.sh b/debian-packager/create_built_tarball.sh index d79ce15625..a2256f1414 100644 --- a/debian-packager/create_built_tarball.sh +++ b/debian-packager/create_built_tarball.sh @@ -90,7 +90,7 @@ remove_not_yet_free_plugin() { echo "Remove non free plugins" # remove also deprecated plugins - for plugin in USBqemu zerogs zerospu2 + for plugin in USBqemu do rm -fr $LOCAL_REPO/plugins/$plugin done diff --git a/linux_various/check_format.sh b/linux_various/check_format.sh index fda5a3e77f..c4e9eb6b17 100755 --- a/linux_various/check_format.sh +++ b/linux_various/check_format.sh @@ -49,8 +49,6 @@ files=`git diff --name-only --diff-filter=ACMRT $diff_range -- $PWD | \ grep -v "${1}plugins/dev9ghzdrk/" | \ grep -v "${1}plugins/GSdx/" | \ grep -v "${1}plugins/USBqemu/" | \ - grep -v "${1}plugins/zerogs/" | \ - grep -v "${1}plugins/zerospu2/" | \ \ grep -v "/resource.h" | \ grep -v "3rdparty/" | \