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

Update native deps to include macOS and Linux arm64 binaries.

Browse Source
This commit is contained in:
Paul Chote
2022-12-23 00:46:34 +13:00
committed by Gustas
parent 80945cd08a
commit 363a0e1d1e
5 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -58,6 +58,7 @@ RM_RF = $(RM) -rf
RUNTIME ?= net6 RUNTIME ?= net6
CONFIGURATION ?= Release CONFIGURATION ?= Release
DOTNET_RID = $(shell ${DOTNET} --info | grep RID: | cut -w -f3)
# Only for use in target version: # Only for use in target version:
VERSION := $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || (c=$$(git rev-parse --short HEAD 2>/dev/null) && echo git-$$c)) VERSION := $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || (c=$$(git rev-parse --short HEAD 2>/dev/null) && echo git-$$c))
@@ -67,15 +68,23 @@ ifndef TARGETPLATFORM
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
UNAME_M := $(shell uname -m) UNAME_M := $(shell uname -m)
ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_S),Darwin)
ifeq ($(RUNTIME)-$(DOTNET_RID),net6-osx-arm64)
TARGETPLATFORM = osx-arm64
else
TARGETPLATFORM = osx-x64 TARGETPLATFORM = osx-x64
endif
else else
ifeq ($(UNAME_M),x86_64) ifeq ($(UNAME_M),x86_64)
TARGETPLATFORM = linux-x64 TARGETPLATFORM = linux-x64
else else
ifeq ($(UNAME_M),aarch64)
TARGETPLATFORM = linux-arm64
else
TARGETPLATFORM = unix-generic TARGETPLATFORM = unix-generic
endif endif
endif endif
endif endif
endif
##################### DEVELOPMENT BUILDS AND TESTS ##################### ##################### DEVELOPMENT BUILDS AND TESTS #####################
# #

2
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -8,7 +8,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Linguini.Bundle" Version="0.3.2" /> <PackageReference Include="Linguini.Bundle" Version="0.3.2" />
<PackageReference Include="OpenRA-Eluant" Version="1.0.18" /> <PackageReference Include="OpenRA-Eluant" Version="1.0.19" />
<PackageReference Include="Mono.NAT" Version="3.0.3" /> <PackageReference Include="Mono.NAT" Version="3.0.3" />
<PackageReference Include="SharpZipLib" Version="1.3.3" /> <PackageReference Include="SharpZipLib" Version="1.3.3" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />

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

@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj" /> <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj" />
<PackageReference Include="OpenRA-Freetype6" Version="1.0.4" /> <PackageReference Include="OpenRA-Freetype6" Version="1.0.9" />
<PackageReference Include="OpenRA-OpenAL-CS" Version="1.0.16" /> <PackageReference Include="OpenRA-OpenAL-CS" Version="1.0.17" />
<PackageReference Include="OpenRA-SDL2-CS" Version="1.0.31" /> <PackageReference Include="OpenRA-SDL2-CS" Version="1.0.36" />
</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' And '$(TargetPlatform)' != 'win-x86'">

2
OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj
View File

@@ -21,7 +21,7 @@
</AssemblyAttribute> </AssemblyAttribute>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="OpenRA-SDL2-CS" Version="1.0.31" /> <PackageReference Include="OpenRA-SDL2-CS" Version="1.0.36" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj" /> <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj" />

6
packaging/functions.sh
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, linux-x64, unix-generic) # TARGETPLATFORM: Platform type (win-x86, win-x64, osx-x64, osx-arm64, linux-x64, linux-arm64, unix-generic)
# RUNTIME: Runtime type (net6, mono) # RUNTIME: Runtime type (net6, mono)
# 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)
@@ -68,13 +68,13 @@ install_assemblies() (
install -m644 "${LIB}" "${DEST_PATH}" install -m644 "${LIB}" "${DEST_PATH}"
done done
if [ "${TARGETPLATFORM}" = "linux-x64" ]; then if [ "${TARGETPLATFORM}" = "linux-x64" ] || [ "${TARGETPLATFORM}" = "linux-arm64" ]; then
for LIB in "${SRC_PATH}/bin/"*.so; do for LIB in "${SRC_PATH}/bin/"*.so; do
install -m755 "${LIB}" "${DEST_PATH}" install -m755 "${LIB}" "${DEST_PATH}"
done done
fi fi
if [ "${TARGETPLATFORM}" = "osx-x64" ]; then if [ "${TARGETPLATFORM}" = "osx-x64" ] || [ "${TARGETPLATFORM}" = "osx-arm64" ]; then
for LIB in "${SRC_PATH}/bin/"*.dylib; do for LIB in "${SRC_PATH}/bin/"*.dylib; do
install -m755 "${LIB}" "${DEST_PATH}" install -m755 "${LIB}" "${DEST_PATH}"
done done