From 2a3ef8f9108e60d68a5b942e1abe8d8ccc6b8a91 Mon Sep 17 00:00:00 2001
From: michaeldgg2 <119738087+michaeldgg2@users.noreply.github.com>
Date: Fri, 8 Nov 2024 18:10:31 +0100
Subject: [PATCH] Drop win-x86 build

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj         |  1 -
 .../OpenRA.Platforms.Default.csproj                  |  2 +-
 packaging/functions.sh                               |  4 ++--
 packaging/windows/buildpackage.sh                    | 12 +++---------
 4 files changed, 6 insertions(+), 13 deletions(-)
 mode change 100755 => 100644 packaging/functions.sh

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 2c0bfe2b24..516950341a 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -4,7 +4,6 @@
       <Private>False</Private>
     </ProjectReference>
     <PackageReference Include="NuGet.CommandLine" Version="6.12.1" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="OpenRA-FuzzyLogicLibrary" Version="1.0.1" />
     <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
     <PackageReference Include="MP3Sharp" Version="1.0.5" />
diff --git a/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj b/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj
index d5fec2130c..35564aa3a0 100644
--- a/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj
+++ b/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj
@@ -6,7 +6,7 @@
     <PackageReference Include="OpenRA-SDL2-CS" Version="1.0.41" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="OpenRA.Platforms.Default.dll.config" Condition="'$(TargetPlatform)' != 'win-x64' And '$(TargetPlatform)' != 'win-x86'">
+    <Content Include="OpenRA.Platforms.Default.dll.config" Condition="'$(TargetPlatform)' != 'win-x64'">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
diff --git a/packaging/functions.sh b/packaging/functions.sh
old mode 100755
new mode 100644
index d1175ef893..2354b5e155
--- a/packaging/functions.sh
+++ b/packaging/functions.sh
@@ -10,7 +10,7 @@
 # Arguments:
 #   SRC_PATH: Path to the root OpenRA directory
 #   DEST_PATH: Path to the root of the install destination (will be created if necessary)
-#   TARGETPLATFORM: Platform type (win-x86, win-x64, osx-x64, osx-arm64, linux-x64, linux-arm64, unix-generic)
+#   TARGETPLATFORM: Platform type (win-x64, osx-x64, osx-arm64, linux-x64, linux-arm64, unix-generic)
 #   COPY_GENERIC_LAUNCHER: If set to True the OpenRA.exe will also be copied (True, False)
 #   COPY_CNC_DLL: If set to True the OpenRA.Mods.Cnc.dll will also be copied (True, False)
 #   COPY_D2K_DLL: If set to True the OpenRA.Mods.D2k.dll will also be copied (True, False)
@@ -89,7 +89,7 @@ install_data() (
 # Arguments:
 #   SRC_PATH: Path to the root OpenRA directory
 #   DEST_PATH: Path to the root of the install destination (will be created if necessary)
-#   TARGETPLATFORM: Platform type (win-x86, win-x64)
+#   TARGETPLATFORM: Platform type (win-x64)
 #   MOD_ID: Mod id to launch (e.g. "ra")
 #   LAUNCHER_NAME: Filename (without the .exe extension) for the launcher
 #   MOD_NAME: Human-readable mod name to show in the crash dialog (e.g. "Red Alert")
diff --git a/packaging/windows/buildpackage.sh b/packaging/windows/buildpackage.sh
index 9736acdb83..a10c6a8ccf 100755
--- a/packaging/windows/buildpackage.sh
+++ b/packaging/windows/buildpackage.sh
@@ -69,11 +69,6 @@ function build_platform()
 	PLATFORM="${1}"
 
 	echo "Building core files (${PLATFORM})"
-	if [ "${PLATFORM}" = "x86" ]; then
-		USE_PROGRAMFILES32="-DUSE_PROGRAMFILES32=true"
-	else
-		USE_PROGRAMFILES32=""
-	fi
 
 	install_assemblies "${SRCDIR}" "${BUILTDIR}" "win-${PLATFORM}" "False" "True" "True"
 	install_data "${SRCDIR}" "${BUILTDIR}" "cnc" "d2k" "ra"
@@ -85,10 +80,10 @@ function build_platform()
 	makelauncher "TiberianDawn" "Tiberian Dawn" "cnc" "${PLATFORM}"
 	makelauncher "Dune2000" "Dune 2000" "d2k" "${PLATFORM}"
 
-	echo "Building Windows setup.exe ($1)"
-	makensis -V2 -DSRCDIR="${BUILTDIR}" -DTAG="${TAG}" -DSUFFIX="${SUFFIX}" -DOUTFILE="${OUTPUTDIR}/OpenRA-${TAG}-${PLATFORM}.exe" ${USE_PROGRAMFILES32} OpenRA.nsi
+	echo "Building Windows setup.exe (${PLATFORM})"
+	makensis -V2 -DSRCDIR="${BUILTDIR}" -DTAG="${TAG}" -DSUFFIX="${SUFFIX}" -DOUTFILE="${OUTPUTDIR}/OpenRA-${TAG}-${PLATFORM}.exe" OpenRA.nsi
 
-	echo "Packaging zip archive ($1)"
+	echo "Packaging zip archive ($PLATFORM)"
 	pushd "${BUILTDIR}" > /dev/null
 	zip "OpenRA-${TAG}-${PLATFORM}-winportable.zip" -r -9 ./* --quiet
 	mv "OpenRA-${TAG}-${PLATFORM}-winportable.zip" "${OUTPUTDIR}"
@@ -97,6 +92,5 @@ function build_platform()
 	rm -rf "${BUILTDIR}"
 }
 
-build_platform "x86"
 build_platform "x64"
 rm rcedit-x64.exe