diff options
| author | Mike Pall <mike> | 2024-05-25 19:01:18 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2024-05-25 19:01:18 +0200 |
| commit | 93e87998b24021b94de8d1c8db244444c46fb6e9 (patch) | |
| tree | 664077df56e778b1173f8a52d38aae6d27756950 | |
| parent | f5587f5eb3a2fcab18afd6b2e073cdb0b56b7d8a (diff) | |
| download | luajit-93e87998b24021b94de8d1c8db244444c46fb6e9.tar.gz luajit-93e87998b24021b94de8d1c8db244444c46fb6e9.tar.bz2 luajit-93e87998b24021b94de8d1c8db244444c46fb6e9.zip | |
Update Nintendo Switch build script.
Thanks to IoriBranford. #1214
| -rw-r--r-- | src/nxbuild.bat | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/nxbuild.bat b/src/nxbuild.bat index 7f84b747..91513397 100644 --- a/src/nxbuild.bat +++ b/src/nxbuild.bat | |||
| @@ -99,20 +99,21 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c | |||
| 99 | @if errorlevel 1 goto :BAD | 99 | @if errorlevel 1 goto :BAD |
| 100 | 100 | ||
| 101 | @rem ---- Cross compiler ---- | 101 | @rem ---- Cross compiler ---- |
| 102 | @set NXCOMPILER_ROOT="%NINTENDO_SDK_ROOT%\Compilers\NintendoClang" | ||
| 102 | @if "%platform%" neq "x64" goto :NX32_CROSSBUILD | 103 | @if "%platform%" neq "x64" goto :NX32_CROSSBUILD |
| 103 | @set LJCOMPILE="%NINTENDO_SDK_ROOT%\Compilers\NX\nx\aarch64\bin\clang" -Wall -I%NINTENDO_SDK_ROOT%\Include %DASMTARGET% -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC -c | 104 | @set LJCOMPILE="%NXCOMPILER_ROOT%\bin\clang" --target=aarch64-nintendo-nx-elf -Wall -I%NINTENDO_SDK_ROOT%\Include %DASMTARGET% -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC -c |
| 104 | @set LJLIB="%NINTENDO_SDK_ROOT%\Compilers\NX\nx\aarch64\bin\aarch64-nintendo-nx-elf-ar" rc | 105 | @set LJLIB="%NXCOMPILER_ROOT%\bin\llvm-ar" rc |
| 105 | @set TARGETLIB_SUFFIX=nx64 | 106 | @set TARGETLIB_SUFFIX=nx64 |
| 106 | 107 | ||
| 107 | %NINTENDO_SDK_ROOT%\Compilers\NX\nx\aarch64\bin\aarch64-nintendo-nx-elf-as -o lj_vm.o lj_vm.s | 108 | %NXCOMPILER_ROOT%\bin\clang --target=aarch64-nintendo-nx-elf -o lj_vm.o -c lj_vm.s |
| 108 | goto :DEBUGCHECK | 109 | goto :DEBUGCHECK |
| 109 | 110 | ||
| 110 | :NX32_CROSSBUILD | 111 | :NX32_CROSSBUILD |
| 111 | @set LJCOMPILE="%NINTENDO_SDK_ROOT%\Compilers\NX\nx\armv7l\bin\clang" -Wall -I%NINTENDO_SDK_ROOT%\Include %DASMTARGET% -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC -c | 112 | @set LJCOMPILE="%NXCOMPILER_ROOT%\bin\clang" --target=armv7l-nintendo-nx-eabihf -Wall -I%NINTENDO_SDK_ROOT%\Include %DASMTARGET% -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC -c |
| 112 | @set LJLIB="%NINTENDO_SDK_ROOT%\Compilers\NX\nx\armv7l\bin\armv7l-nintendo-nx-eabihf-ar" rc | 113 | @set LJLIB="%NXCOMPILER_ROOT%\bin\llvm-ar" rc |
| 113 | @set TARGETLIB_SUFFIX=nx32 | 114 | @set TARGETLIB_SUFFIX=nx32 |
| 114 | 115 | ||
| 115 | %NINTENDO_SDK_ROOT%\Compilers\NX\nx\armv7l\bin\armv7l-nintendo-nx-eabihf-as -o lj_vm.o lj_vm.s | 116 | %NXCOMPILER_ROOT%\bin\clang --target=armv7l-nintendo-nx-eabihf -o lj_vm.o -c lj_vm.s |
| 116 | :DEBUGCHECK | 117 | :DEBUGCHECK |
| 117 | 118 | ||
| 118 | @if "%1" neq "debug" goto :NODEBUG | 119 | @if "%1" neq "debug" goto :NODEBUG |