pinmame: Normalize name.

Author: freezy

.gitignore

@@ -352,4 +352,4 @@ MigrationBackup/
 .idea/
 
 **/protos/*.cs
-**/Plugins/**
+**/Plugins/**/*.dll

…Unity/Plugins/win-x64/pinmame64.dll.meta …E.Unity/Plugins/win-x64/pinmame.dll.metaVisualPinball.Engine.PinMAME.Unity/Plugins/win-x64/pinmame64.dll.meta renamed to VisualPinball.Engine.PinMAME.Unity/Plugins/win-x64/pinmame.dll.meta VisualPinball.Engine.PinMAME.Unity/Plugins/win-x64/pinmame64.dll.meta renamed to VisualPinball.Engine.PinMAME.Unity/Plugins/win-x64/pinmame.dll.meta

@@ -23,21 +23,35 @@
       <HintPath>..\..\VisualPinball.Engine\VisualPinball.Engine\.bin\Release\netstandard2.1\VisualPinball.Engine.dll</HintPath>
     </Reference> -->
   </ItemGroup>
-  <Target Name="PluginsDeploy" AfterTargets="AfterBuild">
-    <ItemGroup Condition="'$(RuntimeIdentifier)' != 'ios-arm64' And '$(RuntimeIdentifier)' != 'android-arm64-v8a'">
-       <Plugins Include="$(OutDir)PinMameDotNet.dll" />
-    </ItemGroup>
+  <Target Name="PluginsDeploy" AfterTargets="AfterBuild">
+    <ItemGroup Condition="'$(RuntimeIdentifier)' != 'ios-arm64' And '$(RuntimeIdentifier)' != 'android-arm64-v8a'">
+       <Plugins Include="$(OutDir)PinMameDotNet.dll" />
+    </ItemGroup>
     <ItemGroup Condition="'$(RuntimeIdentifier)' == 'ios-arm64'">
        <Plugins Include="$(NuGetPackageRoot)pinmame/$(PinMameVersion)/runtimes/ios/lib/netstandard2.1/PinMameDotNet.dll" />
     </ItemGroup>
     <ItemGroup Condition="'$(RuntimeIdentifier)' == 'android-arm64-v8a'">
        <Plugins Include="$(NuGetPackageRoot)pinmame/$(PinMameVersion)/runtimes/android/lib/netstandard2.1/PinMameDotNet.dll" />
     </ItemGroup>
-    <ItemGroup>
-      <Plugins Include="$(OutDir)$(AssemblyName).dll" />
-      <Plugins Include="$(NuGetPackageRoot)pinmame.native.$(RuntimeIdentifier)/$(PinMameNativeVersion)/runtimes/$(RuntimeIdentifier)/native/*" />
-    </ItemGroup>
-    <Message Text="PluginsDeploy: @(Plugins)" />
-    <Copy SourceFiles="@(Plugins)" DestinationFolder="..\VisualPinball.Engine.PinMAME.Unity\Plugins\$(RuntimeIdentifier)" SkipUnchangedFiles="true" />
-  </Target>
-</Project>
+    <ItemGroup>
+      <Plugins Include="$(OutDir)$(AssemblyName).dll" />
+      <Plugins Condition="'$(RuntimeIdentifier)' != 'win-x64'" Include="$(NuGetPackageRoot)pinmame.native.$(RuntimeIdentifier)/$(PinMameNativeVersion)/runtimes/$(RuntimeIdentifier)/native/*" />
+    </ItemGroup>
+
+    <!-- PinMameDotNet P/Invokes "pinmame" on Windows. The win-x64 native package ships
+         pinmame64.dll, so copy it as pinmame.dll for Unity to resolve it. -->
+    <ItemGroup Condition="'$(RuntimeIdentifier)' == 'win-x64'">
+      <RenamedPlugins Include="$(NuGetPackageRoot)pinmame.native.$(RuntimeIdentifier)/$(PinMameNativeVersion)/runtimes/$(RuntimeIdentifier)/native/pinmame64.dll">
+        <DestinationFile>..\VisualPinball.Engine.PinMAME.Unity\Plugins\$(RuntimeIdentifier)\pinmame.dll</DestinationFile>
+      </RenamedPlugins>
+    </ItemGroup>
+
+    <Message Text="PluginsDeploy: @(Plugins)" />
+    <Copy SourceFiles="@(Plugins)" DestinationFolder="..\VisualPinball.Engine.PinMAME.Unity\Plugins\$(RuntimeIdentifier)" SkipUnchangedFiles="true" />
+
+    <Copy Condition="'@(RenamedPlugins)' != ''" SourceFiles="@(RenamedPlugins)" DestinationFiles="@(RenamedPlugins->'%(DestinationFile)')" SkipUnchangedFiles="true" />
+
+    <!-- If an older build already dropped pinmame64.dll, remove it so the package only contains pinmame.dll. -->
+    <Delete Condition="'$(RuntimeIdentifier)' == 'win-x64'" Files="..\VisualPinball.Engine.PinMAME.Unity\Plugins\$(RuntimeIdentifier)\pinmame64.dll" />
+  </Target>
+</Project>