From 306681bc9365347ec3854468c8faa87627cf8e6b Mon Sep 17 00:00:00 2001 From: lightningterror <18107717+lightningterror@users.noreply.github.com> Date: Mon, 2 Nov 2020 00:55:11 +0100 Subject: [PATCH] misc: Remove merged plugins leftover stuff. --- build.sh | 2 +- cmake/BuildParameters.cmake | 16 ---------------- debian-packager/copyright | 6 +----- linux_various/pre-commit | 2 +- nsis/pcsx2_shared_init.nsi | 2 -- pcsx2/CMakeLists.txt | 9 --------- pcsx2/Docs/PCSX2_FAQ.md | 1 - 7 files changed, 3 insertions(+), 35 deletions(-) diff --git a/build.sh b/build.sh index 5b55cd33af..cb012982cf 100755 --- a/build.sh +++ b/build.sh @@ -107,7 +107,7 @@ run_cppcheck() check="--enable=warning,style,missingInclude" - for d in pcsx2 common plugins/GSdx plugins/spu2\-x plugins/onepad plugins/cdvdGigaherz + for d in pcsx2 common plugins/GSdx plugins/onepad do flat_d=$(echo $d | sed -e 's@/@_@') log=cpp_check__${flat_d}.log diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake index 54cc8d71c0..d266357511 100644 --- a/cmake/BuildParameters.cmake +++ b/cmake/BuildParameters.cmake @@ -102,11 +102,7 @@ endif() #------------------------------------------------------------------------------- option(BUILTIN_GS "Disable support of GS plugin (developer option)") option(BUILTIN_PAD "Disable support of PAD plugin (developer option)") -option(BUILTIN_SPU2 "Disable support of SPU2 plugin (developer option)") option(BUILTIN_USB "Disable support of USB plugin (developer option)") -option(BUILTIN_FW "Disable support of FW plugin (developer option)") -option(BUILTIN_DEV9 "Disable support of DEV9 plugin (developer option)") -option(BUILTIN_CDVD "Disable support of CDVD plugin (developer option)") set(PLUGIN_SUPPORT "") if(BUILTIN_GS) @@ -115,21 +111,9 @@ endif() if(BUILTIN_PAD) set(PLUGIN_SUPPORT "${PLUGIN_SUPPORT} -DBUILTIN_PAD_PLUGIN") endif() -if(BUILTIN_SPU2) - set(PLUGIN_SUPPORT "${PLUGIN_SUPPORT} -DBUILTIN_SPU2_PLUGIN") -endif() if(BUILTIN_USB) set(PLUGIN_SUPPORT "${PLUGIN_SUPPORT} -DBUILTIN_USB_PLUGIN") endif() -if(BUILTIN_FW) - set(PLUGIN_SUPPORT "${PLUGIN_SUPPORT} -DBUILTIN_FW_PLUGIN") -endif() -if(BUILTIN_DEV) - set(PLUGIN_SUPPORT "${PLUGIN_SUPPORT} -DBUILTIN_DEV_PLUGIN") -endif() -if(BUILTIN_CDVD) - set(PLUGIN_SUPPORT "${PLUGIN_SUPPORT} -DBUILTIN_CDVD_PLUGIN") -endif() #------------------------------------------------------------------------------- # if no build type is set, use Devel as default diff --git a/debian-packager/copyright b/debian-packager/copyright index 0b048046f6..76e39c9580 100644 --- a/debian-packager/copyright +++ b/debian-packager/copyright @@ -8,7 +8,7 @@ Copyright: 2010-2012 Miguel Colon License: LGPL-3 -Files: pcsx2/* common/* plugins/spu2-x/* plugins/PadNull/Pad* plugins/USBnull/* plugins/FWnull/* plugins/CDVDnull/CDVD* plugins/GSnull/* plugins/dev9null/DEV9.cpp +Files: pcsx2/* common/* plugins/PadNull/Pad* plugins/USBnull/* plugins/GSnull/* Copyright: 2002-2012 PCSX2 Dev Team License: LGPL-3+ @@ -16,10 +16,6 @@ Files: pcsx2/Mdec.cpp pcsx2/Mdec.h pcsx2/RDebug/deci2_drfp.cpp pcsx2/IPU/mpeg2li Copyright: 2002-2012 PCSX2 Dev Team License: GPL-2+ -Files: plugins/spu2-x/src/Spu2replay.* plugins/spu2-x/src/Decode* plugins/spu2-x/src/Linux/ConfigSoundTouch.cpp plugins/spu2-x/src/spdif.h plugins/spu2-x/src/Debug.h -Copyright: 2002-2012 PCSX2 Dev Team -License: LGPL-2.1+ - Files: common/src/Utilities/vssprintf.cpp Copyright: 2002 Michael Ringgaard License: BSD-3-Clause diff --git a/linux_various/pre-commit b/linux_various/pre-commit index 8564bdb137..577637edf6 100755 --- a/linux_various/pre-commit +++ b/linux_various/pre-commit @@ -28,7 +28,7 @@ PARSE_EXTS=true # file types to parse. Only effective when PARSE_EXTS is true. FILE_EXTS=".c .h .cpp .hpp .inl" -ALLOWED_ROOT_DIR="./plugins/USBnull ./plugins/SPU2null ./plugins/FWnull ./plugins/dev9null ./plugins/GSnull ./plugins/CDVDnull ./plugins/PadNull ./plugins/LilyPad/ ./plugins/onepad/ ./plugins/spu2-x/ ./common" +ALLOWED_ROOT_DIR="./plugins/USBnull ./plugins/GSnull ./plugins/PadNull ./plugins/LilyPad/ ./plugins/onepad/ ./common" ################################################################## # There should be no need to change anything below this line. diff --git a/nsis/pcsx2_shared_init.nsi b/nsis/pcsx2_shared_init.nsi index 7bbfe26291..112a8c13eb 100644 --- a/nsis/pcsx2_shared_init.nsi +++ b/nsis/pcsx2_shared_init.nsi @@ -87,10 +87,8 @@ Function TempFilesOut File /nonfatal ..\bin\Plugins\gsdx32-sse2.dll File /nonfatal ..\bin\Plugins\gsdx32-sse4.dll File /nonfatal ..\bin\Plugins\gsdx32-avx2.dll - File /nonfatal ..\bin\Plugins\spu2-x.dll File /nonfatal ..\bin\Plugins\lilypad.dll File /nonfatal ..\bin\Plugins\USBnull.dll - File /nonfatal ..\bin\Plugins\DEV9null.dll SetOutPath "$TEMP\PCSX2 ${APP_VERSION}\Langs" File /nonfatal /r ..\bin\Langs\*.mo diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index a87c70b7f3..552cde55b8 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -849,15 +849,6 @@ endif() if(BUILTIN_USB) set(pcsx2FinalLibs "${pcsx2FinalLibs} USBnull-0.7.0") endif() -if(BUILTIN_FW) - set(pcsx2FinalLibs "${pcsx2FinalLibs} FWnull-0.7.0") -endif() -if(BUILTIN_DEV) - set(pcsx2FinalLibs "${pcsx2FinalLibs} dev9null-0.5.0") -endif() -if(BUILTIN_CDVD) - set(pcsx2FinalLibs "${pcsx2FinalLibs} CDVDnull") -endif() # additonal include directories include_directories( diff --git a/pcsx2/Docs/PCSX2_FAQ.md b/pcsx2/Docs/PCSX2_FAQ.md index 1251c31b63..737ed48aac 100644 --- a/pcsx2/Docs/PCSX2_FAQ.md +++ b/pcsx2/Docs/PCSX2_FAQ.md @@ -159,7 +159,6 @@ PCSX2 uses a plugin framework for various sections of the emulator. A plugin is * Video (GSdx) * Controls (Lilypad for Windows, OnePad for Linux) * USB (No plugin included) -* Firewire (No plugin included) Each plugin will have its own Plugin Settings menu, and can be found under the Config menu.