feature(github): fix arm64 build

This commit is contained in:
6arelyFuture 2023-06-22 14:53:21 +02:00
parent 427f9b117d
commit 1271c44fe4
Signed by: Future
GPG Key ID: FA77F074E98D98A5
9 changed files with 41 additions and 19 deletions

View File

@ -30,7 +30,7 @@ jobs:
platform: x64
steps:
- name: Check out files
uses: actions/checkout@v3.5.2
uses: actions/checkout@v3.5.3
with:
submodules: true
fetch-depth: 0
@ -39,8 +39,13 @@ jobs:
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.3.1
- name: Install Premake5
uses: abel0b/setup-premake@v2.2
with:
version: "5.0.0-beta2"
- name: Generate project files
run: cmd /C call generate.bat
run: premake5 vs2022
- name: Set up problem matching
uses: ammaraskar/msvc-problem-matcher@master
@ -67,6 +72,7 @@ jobs:
- Release
arch:
- x64
- arm64
include:
- configuration: Debug
config: debug
@ -74,21 +80,42 @@ jobs:
config: release
steps:
- name: Check out files
uses: actions/checkout@v3.5.2
uses: actions/checkout@v3.5.3
with:
submodules: true
fetch-depth: 0
lfs: false
- name: Install dependencies (arm64)
if: matrix.arch == 'arm64'
run: |
sudo apt-get update
sudo apt-get -y install crossbuild-essential-arm64
- name: Install Mold
uses: rui314/setup-mold@staging
- name: Install Premake5
uses: abel0b/setup-premake@v2.2
with:
version: "5.0.0-beta2"
- name: Generate project files
run: ./generate.sh
run: premake5 gmake2
- name: Set up problem matching
uses: ammaraskar/gcc-problem-matcher@master
- name: Set up CC environment variables
if: matrix.arch == 'arm64'
run: |
echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
- name: Set up CXX environment variables
if: matrix.arch == 'arm64'
run: |
echo "CXX=aarch64-linux-gnu-g++" >> $GITHUB_ENV
- name: Build ${{matrix.configuration}} ${{matrix.arch}} binaries
run: |
pushd build
@ -124,14 +151,19 @@ jobs:
platform: arm64
steps:
- name: Check out files
uses: actions/checkout@v3.5.2
uses: actions/checkout@v3.5.3
with:
submodules: true
fetch-depth: 0
lfs: false
- name: Install Premake5
uses: abel0b/setup-premake@v2.2
with:
version: "5.0.0-beta2"
- name: Generate project files
run: ./generate.sh
run: premake5 gmake2
- name: Set up problem matching
uses: ammaraskar/gcc-problem-matcher@master

2
deps/libtomcrypt vendored

@ -1 +1 @@
Subproject commit 0173cac3be1475163cd279c5eee3c9e288b9aae0
Subproject commit fae62af0ab16f469c2512ec04575dd60ca018657

2
deps/libtommath vendored

@ -1 +1 @@
Subproject commit 38bb3696e5d7cb99d3cb06f3357205d0faf04b04
Subproject commit 787c6147218759ed076ad8f3742d15505ed0822e

View File

@ -1,3 +0,0 @@
@echo off
git submodule update --init --recursive
tools\premake5 %* vs2022

View File

@ -1,7 +0,0 @@
#!/bin/bash
git submodule update --init --recursive
if [ "$(uname)" == "Darwin" ]; then
./tools/premake5-mac gmake2
else
./tools/premake5-linux gmake2
fi

View File

@ -41,7 +41,7 @@ configurations {"Debug", "Release"}
if os.istarget("darwin") then
platforms {"x64", "arm64"}
else
platforms {"x86", "x64"}
platforms {"x86", "x64", "arm64"}
end
filter "platforms:x86"

Binary file not shown.

Binary file not shown.

Binary file not shown.