From f7489a37475930577218be921b6f0a0ef5ed407d Mon Sep 17 00:00:00 2001 From: fgsfds Date: Wed, 8 Feb 2023 01:04:31 +0100 Subject: [PATCH] scripts: nswitch: it's arm64, not aarch64 --- .github/workflows/c-cpp.yml | 2 +- scripts/gha/build_nswitch_docker.sh | 4 ++-- scripts/waifulib/xcompile.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 82430f05..e80c4b19 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -36,7 +36,7 @@ jobs: - os: ubuntu-20.04 targetos: nswitch - targetarch: aarch64 + targetarch: arm64 - os: windows-latest targetos: win32 targetarch: amd64 diff --git a/scripts/gha/build_nswitch_docker.sh b/scripts/gha/build_nswitch_docker.sh index 94af4a34..4732facc 100644 --- a/scripts/gha/build_nswitch_docker.sh +++ b/scripts/gha/build_nswitch_docker.sh @@ -9,8 +9,8 @@ build_hlsdk() git checkout switch-$1 ./waf configure -T release --nswitch || die_configure ./waf build || die - cp build/dlls/$1_nswitch_aarch64.so ../pkgtemp/xash3d/$2/dlls/ - cp build/cl_dll/client_nswitch_aarch64.so ../pkgtemp/xash3d/$2/cl_dlls/ + cp build/dlls/$1_nswitch_arm64.so ../pkgtemp/xash3d/$2/dlls/ + cp build/cl_dll/client_nswitch_arm64.so ../pkgtemp/xash3d/$2/cl_dlls/ ./waf clean } diff --git a/scripts/waifulib/xcompile.py b/scripts/waifulib/xcompile.py index 34700ddd..21631d38 100644 --- a/scripts/waifulib/xcompile.py +++ b/scripts/waifulib/xcompile.py @@ -352,7 +352,7 @@ class Android: class NintendoSwitch: ctx = None # waf context - arch = "aarch64" + arch = "arm64" dkp_dir = None portlibs_dir = None dka64_dir = None