diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index be505c8fa1..7d40c29ff2 100644
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -17,7 +17,6 @@
false
..\OpenRA.ruleset
Release;Debug
- mono
win-x64
@@ -52,9 +51,6 @@
Game.Mod=ts
-
- false
-
@@ -70,8 +66,4 @@
-
-
-
-
diff --git a/OpenRA.PostProcess/OpenRA.PostProcess.csproj b/OpenRA.PostProcess/OpenRA.PostProcess.csproj
deleted file mode 100644
index 13d35a51f1..0000000000
--- a/OpenRA.PostProcess/OpenRA.PostProcess.csproj
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
- Exe
- net472
- true
- true
- false
- ..
- false
- 5
- true
- true
- AnyCPU
- false
- false
- ..\OpenRA.ruleset
- Debug;Release
-
-
-
-
-
-
- DEBUG;TRACE
- false
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenRA.Server/OpenRA.Server.csproj b/OpenRA.Server/OpenRA.Server.csproj
index 91e9aa6aa6..e3aba014d0 100644
--- a/OpenRA.Server/OpenRA.Server.csproj
+++ b/OpenRA.Server/OpenRA.Server.csproj
@@ -15,7 +15,6 @@
false
..\OpenRA.ruleset
Release;Debug
- mono
@@ -30,9 +29,6 @@
-
- false
-
@@ -43,8 +39,4 @@
-
-
-
-
diff --git a/OpenRA.Utility/OpenRA.Utility.csproj b/OpenRA.Utility/OpenRA.Utility.csproj
index 91e9aa6aa6..e3aba014d0 100644
--- a/OpenRA.Utility/OpenRA.Utility.csproj
+++ b/OpenRA.Utility/OpenRA.Utility.csproj
@@ -15,7 +15,6 @@
false
..\OpenRA.ruleset
Release;Debug
- mono
@@ -30,9 +29,6 @@
-
- false
-
@@ -43,8 +39,4 @@
-
-
-
-
diff --git a/OpenRA.sln b/OpenRA.sln
index cab82d51a6..64d6017c24 100644
--- a/OpenRA.sln
+++ b/OpenRA.sln
@@ -19,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Mods.Common", "OpenR
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Test", "OpenRA.Test\OpenRA.Test.csproj", "{6CB8E1B7-6B36-4D93-8633-7C573E194AC4}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.PostProcess", "OpenRA.PostProcess\OpenRA.PostProcess.csproj", "{EE63AF7E-92EA-48FB-81E2-53D7D92F8050}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -59,10 +57,6 @@ Global
{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
- {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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/OpenRA.PostProcess/Program.cs b/packaging/windows/MakeLAA.cs
similarity index 66%
rename from OpenRA.PostProcess/Program.cs
rename to packaging/windows/MakeLAA.cs
index 54a5acba70..d03fcb55ff 100644
--- a/OpenRA.PostProcess/Program.cs
+++ b/packaging/windows/MakeLAA.cs
@@ -26,20 +26,9 @@ namespace OpenRA.PostProcess
var data = File.ReadAllBytes(assembly);
var peOffset = BitConverter.ToInt32(data, 0x3c);
- foreach (var flag in flags)
- {
- if (flag == "-LAA")
- {
- // Set /LARGEADDRESSAWARE Flag (Application can handle large (>2GB) addresses)
- Console.WriteLine(" - Enabling /LARGEADDRESSAWARE");
- data[peOffset + 4 + 18] |= 0x20;
- }
- else
- Console.WriteLine("error: Unknown flag '{0}'", flag);
- }
-
- if (flags.Length == 0)
- Console.WriteLine("error: No flags were specified");
+ // Set /LARGEADDRESSAWARE Flag (Application can handle large (>2GB) addresses)
+ Console.WriteLine(" - Enabling /LARGEADDRESSAWARE");
+ data[peOffset + 4 + 18] |= 0x20;
File.WriteAllBytes(args[0], data);
}
diff --git a/packaging/windows/buildpackage.sh b/packaging/windows/buildpackage.sh
index b9b51bc947..88bc98dcd9 100755
--- a/packaging/windows/buildpackage.sh
+++ b/packaging/windows/buildpackage.sh
@@ -32,7 +32,14 @@ function makelauncher()
sed "s|DISPLAY_NAME|$2|" WindowsLauncher.cs.in | sed "s|MOD_ID|$3|" | sed "s|FAQ_URL|${FAQ_URL}|" > WindowsLauncher.cs
csc WindowsLauncher.cs -warn:4 -warnaserror -platform:"$5" -out:"$1" -t:winexe ${LAUNCHER_LIBS} -win32icon:"$4"
rm WindowsLauncher.cs
- mono "${SRCDIR}/OpenRA.PostProcess.exe" "$1" -LAA > /dev/null
+
+ if [ "$5" = "x86" ]; then
+ # Enable the full 4GB address space for the 32 bit game executable
+ # The server and utility do not use enough memory to need this
+ csc MakeLAA.cs -warn:4 -warnaserror -out:"MakeLAA.exe"
+ mono "MakeLAA.exe" "$1"
+ rm MakeLAA.exe
+ fi
}
function build_platform()