From 140f2fc0dd4d07df44eb2068790c151ede3ecc0a Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Fri, 11 Dec 2020 11:41:20 +0100 Subject: [PATCH] PAD: continuing windows merge --- pcsx2/MTGS.cpp | 4 + pcsx2/PAD/Windows/{LilyPad.cpp => PAD.cpp} | 0 pcsx2/Sio.cpp | 4 + pcsx2/System/SysCoreThread.cpp | 4 + pcsx2/gui/AppCoreThread.cpp | 4 + pcsx2/gui/AppMain.cpp | 4 + pcsx2/gui/FrameForGS.cpp | 4 + pcsx2/gui/MainMenuClicks.cpp | 4 + pcsx2/gui/SysState.cpp | 4 + pcsx2/windows/VCprojects/pcsx2.vcxproj | 42 ++++++ .../windows/VCprojects/pcsx2.vcxproj.filters | 129 +++++++++++++++++- 11 files changed, 200 insertions(+), 3 deletions(-) rename pcsx2/PAD/Windows/{LilyPad.cpp => PAD.cpp} (100%) diff --git a/pcsx2/MTGS.cpp b/pcsx2/MTGS.cpp index d0a56195c9..7712e989f8 100644 --- a/pcsx2/MTGS.cpp +++ b/pcsx2/MTGS.cpp @@ -23,7 +23,11 @@ #include "Gif_Unit.h" #include "MTVU.h" #include "Elfheader.h" +#ifdef _WIN32 +#include "PAD/Windows/PAD.h" +#else #include "PAD/Linux/PAD.h" +#endif // Uncomment this to enable profiling of the GS RingBufferCopy function. diff --git a/pcsx2/PAD/Windows/LilyPad.cpp b/pcsx2/PAD/Windows/PAD.cpp similarity index 100% rename from pcsx2/PAD/Windows/LilyPad.cpp rename to pcsx2/PAD/Windows/PAD.cpp diff --git a/pcsx2/Sio.cpp b/pcsx2/Sio.cpp index a7ea28f9a6..055fb84b36 100644 --- a/pcsx2/Sio.cpp +++ b/pcsx2/Sio.cpp @@ -20,7 +20,11 @@ #include "ConsoleLogger.h" #include "Sio.h" #include "sio_internal.h" +#ifdef _WIN32 +#include "PAD/Windows/PAD.h" +#else #include "PAD/Linux/PAD.h" +#endif #ifndef DISABLE_RECORDING # include "Recording/InputRecording.h" diff --git a/pcsx2/System/SysCoreThread.cpp b/pcsx2/System/SysCoreThread.cpp index 6547a6b3a7..51ef0ee977 100644 --- a/pcsx2/System/SysCoreThread.cpp +++ b/pcsx2/System/SysCoreThread.cpp @@ -30,7 +30,11 @@ #include "SPU2/spu2.h" #include "DEV9/DEV9.h" #include "USB/USB.h" +#ifdef _WIN32 +#include "PAD/Windows/PAD.h" +#else #include "PAD/Linux/PAD.h" +#endif #include "../DebugTools/MIPSAnalyst.h" #include "../DebugTools/SymbolMap.h" diff --git a/pcsx2/gui/AppCoreThread.cpp b/pcsx2/gui/AppCoreThread.cpp index a96e082560..dca6ff9c56 100644 --- a/pcsx2/gui/AppCoreThread.cpp +++ b/pcsx2/gui/AppCoreThread.cpp @@ -35,7 +35,11 @@ #include "Patch.h" #include "R5900Exceptions.h" #include "Sio.h" +#ifdef _WIN32 +#include "PAD/Windows/PAD.h" +#else #include "PAD/Linux/PAD.h" +#endif #ifndef DISABLE_RECORDING #include "Recording/InputRecordingControls.h" diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp index 2c03921311..4992af621a 100644 --- a/pcsx2/gui/AppMain.cpp +++ b/pcsx2/gui/AppMain.cpp @@ -21,7 +21,11 @@ #include "AppSaveStates.h" #include "AppGameDatabase.h" #include "AppAccelerators.h" +#ifdef _WIN32 +#include "PAD/Windows/PAD.h" +#else #include "PAD/Linux/PAD.h" +#endif #include "Plugins.h" #include "ps2/BiosTools.h" diff --git a/pcsx2/gui/FrameForGS.cpp b/pcsx2/gui/FrameForGS.cpp index 81d954cbf6..b6139efac0 100644 --- a/pcsx2/gui/FrameForGS.cpp +++ b/pcsx2/gui/FrameForGS.cpp @@ -22,7 +22,11 @@ #include "GS.h" #include "MainFrame.h" #include "MSWstuff.h" +#ifdef _WIN32 +#include "PAD/Windows/PAD.h" +#else #include "PAD/Linux/PAD.h" +#endif #include "ConsoleLogger.h" diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp index cd8588c84f..afe9db2c11 100644 --- a/pcsx2/gui/MainMenuClicks.cpp +++ b/pcsx2/gui/MainMenuClicks.cpp @@ -23,7 +23,11 @@ #include "System/SysThreads.h" #include "DEV9/DEV9.h" #include "USB/USB.h" +#ifdef _WIN32 +#include "PAD/Windows/PAD.h" +#else #include "PAD/Linux/PAD.h" +#endif #include "ConsoleLogger.h" #include "MainFrame.h" diff --git a/pcsx2/gui/SysState.cpp b/pcsx2/gui/SysState.cpp index 7683cb8a66..ca649db3d2 100644 --- a/pcsx2/gui/SysState.cpp +++ b/pcsx2/gui/SysState.cpp @@ -25,7 +25,11 @@ #include "Utilities/pxStreams.h" #include "SPU2/spu2.h" #include "USB/USB.h" +#ifdef _WIN32 +#include "PAD/Windows/PAD.h" +#else #include "PAD/Linux/PAD.h" +#endif #include "ConsoleLogger.h" diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj index 14cf7251dd..24e62f5309 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj @@ -81,6 +81,7 @@ + @@ -288,6 +289,24 @@ + + + + + + + + + + + + + + + + + + @@ -629,6 +648,25 @@ + + + + + + + + + + + + + + + + + + + @@ -850,6 +888,7 @@ $(SolutionDir)3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories) + @@ -906,6 +945,9 @@ + + + \ No newline at end of file diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters index 143c5b4dd1..5e51208ac1 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters @@ -214,6 +214,9 @@ {8640e8ca-7d79-4221-b1bf-35bc142a9add} + + {e1cbcaf6-9f65-4f14-9e89-27dd0f10e047} + @@ -264,6 +267,9 @@ AppHost\Dialogs + + System\Ps2\PAD + @@ -1060,9 +1066,6 @@ System\Ps2\DEV9 - - System\DEV9 - System\Ps2\DEV9 @@ -1207,6 +1210,61 @@ System\Ps2\USB\shared + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + @@ -1908,6 +1966,63 @@ System\Ps2\USB\Win32 + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + + + System\Ps2\PAD + @@ -1931,6 +2046,9 @@ System\Ps2\USB\Win32 + + System\Ps2\PAD + @@ -2064,4 +2182,9 @@ AppHost\Resources + + + System\Ps2\PAD + + \ No newline at end of file