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

USB: purge USBnull related mentions in cmake/nsis & formatting

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2020-11-08 19:12:48 +01:00 committed by refractionpcsx2
parent 3b6cdf32fc
commit 08adfb5746
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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_EXTS=".c .h .cpp .hpp .inl"
ALLOWED_ROOT_DIR="./plugins/USBnull ./plugins/GSnull ./plugins/PadNull ./plugins/LilyPad/ ./plugins/onepad/ ./common"
ALLOWED_ROOT_DIR="./plugins/GSnull ./plugins/PadNull ./plugins/LilyPad/ ./plugins/onepad/ ./common"
##################################################################
# There should be no need to change anything below this line.

3
nsis/pcsx2_shared_init.nsi
View File

@ -88,7 +88,6 @@ Function TempFilesOut
File /nonfatal ..\bin\Plugins\gsdx32-sse4.dll
File /nonfatal ..\bin\Plugins\gsdx32-avx2.dll
File /nonfatal ..\bin\Plugins\lilypad.dll
File /nonfatal ..\bin\Plugins\USBnull.dll
SetOutPath "$TEMP\PCSX2 ${APP_VERSION}\Langs"
File /nonfatal /r ..\bin\Langs\*.mo
@ -209,4 +208,4 @@ ${IfNot} ${SectionIsSelected} ${SID_PCSX2}
SendMessage $MUI.FINISHPAGE.RUN ${BM_SETCHECK} ${BST_UNCHECKED} 0
EnableWindow $MUI.FINISHPAGE.RUN 0
${EndIf}
FunctionEnd
FunctionEnd

3
pcsx2/CMakeLists.txt
View File

@ -959,9 +959,6 @@ endif()
if(BUILTIN_PAD)
set(pcsx2FinalLibs "${pcsx2FinalLibs} onepad-1.2.0")
endif()
if(BUILTIN_USB)
set(pcsx2FinalLibs "${pcsx2FinalLibs} USBnull-0.7.0")
endif()
# additonal include directories
include_directories(

2
pcsx2/System/SysCoreThread.cpp
View File

@ -97,7 +97,7 @@ void SysCoreThread::Start()
GetCorePlugins().Init();
SPU2init();
DEV9init();
USBinit();
USBinit();
_parent::Start();
}