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

Avoid potential header clash between DirectX' and lilypad's xinput.h

This commit is contained in:
Pistachioman 2015-08-21 16:44:21 +02:00
parent 6e826d5193
commit a002e5ff0a
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/LilyPad/DeviceEnumerator.cpp
View File

@ -23,7 +23,7 @@
#include "DirectInput.h" #include "DirectInput.h"
#include "KeyboardHook.h" #include "KeyboardHook.h"
#include "RawInput.h" #include "RawInput.h"
#include "XInput.h" #include "XInputEnum.h"
#include "HidDevice.h" #include "HidDevice.h"
#include "DualShock3.h" #include "DualShock3.h"

4
plugins/LilyPad/LilyPad.vcxproj
View File

@ -450,7 +450,7 @@
<ClCompile Include="WindowsKeyboard.cpp" /> <ClCompile Include="WindowsKeyboard.cpp" />
<ClCompile Include="WindowsMessaging.cpp" /> <ClCompile Include="WindowsMessaging.cpp" />
<ClCompile Include="WindowsMouse.cpp" /> <ClCompile Include="WindowsMouse.cpp" />
<ClCompile Include="XInput.cpp" /> <ClCompile Include="XInputEnum.cpp" />
<ClCompile Include="DeviceEnumerator.cpp" /> <ClCompile Include="DeviceEnumerator.cpp" />
<ClCompile Include="InputManager.cpp" /> <ClCompile Include="InputManager.cpp" />
<ClCompile Include="VKey.cpp"> <ClCompile Include="VKey.cpp">
@ -484,7 +484,7 @@
<ClInclude Include="WindowsKeyboard.h" /> <ClInclude Include="WindowsKeyboard.h" />
<ClInclude Include="WindowsMessaging.h" /> <ClInclude Include="WindowsMessaging.h" />
<ClInclude Include="WindowsMouse.h" /> <ClInclude Include="WindowsMouse.h" />
<ClInclude Include="XInput.h" /> <ClInclude Include="XInputEnum.h" />
<ClInclude Include="DeviceEnumerator.h" /> <ClInclude Include="DeviceEnumerator.h" />
<ClInclude Include="InputManager.h" /> <ClInclude Include="InputManager.h" />
<ClInclude Include="VKey.h" /> <ClInclude Include="VKey.h" />

12
plugins/LilyPad/LilyPad.vcxproj.filters
View File

@ -60,9 +60,6 @@
<ClCompile Include="WindowsMouse.cpp"> <ClCompile Include="WindowsMouse.cpp">
<Filter>InputAPIs</Filter> <Filter>InputAPIs</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="XInput.cpp">
<Filter>InputAPIs</Filter>
</ClCompile>
<ClCompile Include="DeviceEnumerator.cpp"> <ClCompile Include="DeviceEnumerator.cpp">
<Filter>Input</Filter> <Filter>Input</Filter>
</ClCompile> </ClCompile>
@ -75,6 +72,9 @@
<ClCompile Include="WndProcEater.cpp"> <ClCompile Include="WndProcEater.cpp">
<Filter>Input</Filter> <Filter>Input</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="XInputEnum.cpp">
<Filter>InputAPIs</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Config.h"> <ClInclude Include="Config.h">
@ -119,9 +119,6 @@
<ClInclude Include="WindowsMouse.h"> <ClInclude Include="WindowsMouse.h">
<Filter>InputAPIs</Filter> <Filter>InputAPIs</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="XInput.h">
<Filter>InputAPIs</Filter>
</ClInclude>
<ClInclude Include="DeviceEnumerator.h"> <ClInclude Include="DeviceEnumerator.h">
<Filter>Input</Filter> <Filter>Input</Filter>
</ClInclude> </ClInclude>
@ -134,6 +131,9 @@
<ClInclude Include="WndProcEater.h"> <ClInclude Include="WndProcEater.h">
<Filter>Input</Filter> <Filter>Input</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="XInputEnum.h">
<Filter>InputAPIs</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="frog.ico"> <None Include="frog.ico">

1
plugins/LilyPad/XInput.cpp → plugins/LilyPad/XInputEnum.cpp
View File

@ -19,6 +19,7 @@
#include <xinput.h> #include <xinput.h>
#include "VKey.h" #include "VKey.h"
#include "InputManager.h" #include "InputManager.h"
#include "XInputEnum.h"
// This way, I don't require that XInput junk be installed. // This way, I don't require that XInput junk be installed.
typedef void (CALLBACK *_XInputEnable)(BOOL enable); typedef void (CALLBACK *_XInputEnable)(BOOL enable);

0
plugins/LilyPad/XInput.h → plugins/LilyPad/XInputEnum.h
View File