Merge pull request #786 from Pistachioman/lilyxinput

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

plugins/LilyPad/DeviceEnumerator.cpp

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

plugins/LilyPad/LilyPad.vcxproj

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

plugins/LilyPad/LilyPad.vcxproj.filters

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

plugins/LilyPad/XInputEnum.cpp

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