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

misc: Remove merged plugins leftover stuff.

This commit is contained in:
lightningterror 2020-11-02 00:55:11 +01:00
parent ac9700f261
commit 306681bc93
7 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -107,7 +107,7 @@ run_cppcheck()
check="--enable=warning,style,missingInclude" 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 do
flat_d=$(echo $d | sed -e 's@/@_@') flat_d=$(echo $d | sed -e 's@/@_@')
log=cpp_check__${flat_d}.log log=cpp_check__${flat_d}.log

16
cmake/BuildParameters.cmake
View File

@ -102,11 +102,7 @@ endif()
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
option(BUILTIN_GS "Disable support of GS plugin (developer option)") option(BUILTIN_GS "Disable support of GS plugin (developer option)")
option(BUILTIN_PAD "Disable support of PAD 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_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 "") set(PLUGIN_SUPPORT "")
if(BUILTIN_GS) if(BUILTIN_GS)
@ -115,21 +111,9 @@ endif()
if(BUILTIN_PAD) if(BUILTIN_PAD)
set(PLUGIN_SUPPORT "${PLUGIN_SUPPORT} -DBUILTIN_PAD_PLUGIN") set(PLUGIN_SUPPORT "${PLUGIN_SUPPORT} -DBUILTIN_PAD_PLUGIN")
endif() endif()
if(BUILTIN_SPU2)
set(PLUGIN_SUPPORT "${PLUGIN_SUPPORT} -DBUILTIN_SPU2_PLUGIN")
endif()
if(BUILTIN_USB) if(BUILTIN_USB)
set(PLUGIN_SUPPORT "${PLUGIN_SUPPORT} -DBUILTIN_USB_PLUGIN") set(PLUGIN_SUPPORT "${PLUGIN_SUPPORT} -DBUILTIN_USB_PLUGIN")
endif() 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 # if no build type is set, use Devel as default

6
debian-packager/copyright
View File

@ -8,7 +8,7 @@ Copyright:
2010-2012 Miguel Colon <debian.micove@gmail.com> 2010-2012 Miguel Colon <debian.micove@gmail.com>
License: LGPL-3 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 Copyright: 2002-2012 PCSX2 Dev Team
License: LGPL-3+ 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 Copyright: 2002-2012 PCSX2 Dev Team
License: GPL-2+ 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 Files: common/src/Utilities/vssprintf.cpp
Copyright: 2002 Michael Ringgaard Copyright: 2002 Michael Ringgaard
License: BSD-3-Clause License: BSD-3-Clause

2
linux_various/pre-commit
View File

@ -28,7 +28,7 @@ PARSE_EXTS=true
# file types to parse. Only effective when PARSE_EXTS is true. # file types to parse. Only effective when PARSE_EXTS is true.
FILE_EXTS=".c .h .cpp .hpp .inl" 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. # There should be no need to change anything below this line.

2
nsis/pcsx2_shared_init.nsi
View File

@ -87,10 +87,8 @@ Function TempFilesOut
File /nonfatal ..\bin\Plugins\gsdx32-sse2.dll File /nonfatal ..\bin\Plugins\gsdx32-sse2.dll
File /nonfatal ..\bin\Plugins\gsdx32-sse4.dll File /nonfatal ..\bin\Plugins\gsdx32-sse4.dll
File /nonfatal ..\bin\Plugins\gsdx32-avx2.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\lilypad.dll
File /nonfatal ..\bin\Plugins\USBnull.dll File /nonfatal ..\bin\Plugins\USBnull.dll
File /nonfatal ..\bin\Plugins\DEV9null.dll
SetOutPath "$TEMP\PCSX2 ${APP_VERSION}\Langs" SetOutPath "$TEMP\PCSX2 ${APP_VERSION}\Langs"
File /nonfatal /r ..\bin\Langs\*.mo File /nonfatal /r ..\bin\Langs\*.mo

9
pcsx2/CMakeLists.txt
View File

@ -849,15 +849,6 @@ endif()
if(BUILTIN_USB) if(BUILTIN_USB)
set(pcsx2FinalLibs "${pcsx2FinalLibs} USBnull-0.7.0") set(pcsx2FinalLibs "${pcsx2FinalLibs} USBnull-0.7.0")
endif() 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 # additonal include directories
include_directories( include_directories(

1
pcsx2/Docs/PCSX2_FAQ.md
View File

@ -159,7 +159,6 @@ PCSX2 uses a plugin framework for various sections of the emulator. A plugin is
* Video (GSdx) * Video (GSdx)
* Controls (Lilypad for Windows, OnePad for Linux) * Controls (Lilypad for Windows, OnePad for Linux)
* USB (No plugin included) * 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. Each plugin will have its own Plugin Settings menu, and can be found under the Config menu.