Merge pull request #158 from actionquake/chore/arm-gamelib-namechange

ARM gamelib namechange
actionquake · Dec 20, 2023 · 612a05e · 612a05e
2 parents 810e9e3 + 4634fb5
commit 612a05e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -118,7 +118,7 @@ jobs:
 
       - name: Build TNG (Linux ARM64)
         working-directory: build/source
-        run: make -j4 V=1 && mv gameaarch64.so ../gameaarch64.so
+        run: make -j4 V=1 && mv gamearm64.so ../gamearm64.so
         env:
           CC: "gcc"
           USE_AQTION: "TRUE"
@@ -128,7 +128,7 @@ jobs:
         with:
           name: tng-lin-arm64
           path: |
-            build/gameaarch64.so
+            build/gamearm64.so
 
   darwin_build_tng:
     runs-on: macos-latest

diff --git a/source/Makefile b/source/Makefile
@@ -65,6 +65,10 @@ ARCH=$(MACHINE)
 ifneq (,$(findstring __arm,__$(MACHINE)))
 ARCH=arm
 endif
+# If machine is aarch64 (64-bit ARM architecture), set ARCH to arm64.
+ifeq ($(MACHINE),aarch64)
+ARCH=arm64
+endif
 
 DO_CC=$(CC) $(CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
 DO_LINK=$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS) $(SHLIBLIBS)