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

Drop win-x86 build

Browse Source
This commit is contained in:
michaeldgg2
2024-11-08 18:10:31 +01:00
committed by Paul Chote
parent 0d30b19b1b
commit 2a3ef8f910
4 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,6 @@
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<PackageReference Include="NuGet.CommandLine" Version="6.12.1" /> <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="OpenRA-FuzzyLogicLibrary" Version="1.0.1" />
<PackageReference Include="DiscordRichPresence" Version="1.2.1.24" /> <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
<PackageReference Include="MP3Sharp" Version="1.0.5" /> <PackageReference Include="MP3Sharp" Version="1.0.5" />

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

@@ -6,7 +6,7 @@
<PackageReference Include="OpenRA-SDL2-CS" Version="1.0.41" /> <PackageReference Include="OpenRA-SDL2-CS" Version="1.0.41" />
</ItemGroup> </ItemGroup>
<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> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>

4
packaging/functions.sh Executable file → Normal file
View File

@@ -10,7 +10,7 @@
# Arguments: # Arguments:
# SRC_PATH: Path to the root OpenRA directory # SRC_PATH: Path to the root OpenRA directory
# DEST_PATH: Path to the root of the install destination (will be created if necessary) # 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_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_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) # 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: # Arguments:
# SRC_PATH: Path to the root OpenRA directory # SRC_PATH: Path to the root OpenRA directory
# DEST_PATH: Path to the root of the install destination (will be created if necessary) # 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") # MOD_ID: Mod id to launch (e.g. "ra")
# LAUNCHER_NAME: Filename (without the .exe extension) for the launcher # 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") # MOD_NAME: Human-readable mod name to show in the crash dialog (e.g. "Red Alert")

12
packaging/windows/buildpackage.sh
View File

@@ -69,11 +69,6 @@ function build_platform()
PLATFORM="${1}" PLATFORM="${1}"
echo "Building core files (${PLATFORM})" 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_assemblies "${SRCDIR}" "${BUILTDIR}" "win-${PLATFORM}" "False" "True" "True"
install_data "${SRCDIR}" "${BUILTDIR}" "cnc" "d2k" "ra" install_data "${SRCDIR}" "${BUILTDIR}" "cnc" "d2k" "ra"
@@ -85,10 +80,10 @@ function build_platform()
makelauncher "TiberianDawn" "Tiberian Dawn" "cnc" "${PLATFORM}" makelauncher "TiberianDawn" "Tiberian Dawn" "cnc" "${PLATFORM}"
makelauncher "Dune2000" "Dune 2000" "d2k" "${PLATFORM}" makelauncher "Dune2000" "Dune 2000" "d2k" "${PLATFORM}"
echo "Building Windows setup.exe ($1)" echo "Building Windows setup.exe (${PLATFORM})"
makensis -V2 -DSRCDIR="${BUILTDIR}" -DTAG="${TAG}" -DSUFFIX="${SUFFIX}" -DOUTFILE="${OUTPUTDIR}/OpenRA-${TAG}-${PLATFORM}.exe" ${USE_PROGRAMFILES32} OpenRA.nsi 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 pushd "${BUILTDIR}" > /dev/null
zip "OpenRA-${TAG}-${PLATFORM}-winportable.zip" -r -9 ./* --quiet zip "OpenRA-${TAG}-${PLATFORM}-winportable.zip" -r -9 ./* --quiet
mv "OpenRA-${TAG}-${PLATFORM}-winportable.zip" "${OUTPUTDIR}" mv "OpenRA-${TAG}-${PLATFORM}-winportable.zip" "${OUTPUTDIR}"
@@ -97,6 +92,5 @@ function build_platform()
rm -rf "${BUILTDIR}" rm -rf "${BUILTDIR}"
} }
build_platform "x86"
build_platform "x64" build_platform "x64"
rm rcedit-x64.exe rm rcedit-x64.exe