epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change platform from x86 to Any CPU (preferring 64 bit)

Browse Source 
A Release-x86 configuration allows x86 Windows installers to still be created.
This commit is contained in:
Paul Chote
2019-05-22 18:00:36 +00:00
committed by abcdefg30
parent 7cf939fc68
commit 845fca25d1
14 changed files with 135 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@@ -78,6 +78,9 @@ INSTALL_DATA = $(INSTALL) -m644
# Toolchain # Toolchain
MSBUILD = msbuild -verbosity:m -nologo MSBUILD = msbuild -verbosity:m -nologo
# Enable 32 bit builds while generating the windows installer
WIN32 = false
# program targets # program targets
VERSION = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`) VERSION = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
@@ -146,7 +149,11 @@ all: dependencies core
core: core:
@command -v $(MSBUILD) >/dev/null || (echo "OpenRA requires the '$(MSBUILD)' tool provided by Mono >= 5.4."; exit 1) @command -v $(MSBUILD) >/dev/null || (echo "OpenRA requires the '$(MSBUILD)' tool provided by Mono >= 5.4."; exit 1)
ifeq ($(WIN32), $(filter $(WIN32),true yes y on 1))
@$(MSBUILD) -t:build -p:Configuration="Release-x86"
else
@$(MSBUILD) -t:build -p:Configuration=Release @$(MSBUILD) -t:build -p:Configuration=Release
endif
clean: clean:
@ $(MSBUILD) -t:clean @ $(MSBUILD) -t:clean
@@ -169,7 +176,11 @@ linux-native-dependencies:
@./thirdparty/configure-native-deps.sh @./thirdparty/configure-native-deps.sh
windows-dependencies: cli-dependencies geoip-dependencies windows-dependencies: cli-dependencies geoip-dependencies
@./thirdparty/fetch-thirdparty-deps-windows.sh ifeq ($(WIN32), $(filter $(WIN32),true yes y on 1))
@./thirdparty/fetch-thirdparty-deps-windows.sh x86
else
@./thirdparty/fetch-thirdparty-deps-windows.sh x64
endif
osx-dependencies: cli-dependencies geoip-dependencies osx-dependencies: cli-dependencies geoip-dependencies
@./thirdparty/fetch-thirdparty-deps-osx.sh @./thirdparty/fetch-thirdparty-deps-osx.sh

8
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -12,12 +12,11 @@
<RootNamespace>OpenRA</RootNamespace> <RootNamespace>OpenRA</RootNamespace>
<OutputPath>..</OutputPath> <OutputPath>..</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Platforms>x86</Platforms> <PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<ExternalConsole>false</ExternalConsole> <ExternalConsole>false</ExternalConsole>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet>
<Configurations>Release;Debug</Configurations> <Configurations>Release;Debug;Release-x86</Configurations>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<!-- Work around an issue where Rider does not detect files in the project root using the default glob --> <!-- Work around an issue where Rider does not detect files in the project root using the default glob -->
@@ -27,6 +26,9 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<Optimize>false</Optimize> <Optimize>false</Optimize>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release-x86'">
<Prefer32bit>true</Prefer32bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Red Alert' "> <PropertyGroup Condition=" '$(RunConfiguration)' == 'Red Alert' ">
<StartAction>Project</StartAction> <StartAction>Project</StartAction>
<StartArguments>Game.Mod=ra</StartArguments> <StartArguments>Game.Mod=ra</StartArguments>

3
OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
View File

@@ -8,8 +8,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<OutputPath>../mods/common</OutputPath> <OutputPath>../mods/common</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Platforms>x86</Platforms> <PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>

3
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -8,8 +8,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<OutputPath>../mods/common</OutputPath> <OutputPath>../mods/common</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Platforms>x86</Platforms> <PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>

3
OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
View File

@@ -8,8 +8,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<OutputPath>../mods/d2k</OutputPath> <OutputPath>../mods/d2k</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Platforms>x86</Platforms> <PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>

3
OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj
View File

@@ -8,8 +8,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<OutputPath>..</OutputPath> <OutputPath>..</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Platforms>x86</Platforms> <PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>

7
OpenRA.PostProcess/OpenRA.PostProcess.csproj
View File

@@ -10,11 +10,11 @@
<LangVersion>5</LangVersion> <LangVersion>5</LangVersion>
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Platforms>x86</Platforms> <PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<ExternalConsole>false</ExternalConsole> <ExternalConsole>false</ExternalConsole>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet>
<Configurations>Debug;Release;Release-x86</Configurations>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<!-- Work around an issue where Rider does not detect files in the project root using the default glob --> <!-- Work around an issue where Rider does not detect files in the project root using the default glob -->
@@ -24,6 +24,9 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<Optimize>false</Optimize> <Optimize>false</Optimize>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release-x86'">
<Prefer32bit>true</Prefer32bit>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
<AdditionalFiles Include="../stylecop.json" /> <AdditionalFiles Include="../stylecop.json" />

7
OpenRA.Server/OpenRA.Server.csproj
View File

@@ -10,11 +10,11 @@
<LangVersion>5</LangVersion> <LangVersion>5</LangVersion>
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Platforms>x86</Platforms> <PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<ExternalConsole>false</ExternalConsole> <ExternalConsole>false</ExternalConsole>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet>
<Configurations>Release;Debug;Release-x86</Configurations>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<!-- Work around an issue where Rider does not detect files in the project root using the default glob --> <!-- Work around an issue where Rider does not detect files in the project root using the default glob -->
@@ -24,6 +24,9 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<Optimize>false</Optimize> <Optimize>false</Optimize>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release-x86'">
<Prefer32bit>true</Prefer32bit>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj" /> <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj" />
<ProjectReference Include="..\OpenRA.PostProcess\OpenRA.PostProcess.csproj"> <ProjectReference Include="..\OpenRA.PostProcess\OpenRA.PostProcess.csproj">

3
OpenRA.Test/OpenRA.Test.csproj
View File

@@ -7,8 +7,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<OutputPath>..</OutputPath> <OutputPath>..</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Platforms>x86</Platforms> <PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>

7
OpenRA.Utility/OpenRA.Utility.csproj
View File

@@ -10,11 +10,11 @@
<LangVersion>5</LangVersion> <LangVersion>5</LangVersion>
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Platforms>x86</Platforms> <PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<ExternalConsole>false</ExternalConsole> <ExternalConsole>false</ExternalConsole>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet>
<Configurations>Release;Debug;Release-x86</Configurations>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<!-- Work around an issue where Rider does not detect files in the project root using the default glob --> <!-- Work around an issue where Rider does not detect files in the project root using the default glob -->
@@ -24,6 +24,9 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<Optimize>false</Optimize> <Optimize>false</Optimize>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release-x86'">
<Prefer32bit>true</Prefer32bit>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj" /> <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj" />
<ProjectReference Include="..\OpenRA.PostProcess\OpenRA.PostProcess.csproj"> <ProjectReference Include="..\OpenRA.PostProcess\OpenRA.PostProcess.csproj">

96
OpenRA.sln
View File

@@ -180,46 +180,66 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.PostProcess", "OpenR
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86 Debug|Any CPU = Debug|Any CPU
Release|x86 = Release|x86 Release|Any CPU = Release|Any CPU
Release-x86|Any CPU = Release-x86|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|x86.ActiveCfg = Debug|x86 {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|x86.Build.0 = Debug|x86 {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x86.ActiveCfg = Release|x86 {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x86.Build.0 = Release|x86 {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.Build.0 = Release|Any CPU
{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|x86.ActiveCfg = Debug|x86 {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release-x86|Any CPU.ActiveCfg = Release-x86|Any CPU
{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|x86.Build.0 = Debug|x86 {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release-x86|Any CPU.Build.0 = Release-x86|Any CPU
{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|x86.ActiveCfg = Release|x86 {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|x86.Build.0 = Release|x86 {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F33337BE-CB69-4B24-850F-07D23E408DDF}.Debug|x86.ActiveCfg = Debug|x86 {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F33337BE-CB69-4B24-850F-07D23E408DDF}.Debug|x86.Build.0 = Debug|x86 {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Any CPU.Build.0 = Release|Any CPU
{F33337BE-CB69-4B24-850F-07D23E408DDF}.Release|x86.ActiveCfg = Release|x86 {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release-x86|Any CPU.ActiveCfg = Release|Any CPU
{F33337BE-CB69-4B24-850F-07D23E408DDF}.Release|x86.Build.0 = Release|x86 {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release-x86|Any CPU.Build.0 = Release|Any CPU
{76F621A1-3D8E-4A99-9F7E-B071EB657817}.Debug|x86.ActiveCfg = Debug|x86 {F33337BE-CB69-4B24-850F-07D23E408DDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{76F621A1-3D8E-4A99-9F7E-B071EB657817}.Debug|x86.Build.0 = Debug|x86 {F33337BE-CB69-4B24-850F-07D23E408DDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release|x86.ActiveCfg = Release|x86 {F33337BE-CB69-4B24-850F-07D23E408DDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release|x86.Build.0 = Release|x86 {F33337BE-CB69-4B24-850F-07D23E408DDF}.Release|Any CPU.Build.0 = Release|Any CPU
{C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|x86.ActiveCfg = Debug|x86 {F33337BE-CB69-4B24-850F-07D23E408DDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|x86.Build.0 = Debug|x86 {F33337BE-CB69-4B24-850F-07D23E408DDF}.Release-x86|Any CPU.ActiveCfg = Release-x86|Any CPU
{C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|x86.ActiveCfg = Release|x86 {F33337BE-CB69-4B24-850F-07D23E408DDF}.Release-x86|Any CPU.Build.0 = Release-x86|Any CPU
{C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|x86.Build.0 = Release|x86 {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{33D03738-C154-4028-8EA8-63A3C488A651}.Debug|x86.ActiveCfg = Debug|x86 {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Debug|Any CPU.Build.0 = Debug|Any CPU
{33D03738-C154-4028-8EA8-63A3C488A651}.Debug|x86.Build.0 = Debug|x86 {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release|Any CPU.ActiveCfg = Release|Any CPU
{33D03738-C154-4028-8EA8-63A3C488A651}.Release|x86.ActiveCfg = Release|x86 {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release|Any CPU.Build.0 = Release|Any CPU
{33D03738-C154-4028-8EA8-63A3C488A651}.Release|x86.Build.0 = Release|x86 {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release-x86|Any CPU.ActiveCfg = Release-x86|Any CPU
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|x86.ActiveCfg = Debug|x86 {76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release-x86|Any CPU.Build.0 = Release-x86|Any CPU
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|x86.Build.0 = Debug|x86 {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|x86.ActiveCfg = Release|x86 {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|x86.Build.0 = Release|x86 {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Debug|x86.ActiveCfg = Debug|x86 {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|Any CPU.Build.0 = Release|Any CPU
{6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Debug|x86.Build.0 = Debug|x86 {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release-x86|Any CPU.ActiveCfg = Release|Any CPU
{6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Release|x86.ActiveCfg = Release|x86 {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release-x86|Any CPU.Build.0 = Release|Any CPU
{6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Release|x86.Build.0 = Release|x86 {33D03738-C154-4028-8EA8-63A3C488A651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Debug|x86.ActiveCfg = Debug|x86 {33D03738-C154-4028-8EA8-63A3C488A651}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Debug|x86.Build.0 = Debug|x86 {33D03738-C154-4028-8EA8-63A3C488A651}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Release|x86.ActiveCfg = Release|x86 {33D03738-C154-4028-8EA8-63A3C488A651}.Release|Any CPU.Build.0 = Release|Any CPU
{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Release|x86.Build.0 = Release|x86 {33D03738-C154-4028-8EA8-63A3C488A651}.Release-x86|Any CPU.ActiveCfg = Release|Any CPU
{33D03738-C154-4028-8EA8-63A3C488A651}.Release-x86|Any CPU.Build.0 = Release|Any CPU
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|Any CPU.Build.0 = Release|Any CPU
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release-x86|Any CPU.ActiveCfg = Release|Any CPU
{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release-x86|Any CPU.Build.0 = Release|Any CPU
{6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Release|Any CPU.Build.0 = Release|Any CPU
{6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Release-x86|Any CPU.ActiveCfg = Release|Any CPU
{6CB8E1B7-6B36-4D93-8633-7C573E194AC4}.Release-x86|Any CPU.Build.0 = Release|Any CPU
{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Release|Any CPU.Build.0 = Release|Any CPU
{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Release-x86|Any CPU.ActiveCfg = Release-x86|Any CPU
{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}.Release-x86|Any CPU.Build.0 = Release-x86|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

2
packaging/windows/buildpackage.sh
View File

@@ -39,7 +39,7 @@ echo "Building core files"
pushd "${SRCDIR}" > /dev/null || exit 1 pushd "${SRCDIR}" > /dev/null || exit 1
make clean make clean
make windows-dependencies make windows-dependencies WIN32=true
make core make core
make version VERSION="${TAG}" make version VERSION="${TAG}"
make install-core gameinstalldir="" DESTDIR="${BUILTDIR}" make install-core gameinstalldir="" DESTDIR="${BUILTDIR}"

40
thirdparty/fetch-thirdparty-deps-windows.sh vendored
View File

@@ -3,6 +3,16 @@
# Die on any error for Travis CI to automatically retry: # Die on any error for Travis CI to automatically retry:
set -e set -e
if [ $# -ne "1" ]; then
echo "Usage: $(basename "$0") (32|64)"
exit 1
fi
if [ "$1" != "x86" ] && [ "$1" != "x64" ]; then
echo "Usage: $(basename "$0") (32|64)"
exit 1
fi
download_dir="${0%/*}/download/windows" download_dir="${0%/*}/download/windows"
mkdir -p "${download_dir}" mkdir -p "${download_dir}"
@@ -10,28 +20,46 @@ cd "${download_dir}" || exit 1
if [ ! -f SDL2.dll ]; then if [ ! -f SDL2.dll ]; then
echo "Fetching SDL2 from libsdl.org" echo "Fetching SDL2 from libsdl.org"
curl -LOs https://www.libsdl.org/release/SDL2-2.0.5-win32-x86.zip if [ "$1" = "x86" ]; then
unzip SDL2-2.0.5-win32-x86.zip SDL2.dll curl -LOs https://www.libsdl.org/release/SDL2-2.0.5-win32-x86.zip
rm SDL2-2.0.5-win32-x86.zip unzip SDL2-2.0.5-win32-x86.zip SDL2.dll
rm SDL2-2.0.5-win32-x86.zip
else
curl -LOs https://www.libsdl.org/release/SDL2-2.0.5-win32-x64.zip
unzip SDL2-2.0.5-win32-x64.zip SDL2.dll
rm SDL2-2.0.5-win32-x64.zip
fi
fi fi
if [ ! -f freetype6.dll ]; then if [ ! -f freetype6.dll ]; then
echo "Fetching FreeType2 from NuGet" echo "Fetching FreeType2 from NuGet"
../../noget.sh SharpFont.Dependencies 2.6.0 ../../noget.sh SharpFont.Dependencies 2.6.0
cp ./SharpFont.Dependencies/bin/msvc9/x86/freetype6.dll . if [ "$1" = "x86" ]; then
cp ./SharpFont.Dependencies/bin/msvc9/x86/freetype6.dll .
else
cp ./SharpFont.Dependencies/bin/msvc9/x64/freetype6.dll .
fi
rm -rf SharpFont.Dependencies rm -rf SharpFont.Dependencies
fi fi
if [ ! -f lua51.dll ]; then if [ ! -f lua51.dll ]; then
echo "Fetching Lua 5.1 from NuGet" echo "Fetching Lua 5.1 from NuGet"
../../noget.sh lua.binaries 5.1.5 ../../noget.sh lua.binaries 5.1.5
cp ./lua.binaries/bin/win32/dll8/lua5.1.dll ./lua51.dll if [ "$1" = "x86" ]; then
cp ./lua.binaries/bin/win32/dll8/lua5.1.dll ./lua51.dll
else
cp ./lua.binaries/bin/win64/dll8/lua5.1.dll ./lua51.dll
fi
rm -rf lua.binaries rm -rf lua.binaries
fi fi
if [ ! -f soft_oal.dll ]; then if [ ! -f soft_oal.dll ]; then
echo "Fetching OpenAL Soft from NuGet" echo "Fetching OpenAL Soft from NuGet"
../../noget.sh OpenAL-Soft 1.16.0 ../../noget.sh OpenAL-Soft 1.16.0
cp ./OpenAL-Soft/bin/Win32/soft_oal.dll ./soft_oal.dll if [ "$1" = "x86" ]; then
cp ./OpenAL-Soft/bin/Win32/soft_oal.dll ./soft_oal.dll
else
cp ./OpenAL-Soft/bin/Win64/soft_oal.dll ./soft_oal.dll
fi
rm -rf OpenAL-Soft rm -rf OpenAL-Soft
fi fi

10
thirdparty/fetch-thirdparty-deps.ps1 vendored
View File

@@ -40,7 +40,7 @@ if (!(Test-Path "windows/SDL2.dll"))
echo "Fetching SDL2 from libsdl.org" echo "Fetching SDL2 from libsdl.org"
# Download zip: # Download zip:
$zipFileName = "SDL2-2.0.5-win32-x86.zip" $zipFileName = "SDL2-2.0.5-win32-x64.zip"
$target = Join-Path $pwd.ToString() $zipFileName $target = Join-Path $pwd.ToString() $zipFileName
(New-Object System.Net.WebClient).DownloadFile("https://www.libsdl.org/release/" + $zipFileName, $target) (New-Object System.Net.WebClient).DownloadFile("https://www.libsdl.org/release/" + $zipFileName, $target)
@@ -52,7 +52,7 @@ if (!(Test-Path "windows/SDL2.dll"))
$destination.Copyhere($zipFile.items()) $destination.Copyhere($zipFile.items())
# Remove junk files: # Remove junk files:
rm SDL2-2.0.5-win32-x86.zip rm "$zipFileName"
rm -path "$currentPath\windows\README-SDL.txt" rm -path "$currentPath\windows\README-SDL.txt"
} }
@@ -68,7 +68,7 @@ if (!(Test-Path "windows/lua51.dll"))
{ {
echo "Fetching Lua 5.1 from NuGet." echo "Fetching Lua 5.1 from NuGet."
./nuget.exe install lua.binaries -Version 5.1.5 -ExcludeVersion -Verbosity quiet -Source nuget.org ./nuget.exe install lua.binaries -Version 5.1.5 -ExcludeVersion -Verbosity quiet -Source nuget.org
cp lua.binaries/bin/win32/dll8/lua5.1.dll ./windows/lua51.dll cp lua.binaries/bin/win64/dll8/lua5.1.dll ./windows/lua51.dll
rmdir lua.binaries -Recurse rmdir lua.binaries -Recurse
} }
@@ -76,7 +76,7 @@ if (!(Test-Path "windows/freetype6.dll"))
{ {
echo "Fetching FreeType2 from NuGet." echo "Fetching FreeType2 from NuGet."
./nuget.exe install SharpFont.Dependencies -Version 2.6.0 -ExcludeVersion -Verbosity quiet -Source nuget.org ./nuget.exe install SharpFont.Dependencies -Version 2.6.0 -ExcludeVersion -Verbosity quiet -Source nuget.org
cp SharpFont.Dependencies/bin/msvc9/x86/freetype6.dll ./windows/freetype6.dll cp SharpFont.Dependencies/bin/msvc9/x64/freetype6.dll ./windows/freetype6.dll
rmdir SharpFont.Dependencies -Recurse rmdir SharpFont.Dependencies -Recurse
} }
@@ -84,7 +84,7 @@ if (!(Test-Path "windows/soft_oal.dll"))
{ {
echo "Fetching OpenAL Soft from NuGet." echo "Fetching OpenAL Soft from NuGet."
./nuget.exe install OpenAL-Soft -Version 1.16.0 -ExcludeVersion -Verbosity quiet -Source nuget.org ./nuget.exe install OpenAL-Soft -Version 1.16.0 -ExcludeVersion -Verbosity quiet -Source nuget.org
cp OpenAL-Soft/bin/Win32/soft_oal.dll windows/soft_oal.dll cp OpenAL-Soft/bin/Win64/soft_oal.dll windows/soft_oal.dll
rmdir OpenAL-Soft -Recurse rmdir OpenAL-Soft -Recurse
} }