Skip to content

Commit

Permalink
Avoid using DllMap configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
kleisauke committed Aug 15, 2020
1 parent 15ce91d commit b19c2c2
Show file tree
Hide file tree
Showing 11 changed files with 10 additions and 157 deletions.
16 changes: 0 additions & 16 deletions VisualPinball.Engine/NetVips.dll.config

This file was deleted.

32 changes: 0 additions & 32 deletions VisualPinball.Engine/NetVips.dll.config.meta

This file was deleted.

20 changes: 10 additions & 10 deletions VisualPinball.Engine/VisualPinball.Engine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup>
<RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Linux'))">linux-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx-x64</RuntimeIdentifier>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
</PropertyGroup>
<ItemGroup>
<None Remove="**/*.meta" Visible="false" />
</ItemGroup>
Expand Down Expand Up @@ -61,11 +66,6 @@
<ItemGroup>
<ProjectReference Include="..\VisualPinball.Resources\VisualPinball.Resources.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="NetVips.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<Target Name="ILRepack" AfterTargets="Build">
<ItemGroup>
<InputAssemblies Include="System.Buffers.dll" />
Expand All @@ -90,15 +90,15 @@
<VendorFiles Include="$(OutDir)NetMiniZ.dll" native="win-x64" />
<VendorFiles Include="$(NuGetPackageRoot)\netminiz.native.win-x64\1.0.4\runtimes\win-x64\native\*.dll" native="win-x64" />

<VendorFiles Include="$(OutDir)NetVips.dll;$(OutDir)NetVips.dll.config" native="osx-x64" />
<VendorFiles Include="$(OutDir)NetVips.dll" native="osx-x64" />
<VendorFiles Include="$(NuGetPackageRoot)\netvips.native.osx-x64\8.9.2-build3\runtimes\osx-x64\native\*.dylib" native="osx-x64" />
<VendorFiles Include="$(OutDir)NetMiniZ.dll" native="osx-x64" />
<VendorFiles Include="$(NuGetPackageRoot)\netminiz.native.osx-x64\1.0.4\runtimes\osx-x64\native\*.dll" native="osx-x64" />
<VendorFiles Include="$(NuGetPackageRoot)\netminiz.native.osx-x64\1.0.4\runtimes\osx-x64\native\*.dylib" native="osx-x64" />

<VendorFiles Include="$(OutDir)NetVips.dll;$(OutDir)NetVips.dll.config" native="linux-x64" />
<VendorFiles Include="$(NuGetPackageRoot)\netvips.native.linux-x64\8.9.2-build3\runtimes\linux-x64\native\*.dylib" native="linux-x64" />
<VendorFiles Include="$(OutDir)NetVips.dll" native="linux-x64" />
<VendorFiles Include="$(NuGetPackageRoot)\netvips.native.linux-x64\8.9.2-build3\runtimes\linux-x64\native\*.so.*" native="linux-x64" />
<VendorFiles Include="$(OutDir)NetMiniZ.dll" native="linux-x64" />
<VendorFiles Include="$(NuGetPackageRoot)\netminiz.native.linux-x64\1.0.4\runtimes\linux-x64\native\*.dll" native="linux-x64" />
<VendorFiles Include="$(NuGetPackageRoot)\netminiz.native.linux-x64\1.0.4\runtimes\linux-x64\native\*.so.*" native="linux-x64" />
</ItemGroup>
<Message Text="VendorDeploy: @(VendorFiles)" />
<Copy SourceFiles="@(VendorFiles)" Condition="'%(VendorFiles.native)' == ''" DestinationFolder="..\VisualPinball.Unity\Vendor\" SkipUnchangedFiles="true" />
Expand Down
17 changes: 0 additions & 17 deletions VisualPinball.Unity/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,6 @@ You'll then have a *Visual Pinball* menu in the Unity editor where you can
import `.vpx` files. You'll be also able to drag and drop `.vpx` files into
your asset folder and Unity will create the table model directly.

*Note:* OSX users will need to add the following `dllmap` entries to the Unity `config` file
prior to launching Unity:

```
<configuration>
<dllmap dll="libvips-42.dll" target="libvips.42.dylib" os="osx" />
<dllmap dll="libglib-2.0-0.dll" target="libvips.42.dylib" os="osx" />
<dllmap dll="libgobject-2.0-0.dll" target="libvips.42.dylib" os="osx" />
.
.
```

The `config` file is located at:

- `2019.4.1f1:` `/Applications/Unity/Hub/Editor/2019.4.1f1/Unity.app/Contents/MonoBleedingEdge/etc/mono/config`
- `2020.1.0b12:` `/Applications/Unity/Hub/Editor/2020.1.0b12/Unity.app/Contents/MonoBleedingEdge/etc/mono/config`

## Future

Unity allows extending its editor. This would allow us to use Unity as a table
Expand Down
Binary file modified VisualPinball.Unity/Vendor/linux-x64/NetVips.dll
Binary file not shown.
9 changes: 0 additions & 9 deletions VisualPinball.Unity/Vendor/linux-x64/NetVips.dll.config

This file was deleted.

32 changes: 0 additions & 32 deletions VisualPinball.Unity/Vendor/linux-x64/NetVips.dll.config.meta

This file was deleted.

Binary file modified VisualPinball.Unity/Vendor/osx-x64/NetVips.dll
Binary file not shown.
9 changes: 0 additions & 9 deletions VisualPinball.Unity/Vendor/osx-x64/NetVips.dll.config

This file was deleted.

32 changes: 0 additions & 32 deletions VisualPinball.Unity/Vendor/osx-x64/NetVips.dll.config.meta

This file was deleted.

Binary file modified VisualPinball.Unity/Vendor/osx-x64/libminiz.2.1.0.dylib
Binary file not shown.

0 comments on commit b19c2c2

Please sign in to comment.