Skip to content

Commit 5511d2f

Browse files
jsm174jsm174
committed
misc: add support for ios-arm64
1 parent 75a7ff6 commit 5511d2f

File tree

8 files changed

+251
-9
lines changed

8 files changed

+251
-9
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ jobs:
2121
rid: osx-x64
2222
- os: macos-latest
2323
rid: osx-arm64
24+
- os: macos-latest
25+
rid: ios-arm64
2426
- os: ubuntu-latest
2527
rid: linux-x64
2628
steps:

‎README.md‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,22 @@ In order to not accidentally commit those files, we recommend to ignore them:
3636
```bash
3737
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/linux-x64/PinMame.dll.meta
3838
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/linux-x64/VisualPinball.Engine.PinMAME.dll.meta
39-
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/linux-x64/libpinmame.so.3.4.meta
39+
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/linux-x64/libpinmame.so.3.5.meta
4040
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/osx-x64/PinMame.dll.meta
4141
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/osx-x64/VisualPinball.Engine.PinMAME.dll.meta
42-
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/osx-x64/libpinmame.3.4.dylib.meta
42+
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/osx-x64/libpinmame.3.5.dylib.meta
4343
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/osx-arm64/PinMame.dll.meta
4444
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/osx-arm64/VisualPinball.Engine.PinMAME.dll.meta
45-
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/osx-arm64/libpinmame.3.4.dylib.meta
45+
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/osx-arm64/libpinmame.3.5.dylib.meta
46+
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/ios-arm64/PinMame.dll.meta
47+
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/ios-arm64/VisualPinball.Engine.PinMAME.dll.meta
48+
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/ios-arm64/libpinmame.3.5.dylib.meta
4649
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/win-x86/PinMame.dll.meta
4750
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/win-x86/VisualPinball.Engine.PinMAME.dll.meta
48-
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/win-x86/libpinmame-3.4.dll.meta
51+
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/win-x86/libpinmame-3.5.dll.meta
4952
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/win-x64/PinMame.dll.meta
5053
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/win-x64/VisualPinball.Engine.PinMAME.dll.meta
51-
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/win-x64/libpinmame-3.4.dll.meta
54+
git update-index --assume-unchanged VisualPinball.Engine.PinMAME.Unity/Plugins/win-x64/libpinmame-3.5.dll.meta
5255
```
5356

5457
## License

‎VisualPinball.Engine.PinMAME.Unity/Plugins/ios-arm64.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VisualPinball.Engine.PinMAME.Unity/Plugins/ios-arm64/PinMame.dll.meta‎

Lines changed: 76 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VisualPinball.Engine.PinMAME.Unity/Plugins/ios-arm64/VisualPinball.Engine.PinMAME.dll.meta‎

Lines changed: 76 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VisualPinball.Engine.PinMAME.Unity/Plugins/ios-arm64/libpinmame.3.5.dylib.meta‎

Lines changed: 70 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VisualPinball.Engine.PinMAME.Unity/Runtime/PinMameGamelogicEngine.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,15 @@ public void OnInit(Player player, TableApi tableApi, BallManager ballManager)
142142
}
143143

144144
Logger.Info($"New PinMAME instance at {(double)AudioSettings.outputSampleRate / 1000}kHz");
145-
_pinMame = PinMame.PinMame.Instance(PinMameAudioFormat.AudioFormatFloat, AudioSettings.outputSampleRate);
146145

146+
string vpmPath = null;
147+
148+
#if UNITY_IOS && !UNITY_EDITOR
149+
vpmPath = Application.dataPath + "/pinmame";
150+
#endif
151+
152+
_pinMame = PinMame.PinMame.Instance(PinMameAudioFormat.AudioFormatFloat, AudioSettings.outputSampleRate, vpmPath);
153+
147154
_pinMame.SetHandleKeyboard(false);
148155
_pinMame.SetHandleMechanics(DisableMechs ? 0 : 0xFF);
149156

‎VisualPinball.Engine.PinMAME/VisualPinball.Engine.PinMAME.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Linux'))">linux-x64</RuntimeIdentifier>
1414
</PropertyGroup>
1515
<ItemGroup>
16-
<PackageReference Include="PinMame" Version="0.2.0-preview.2" />
17-
<PackageReference Include="PinMame.Native" Version="3.5.0-preview.6" />
16+
<PackageReference Include="PinMame" Version="0.2.0-preview.3" />
17+
<PackageReference Include="PinMame.Native" Version="3.5.0-preview.9" />
1818
<PackageReference Include="VisualPinball.Engine" Version="0.0.1-preview.83" />
1919
<!-- Uncomment when doing local dev -->
2020
<!--
@@ -27,7 +27,7 @@
2727
<ItemGroup>
2828
<Plugins Include="$(OutDir)$(AssemblyName).dll" />
2929
<Plugins Include="$(OutDir)PinMame.dll" />
30-
<Plugins Include="$(NuGetPackageRoot)\pinmame.native.$(RuntimeIdentifier)\3.5.0-preview.6\runtimes\$(RuntimeIdentifier)\native\*" />
30+
<Plugins Include="$(NuGetPackageRoot)\pinmame.native.$(RuntimeIdentifier)\3.5.0-preview.9\runtimes\$(RuntimeIdentifier)\native\*" />
3131
</ItemGroup>
3232
<Message Text="PluginsDeploy: @(Plugins)" />
3333
<Copy SourceFiles="@(Plugins)" DestinationFolder="..\VisualPinball.Engine.PinMAME.Unity\Plugins\$(RuntimeIdentifier)" SkipUnchangedFiles="true" />

0 commit comments

Comments
 (0)