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

PAD: continuing windows merge

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2020-12-11 11:41:20 +01:00 committed by lightningterror
parent d1c6b6b789
commit 140f2fc0dd
11 changed files with 200 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/MTGS.cpp
View File

@ -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.

0
pcsx2/PAD/Windows/LilyPad.cpp → pcsx2/PAD/Windows/PAD.cpp
View File

4
pcsx2/Sio.cpp
View File

@ -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"

4
pcsx2/System/SysCoreThread.cpp
View File

@ -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"

4
pcsx2/gui/AppCoreThread.cpp
View File

@ -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"

4
pcsx2/gui/AppMain.cpp
View File

@ -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"

4
pcsx2/gui/FrameForGS.cpp
View File

@ -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"

4
pcsx2/gui/MainMenuClicks.cpp
View File

@ -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"

4
pcsx2/gui/SysState.cpp
View File

@ -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"

42
pcsx2/windows/VCprojects/pcsx2.vcxproj
View File

@ -81,6 +81,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<None Include="..\..\PAD\Windows\Default.ini" />
<None Include="..\..\Utilities\folderdesc.txt" />
<None Include="..\..\Docs\License.txt" />
<None Include="..\..\x86\microVU_Alloc.inl" />
@ -288,6 +289,24 @@
<ClCompile Include="..\..\IopGte.cpp" />
<ClCompile Include="..\..\IPC.cpp" />
<ClCompile Include="..\..\FW.cpp" />
<ClCompile Include="..\..\PAD\Windows\Config.cpp" />
<ClCompile Include="..\..\PAD\Windows\DeviceEnumerator.cpp" />
<ClCompile Include="..\..\PAD\Windows\Diagnostics.cpp" />
<ClCompile Include="..\..\PAD\Windows\DirectInput.cpp" />
<ClCompile Include="..\..\PAD\Windows\DualShock3.cpp" />
<ClCompile Include="..\..\PAD\Windows\Global.cpp" />
<ClCompile Include="..\..\PAD\Windows\HidDevice.cpp" />
<ClCompile Include="..\..\PAD\Windows\InputManager.cpp" />
<ClCompile Include="..\..\PAD\Windows\KeyboardQueue.cpp" />
<ClCompile Include="..\..\PAD\Windows\PAD.cpp" />
<ClCompile Include="..\..\PAD\Windows\RawInput.cpp" />
<ClCompile Include="..\..\PAD\Windows\Tooltips.cpp" />
<ClCompile Include="..\..\PAD\Windows\VKey.cpp" />
<ClCompile Include="..\..\PAD\Windows\WindowsKeyboard.cpp" />
<ClCompile Include="..\..\PAD\Windows\WindowsMessaging.cpp" />
<ClCompile Include="..\..\PAD\Windows\WindowsMouse.cpp" />
<ClCompile Include="..\..\PAD\Windows\WndProcEater.cpp" />
<ClCompile Include="..\..\PAD\Windows\XInputEnum.cpp" />
<ClCompile Include="..\..\SPU2\DplIIdecoder.cpp" />
<ClCompile Include="..\..\SPU2\debug.cpp" />
<ClCompile Include="..\..\SPU2\RegLog.cpp" />
@ -629,6 +648,25 @@
<ClInclude Include="..\..\IopGte.h" />
<ClInclude Include="..\..\IPC.h" />
<ClInclude Include="..\..\FW.h" />
<ClInclude Include="..\..\PAD\Windows\Config.h" />
<ClInclude Include="..\..\PAD\Windows\DeviceEnumerator.h" />
<ClInclude Include="..\..\PAD\Windows\Diagnostics.h" />
<ClInclude Include="..\..\PAD\Windows\DirectInput.h" />
<ClInclude Include="..\..\PAD\Windows\DualShock3.h" />
<ClInclude Include="..\..\PAD\Windows\Global.h" />
<ClInclude Include="..\..\PAD\Windows\HidDevice.h" />
<ClInclude Include="..\..\PAD\Windows\InputManager.h" />
<ClInclude Include="..\..\PAD\Windows\KeyboardQueue.h" />
<ClInclude Include="..\..\PAD\Windows\RawInput.h" />
<ClInclude Include="..\..\PAD\Windows\resource.h" />
<ClInclude Include="..\..\PAD\Windows\Tooltips.h" />
<ClInclude Include="..\..\PAD\Windows\usb.h" />
<ClInclude Include="..\..\PAD\Windows\VKey.h" />
<ClInclude Include="..\..\PAD\Windows\WindowsKeyboard.h" />
<ClInclude Include="..\..\PAD\Windows\WindowsMessaging.h" />
<ClInclude Include="..\..\PAD\Windows\WindowsMouse.h" />
<ClInclude Include="..\..\PAD\Windows\WndProcEater.h" />
<ClInclude Include="..\..\PAD\Windows\XInputEnum.h" />
<ClInclude Include="..\..\SPU2\Config.h" />
<ClInclude Include="..\..\SPU2\Global.h" />
<ClInclude Include="..\..\SPU2\spu2replay.h" />
@ -850,6 +888,7 @@
<ResourceCompile Include="..\..\..\3rdparty\wxwidgets3.0\include\wx\msw\wx.rc">
<AdditionalIncludeDirectories>$(SolutionDir)3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<ResourceCompile Include="..\..\PAD\Windows\LilyPad.rc" />
<ResourceCompile Include="..\..\SPU2\Windows\SPU2.rc" />
<ResourceCompile Include="..\..\DEV9\Win32\DEV9ghzdrk.rc" />
<ResourceCompile Include="..\..\USB\usb-pad\dx\versionproxy.rc" />
@ -906,6 +945,9 @@
<ItemGroup>
<Manifest Include="..\PCSX2.manifest" />
</ItemGroup>
<ItemGroup>
<Image Include="..\..\PAD\Windows\frog.ico" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>

129
pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
View File

@ -214,6 +214,9 @@
<Filter Include="System\Ps2\USB\usb-pad\raw">
<UniqueIdentifier>{8640e8ca-7d79-4221-b1bf-35bc142a9add}</UniqueIdentifier>
</Filter>
<Filter Include="System\Ps2\PAD">
<UniqueIdentifier>{e1cbcaf6-9f65-4f14-9e89-27dd0f10e047}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="..\..\Utilities\folderdesc.txt">
@ -264,6 +267,9 @@
<None Include="..\..\gui\Dialogs\BaseConfigurationDialog.inl">
<Filter>AppHost\Dialogs</Filter>
</None>
<None Include="..\..\PAD\Windows\Default.ini">
<Filter>System\Ps2\PAD</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\Patch.cpp">
@ -1060,9 +1066,6 @@
<ClCompile Include="..\..\DEV9\smap.cpp">
<Filter>System\Ps2\DEV9</Filter>
</ClCompile>
<ClCompile Include="..\..\DEV9\net.cpp">
<Filter>System\DEV9</Filter>
</ClCompile>
<ClCompile Include="..\..\DEV9\Win32\tap-win32.cpp">
<Filter>System\Ps2\DEV9</Filter>
</ClCompile>
@ -1207,6 +1210,61 @@
<ClCompile Include="..\..\USB\shared\rawinput_usb.cpp">
<Filter>System\Ps2\USB\shared</Filter>
</ClCompile>
<ClCompile Include="..\..\DEV9\net.cpp" />
<ClCompile Include="..\..\PAD\Windows\Config.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\DeviceEnumerator.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\Diagnostics.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\DirectInput.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\DualShock3.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\Global.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\HidDevice.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\InputManager.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\KeyboardQueue.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\RawInput.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\Tooltips.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\VKey.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\WindowsKeyboard.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\WindowsMessaging.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\WindowsMouse.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\WndProcEater.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\XInputEnum.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
<ClCompile Include="..\..\PAD\Windows\PAD.cpp">
<Filter>System\Ps2\PAD</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\Patch.h">
@ -1908,6 +1966,63 @@
<ClInclude Include="..\..\USB\Win32\resource_usb.h">
<Filter>System\Ps2\USB\Win32</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\Config.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\DeviceEnumerator.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\Diagnostics.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\DirectInput.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\DualShock3.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\Global.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\HidDevice.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\InputManager.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\KeyboardQueue.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\RawInput.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\resource.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\Tooltips.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\usb.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\VKey.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\WindowsKeyboard.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\WindowsMessaging.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\WindowsMouse.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\WndProcEater.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
<ClInclude Include="..\..\PAD\Windows\XInputEnum.h">
<Filter>System\Ps2\PAD</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\wxResources.rc">
@ -1931,6 +2046,9 @@
<ResourceCompile Include="..\..\USB\Win32\USBDialog.rc">
<Filter>System\Ps2\USB\Win32</Filter>
</ResourceCompile>
<ResourceCompile Include="..\..\PAD\Windows\LilyPad.rc">
<Filter>System\Ps2\PAD</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<CustomBuildStep Include="..\..\rdebug\deci2.h">
@ -2064,4 +2182,9 @@
<Filter>AppHost\Resources</Filter>
</Manifest>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\PAD\Windows\frog.ico">
<Filter>System\Ps2\PAD</Filter>
</Image>
</ItemGroup>
</Project>