Fix issues when building with new folder organisation.

Author: speps

.gitignore

@@ -29,4 +29,5 @@ BinariesX86/
 BinariesX64/
 XInputUnity4/Library/
 XInputUnity5/Library/
+XInputUnity5/Assets/AssetStoreTools*
 Temp/

Build/UpdateUnityProject.bat

@@ -4,19 +4,19 @@ setlocal
 call BuildCurrentBranch.bat
 
 call :copyToUnity ..\XInputUnity4
+copy ..\BinariesX86\Release\XInputInterface.dll ..\XInputUnity4\
+
 call :copyToUnity ..\XInputUnity5
+
 exit /b 0
 
 :copyToUnity
 setlocal
 if not exist %1\Assets\XInputDotNet\Plugins\x86 md %1\Assets\XInputDotNet\Plugins\x86
 if not exist %1\Assets\XInputDotNet\Plugins\x86_64 md %1\Assets\XInputDotNet\Plugins\x86_64
 
-copy ..\BinariesX86\Release\XInputInterfaceX86.dll %1\Assets\XInputDotNet\Plugins\x86\
-copy ..\BinariesX86\Release\XInputInterfaceX86.dll %1\
-copy ..\BinariesX86\Release\XInputDotNetPure.dll %1\Assets\XInputDotNet\Plugins\x86\
+copy ..\BinariesX86\Release\XInputDotNetPure.dll %1\Assets\XInputDotNet\Plugins\
 
-copy ..\BinariesX64\Release\XInputInterfaceX64.dll %1\Assets\XInputDotNet\Plugins\x86_64\
-copy ..\BinariesX64\Release\XInputInterfaceX64.dll %1\
-copy ..\BinariesX64\Release\XInputDotNetPure.dll %1\Assets\XInputDotNet\Plugins\x86_64\
+copy ..\BinariesX86\Release\XInputInterface.dll %1\Assets\XInputDotNet\Plugins\x86\
+copy ..\BinariesX64\Release\XInputInterface.dll %1\Assets\XInputDotNet\Plugins\x86_64\
 endlocal

README.md

@@ -40,12 +40,17 @@ Some examples are available in this repository :
 
 #### error CS1704: An assembly with the same name `XInputDotNetPure' has already been imported.
 
-If you get this error, or a similar one, make sure the settings for each architecture matches the settings below.
+If you get this error, or a similar one, make sure the settings for each file matches the settings below.
 
+For `Plugins\x86\XInputInterface.dll`
 ![Plugin settings for x86 DLLs](https://raw.github.com/speps/XInputDotNet/master/SettingsX86.jpg)
 
+For `Plugins\x86_64\XInputInterface.dll`
 ![Plugin settings for x86_64 DLLs](https://raw.github.com/speps/XInputDotNet/master/SettingsX64.jpg)
 
+For `Plugins\XInputDotNetPure.dll`
+![Plugin settings for AnyCPU DLLs](https://raw.github.com/speps/XInputDotNet/master/SettingsAnyCPU.jpg)
+
 #### <a name="free"></a>Special instructions for Free version of Unity
 
 NOTE: this is needed only for Unity 4, Unity 5 seems to have the right behaviour

SettingsAnyCPU.jpg

@@ -5,11 +5,7 @@ namespace XInputDotNetPure
 {
     class Imports
     {
-#if WIN64
-        internal const string DLLName = "XInputInterfaceX64";
-#else
-        internal const string DLLName = "XInputInterfaceX86";
-#endif
+        internal const string DLLName = "XInputInterface";
 
         [DllImport(DLLName)]
         public static extern uint XInputGamePadGetState(uint playerIndex, out GamePadState.RawState state);

XInputDotNetPure/GamePad.cs

@@ -26,7 +26,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
@@ -42,10 +42,10 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>..\BinariesX64\Release\</OutputPath>
-    <DefineConstants>TRACE;WIN64</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>

XInputDotNetPure/XInputDotNetPure.csproj

@@ -81,18 +81,10 @@
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)X86</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>$(ProjectName)X86</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>$(ProjectName)X64</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>$(ProjectName)X64</TargetName>
-  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>