diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.targets | 29 | ||||
| -rw-r--r-- | build/find-game-folder.targets | 2 | ||||
| -rw-r--r-- | build/prepare-install-package.targets | 8 |
3 files changed, 22 insertions, 17 deletions
diff --git a/build/common.targets b/build/common.targets index d680fa74..3278a0da 100644 --- a/build/common.targets +++ b/build/common.targets @@ -1,17 +1,23 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - - <Import Project="find-game-folder.targets" /> - - <!--set properties --> <PropertyGroup> - <Version>3.9.5</Version> + <!--set general build properties --> + <Version>3.10.0</Version> <Product>SMAPI</Product> - <LangVersion>latest</LangVersion> <AssemblySearchPaths>$(AssemblySearchPaths);{GAC}</AssemblySearchPaths> - <DefineConstants Condition="$(OS) == 'Windows_NT'">$(DefineConstants);SMAPI_FOR_WINDOWS;SMAPI_FOR_XNA</DefineConstants> + + <!--uncomment for 64-bit Stardew Valley on Windows--> + <!--<GamePath>D:\dev\SDV 64-bit\6125897</GamePath> + <DefineConstants>$(DefineConstants);SMAPI_FOR_WINDOWS_64BIT_HACK</DefineConstants>--> + + <!--set platform--> + <DefineConstants Condition="$(OS) == 'Windows_NT'">$(DefineConstants);SMAPI_FOR_WINDOWS</DefineConstants> + <DefineConstants Condition="$(OS) == 'Windows_NT' AND !$(DefineConstants.Contains(SMAPI_FOR_WINDOWS_64BIT_HACK))">$(DefineConstants);SMAPI_FOR_XNA</DefineConstants> </PropertyGroup> + <!--find game folder--> + <Import Project="find-game-folder.targets" /> + <!-- if game path is invalid, show one user-friendly error instead of a slew of reference errors --> <Target Name="ValidateInstallPath" AfterTargets="BeforeBuild"> <Error Condition="!Exists('$(GamePath)')" Text="Failed to find the game install path automatically. You can specify where to find it; see https://smapi.io/package/custom-game-path." /> @@ -50,9 +56,9 @@ </Target> <Target Name="CopyToolkit" Condition="'$(MSBuildProjectName)' == 'SMAPI.Toolkit' AND $(TargetFramework) == 'net4.5'" AfterTargets="PostBuildEvent"> - <Copy SourceFiles="$(TargetDir)\$(TargetName).dll" DestinationFolder="$(GamePath)\smapi-internal" /> - <Copy SourceFiles="$(TargetDir)\$(TargetName).pdb" DestinationFolder="$(GamePath)\smapi-internal" /> - <Copy SourceFiles="$(TargetDir)\$(TargetName).xml" DestinationFolder="$(GamePath)\smapi-internal" /> + <Copy SourceFiles="$(TargetDir)\$(TargetName).dll" DestinationFolder="$(GamePath)\smapi-internal" /> + <Copy SourceFiles="$(TargetDir)\$(TargetName).pdb" DestinationFolder="$(GamePath)\smapi-internal" /> + <Copy SourceFiles="$(TargetDir)\$(TargetName).xml" DestinationFolder="$(GamePath)\smapi-internal" /> </Target> <Target Name="CopyToolkitCoreInterfaces" Condition="'$(MSBuildProjectName)' == 'SMAPI.Toolkit.CoreInterfaces' AND $(TargetFramework) == 'net4.5'" AfterTargets="PostBuildEvent"> @@ -74,7 +80,6 @@ <StartWorkingDirectory>$(GamePath)</StartWorkingDirectory> </PropertyGroup> - <!-- Somehow this makes Visual Studio for Mac recognise the previous section. Nobody knows why. --> + <!-- Somehow this makes Visual Studio for macOS recognise the previous section. Nobody knows why. --> <PropertyGroup Condition="'$(RunConfiguration)' == 'Default'" /> - </Project> diff --git a/build/find-game-folder.targets b/build/find-game-folder.targets index ec8a3787..7a9bfc50 100644 --- a/build/find-game-folder.targets +++ b/build/find-game-folder.targets @@ -13,7 +13,7 @@ <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/.local/share/Steam/steamapps/common/Stardew Valley</GamePath> <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/.var/app/com.valvesoftware.Steam/data/Steam/steamapps/common/Stardew Valley</GamePath> - <!-- Mac (may be 'Unix' or 'OSX') --> + <!-- macOS (may be 'Unix' or 'OSX') --> <GamePath Condition="!Exists('$(GamePath)')">/Applications/Stardew Valley.app/Contents/MacOS</GamePath> <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/Library/Application Support/Steam/steamapps/common/Stardew Valley/Contents/MacOS</GamePath> </PropertyGroup> diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets index 205040db..408230a9 100644 --- a/build/prepare-install-package.targets +++ b/build/prepare-install-package.targets @@ -33,7 +33,7 @@ <!-- copy installer files --> <Copy SourceFiles="$(TargetDir)\assets\unix-install.sh" DestinationFiles="$(PackagePath)\install on Linux.sh" /> - <Copy SourceFiles="$(TargetDir)\assets\unix-install.sh" DestinationFiles="$(PackagePath)\install on Mac.command" /> + <Copy SourceFiles="$(TargetDir)\assets\unix-install.sh" DestinationFiles="$(PackagePath)\install on macOS.command" /> <Copy SourceFiles="$(TargetDir)\assets\windows-install.bat" DestinationFiles="$(PackagePath)\install on Windows.bat" /> <Copy SourceFiles="$(TargetDir)\assets\README.txt" DestinationFiles="$(PackagePath)\README.txt" /> <Copy SourceFiles="$(TargetDir)\$(TargetName).exe" DestinationFiles="$(PackagePath)\internal\$(PlatformName)-install.exe" /> @@ -74,13 +74,13 @@ <Copy SourceFiles="$(SaveBackupBin)\SaveBackup.pdb" DestinationFolder="$(PackagePath)\bundle\Mods\SaveBackup" /> <Copy SourceFiles="$(SaveBackupBin)\manifest.json" DestinationFolder="$(PackagePath)\bundle\Mods\SaveBackup" /> - <!-- fix errors on Linux/Mac (sample: https://smapi.io/log/mMdFUpgB) --> + <!-- fix errors on Linux/macOS (sample: https://smapi.io/log/mMdFUpgB) --> <Copy Condition="$(PlatformName) == 'unix'" SourceFiles="$(TargetDir)\assets\System.Numerics.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> <Copy Condition="$(PlatformName) == 'unix'" SourceFiles="$(TargetDir)\assets\System.Runtime.Caching.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> - <!-- fix Linux/Mac permissions --> + <!-- fix Linux/macOS permissions --> <Exec Condition="$(PlatformName) == 'unix'" Command="chmod 755 "$(PackagePath)\install on Linux.sh"" /> - <Exec Condition="$(PlatformName) == 'unix'" Command="chmod 755 "$(PackagePath)\install on Mac.command"" /> + <Exec Condition="$(PlatformName) == 'unix'" Command="chmod 755 "$(PackagePath)\install on macOS.command"" /> <!-- finalise 'for developers' installer --> <ItemGroup> |