diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2018-11-19 15:05:44 -0500 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2018-11-19 15:05:44 -0500 |
| commit | 845d38169c18a15e6ba01911e9740cf732a171bd (patch) | |
| tree | 073d6d8aedc75073c1efcaeae7b8ac4428d7ca24 /build/prepare-install-package.targets | |
| parent | 593723b7940ba72a786fc4c7366c56f9813d977b (diff) | |
| download | SMAPI-845d38169c18a15e6ba01911e9740cf732a171bd.tar.gz SMAPI-845d38169c18a15e6ba01911e9740cf732a171bd.tar.bz2 SMAPI-845d38169c18a15e6ba01911e9740cf732a171bd.zip | |
fix game crash in MacOS
This fixes a game crash in MacOS during startup by copying the Windows versions of those DLLs into SMAPI's internal folder. This was handled by the custom build scripts until SMAPI 2.8.
Diffstat (limited to 'build/prepare-install-package.targets')
| -rw-r--r-- | build/prepare-install-package.targets | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets index aeed101d..3a870bd2 100644 --- a/build/prepare-install-package.targets +++ b/build/prepare-install-package.targets @@ -7,7 +7,8 @@ --> <Target Name="AfterBuild"> <PropertyGroup> - <CompiledRootPath>$(SolutionDir)\..\bin\$(Configuration)</CompiledRootPath> + <RootPath>$(SolutionDir)\..</RootPath> + <CompiledRootPath>$(RootPath)\bin\$(Configuration)</CompiledRootPath> <CompiledSmapiPath>$(CompiledRootPath)\SMAPI</CompiledSmapiPath> <CompiledToolkitPath>$(CompiledRootPath)\SMAPI.Toolkit\net4.5</CompiledToolkitPath> <PackagePath>$(SolutionDir)\..\bin\SMAPI installer</PackagePath> @@ -53,6 +54,10 @@ <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\System.Numerics.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\System.Runtime.Caching.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> + <!-- fix errors on Linux/Mac (sample: https://log.smapi.io/mMdFUpgB) --> + <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(RootPath)\build\lib\System.Numerics.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> + <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(RootPath)\build\lib\System.Runtime.Caching.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> + <!-- fix Linux/Mac permissions --> <Exec Condition="$(OS) != 'Windows_NT'" Command="chmod 755 "$(PackagePath)\install on Linux.sh"" /> <Exec Condition="$(OS) != 'Windows_NT'" Command="chmod 755 "$(PackagePath)\install on Mac.command"" /> |