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 @@ False - 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 @@ - + PreserveNewest 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