From ea1f340e428f05521d0c0ecd32f763a069af97d6 Mon Sep 17 00:00:00 2001
From: Death Killer <884052+deathkiller@users.noreply.github.com>
Date: Sun, 20 Oct 2024 11:11:55 +0200
Subject: [PATCH] Fixed build

---
 .github/workflows/android.yml      |  4 ++--
 .github/workflows/linux.yml        |  4 ++--
 .github/workflows/linux_cc.yml     | 12 +++++++-----
 .github/workflows/linux_legacy.yml |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index a7871f71..4162016b 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -34,8 +34,8 @@ jobs:
 
     - name: 'Create Build Environment'
       run: |
-        sudo apt-get update -y
-        sudo apt-get install -y cmake curl g++ libgl1-mesa-dev libopenmpt-dev
+        sudo apt update -y
+        sudo apt install -y cmake curl g++ libgl1-mesa-dev libopenmpt-dev
 
     - name: 'Configure CMake'
       run: |
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 3b1362ef..fc063cc6 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -52,8 +52,8 @@ jobs:
 
     - name: 'Create Build Environment'
       run: |
-        sudo apt-get update -y
-        sudo apt-get install -y cmake curl g++ libgl1-mesa-dev libopenmpt-dev rpm
+        sudo apt update -y
+        sudo apt install -y cmake curl g++ libgl1-mesa-dev libopenmpt-dev rpm
 
     - if: matrix.CC == 'clang'
       name: 'Configure Clang Compiler'
diff --git a/.github/workflows/linux_cc.yml b/.github/workflows/linux_cc.yml
index f85c6c64..2002e77e 100644
--- a/.github/workflows/linux_cc.yml
+++ b/.github/workflows/linux_cc.yml
@@ -38,13 +38,15 @@ jobs:
       with:
         fetch-depth: 0
 
+    - name: 'Configure Cross-Compile Support (ARM64)'
+      uses: cyberjunk/gha-ubuntu-cross@v4
+      with:
+        arch: arm64
+
     - name: 'Create Build Environment'
       run: |
-        sudo apt update -y
-        sudo apt install crossbuild-essential-arm64
-        sudo dpkg --add-architecture arm64
-        sudo apt install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu
-        sudo apt install -y cmake curl libgl1-mesa-dev:arm64 libopenmpt-dev:arm64 zlib1g:arm64
+        sudo apt install -y cmake curl
+        sudo apt install -y libgl1-mesa-dev:arm64 libglfw3-dev:arm64 libsdl2-dev:arm64 libopenal-dev:arm64 libopenmpt-dev:arm64 zlib1g:arm64
 
     - name: 'Configure CMake'
       run: |
diff --git a/.github/workflows/linux_legacy.yml b/.github/workflows/linux_legacy.yml
index 4fae03ce..8cd1228a 100644
--- a/.github/workflows/linux_legacy.yml
+++ b/.github/workflows/linux_legacy.yml
@@ -40,8 +40,8 @@ jobs:
 
     - name: 'Create Build Environment'
       run: |
-        sudo apt-get update -y
-        sudo apt-get install -y cmake curl g++ libgl1-mesa-dev libglew-dev libglfw3-dev libsdl2-dev libopenal-dev libopenmpt-dev rpm
+        sudo apt update -y
+        sudo apt install -y cmake curl g++ libgl1-mesa-dev libglew-dev libglfw3-dev libsdl2-dev libopenal-dev libopenmpt-dev rpm
 
     - name: 'Configure CMake'
       run: |