Browse Source

scripts: nswitch: it's arm64, not aarch64

pull/2/head
fgsfds 2 years ago
parent
commit
f7489a3747
  1. 2
      .github/workflows/c-cpp.yml
  2. 4
      scripts/gha/build_nswitch_docker.sh
  3. 2
      scripts/waifulib/xcompile.py

2
.github/workflows/c-cpp.yml

@ -36,7 +36,7 @@ jobs:
- os: ubuntu-20.04 - os: ubuntu-20.04
targetos: nswitch targetos: nswitch
targetarch: aarch64 targetarch: arm64
- os: windows-latest - os: windows-latest
targetos: win32 targetos: win32
targetarch: amd64 targetarch: amd64

4
scripts/gha/build_nswitch_docker.sh

@ -9,8 +9,8 @@ build_hlsdk()
git checkout switch-$1 git checkout switch-$1
./waf configure -T release --nswitch || die_configure ./waf configure -T release --nswitch || die_configure
./waf build || die ./waf build || die
cp build/dlls/$1_nswitch_aarch64.so ../pkgtemp/xash3d/$2/dlls/ cp build/dlls/$1_nswitch_arm64.so ../pkgtemp/xash3d/$2/dlls/
cp build/cl_dll/client_nswitch_aarch64.so ../pkgtemp/xash3d/$2/cl_dlls/ cp build/cl_dll/client_nswitch_arm64.so ../pkgtemp/xash3d/$2/cl_dlls/
./waf clean ./waf clean
} }

2
scripts/waifulib/xcompile.py

@ -352,7 +352,7 @@ class Android:
class NintendoSwitch: class NintendoSwitch:
ctx = None # waf context ctx = None # waf context
arch = "aarch64" arch = "arm64"
dkp_dir = None dkp_dir = None
portlibs_dir = None portlibs_dir = None
dka64_dir = None dka64_dir = None

Loading…
Cancel
Save