texlive[73709] Build/source/libs/luajit/LuaJIT-src/src: Unix line
commits+lscarso at tug.org
commits+lscarso at tug.org
Mon Feb 3 11:00:57 CET 2025
Revision: 73709
https://tug.org/svn/texlive?view=revision&revision=73709
Author: lscarso
Date: 2025-02-03 11:00:57 +0100 (Mon, 03 Feb 2025)
Log Message:
-----------
Unix line ending for LuaJIT-src/src/*bat files
Modified Paths:
--------------
trunk/Build/source/libs/luajit/LuaJIT-src/src/msvcbuild.bat
trunk/Build/source/libs/luajit/LuaJIT-src/src/nxbuild.bat
trunk/Build/source/libs/luajit/LuaJIT-src/src/ps4build.bat
trunk/Build/source/libs/luajit/LuaJIT-src/src/ps5build.bat
trunk/Build/source/libs/luajit/LuaJIT-src/src/psvitabuild.bat
trunk/Build/source/libs/luajit/LuaJIT-src/src/xb1build.bat
trunk/Build/source/libs/luajit/LuaJIT-src/src/xedkbuild.bat
Modified: trunk/Build/source/libs/luajit/LuaJIT-src/src/msvcbuild.bat
===================================================================
--- trunk/Build/source/libs/luajit/LuaJIT-src/src/msvcbuild.bat 2025-02-03 00:52:36 UTC (rev 73708)
+++ trunk/Build/source/libs/luajit/LuaJIT-src/src/msvcbuild.bat 2025-02-03 10:00:57 UTC (rev 73709)
@@ -1,162 +1,162 @@
- at rem Script to build LuaJIT with MSVC.
- at rem Copyright (C) 2005-2025 Mike Pall. See Copyright Notice in luajit.h
- at rem
- at rem Open a "Visual Studio Command Prompt" (either x86 or x64).
- at rem Then cd to this directory and run this script. Use the following
- at rem options (in order), if needed. The default is a dynamic release build.
- at rem
- at rem nogc64 disable LJ_GC64 mode for x64
- at rem debug emit debug symbols
- at rem amalg amalgamated build
- at rem static static linkage
-
- at if not defined INCLUDE goto :FAIL
-
- at setlocal
- at rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_ASSERT
- at set DEBUGCFLAGS=
- at set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
- at set LJDYNBUILD=/DLUA_BUILD_AS_DLL /MD
- at set LJDYNBUILD_DEBUG=/DLUA_BUILD_AS_DLL /MDd
- at set LJCOMPILETARGET=/Zi
- at set LJLINKTYPE=/DEBUG /RELEASE
- at set LJLINKTYPE_DEBUG=/DEBUG
- at set LJLINKTARGET=/OPT:REF /OPT:ICF /INCREMENTAL:NO
- at set LJLINK=link /nologo
- at set LJMT=mt /nologo
- at set LJLIB=lib /nologo /nodefaultlib
- at set DASMDIR=..\dynasm
- at set DASM=%DASMDIR%\dynasm.lua
- at set DASC=vm_x64.dasc
- at set LJDLLNAME=lua51.dll
- at set LJLIBNAME=lua51.lib
- at set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
-
- at setlocal
- at call :SETHOSTVARS
-%LJCOMPILE% host\minilua.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /out:minilua.exe minilua.obj
- at if errorlevel 1 goto :BAD
-if exist minilua.exe.manifest^
- %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
- at endlocal
-
- at set DASMFLAGS=-D WIN -D JIT -D FFI -D ENDIAN_LE -D FPU -D P64
- at set LJARCH=x64
- at minilua
- at if errorlevel 8 goto :NO32
- at set DASC=vm_x86.dasc
- at set DASMFLAGS=-D WIN -D JIT -D FFI -D ENDIAN_LE -D FPU
- at set LJARCH=x86
- at set LJCOMPILE=%LJCOMPILE% /arch:SSE2
- at goto :DA
-:NO32
- at if "%VSCMD_ARG_TGT_ARCH%" neq "arm64" goto :X64
- at set DASC=vm_arm64.dasc
- at set DASMTARGET=-D LUAJIT_TARGET=LUAJIT_ARCH_ARM64
- at set LJARCH=arm64
- at goto :DA
-:X64
- at if "%1" neq "nogc64" goto :DA
- at shift
- at set DASC=vm_x86.dasc
- at set LJCOMPILE=%LJCOMPILE% /DLUAJIT_DISABLE_GC64
-:DA
-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
- at if errorlevel 1 goto :BAD
-
-if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
-minilua host\genversion.lua
-
- at setlocal
- at call :SETHOSTVARS
-%LJCOMPILE% /I "." /I %DASMDIR% %DASMTARGET% host\buildvm*.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /out:buildvm.exe buildvm*.obj
- at if errorlevel 1 goto :BAD
-if exist buildvm.exe.manifest^
- %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
- at endlocal
-
-buildvm -m peobj -o lj_vm.obj
- at if errorlevel 1 goto :BAD
-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
- at if errorlevel 1 goto :BAD
-
- at if "%1" neq "debug" goto :NODEBUG
- at shift
- at set LJCOMPILE=%LJCOMPILE% %DEBUGCFLAGS%
- at set LJDYNBUILD=%LJDYNBUILD_DEBUG%
- at set LJLINKTYPE=%LJLINKTYPE_DEBUG%
-:NODEBUG
- at set LJCOMPILE=%LJCOMPILE% %LJCOMPILETARGET%
- at set LJLINK=%LJLINK% %LJLINKTYPE% %LJLINKTARGET%
- at if "%1"=="amalg" goto :AMALGDLL
- at if "%1"=="static" goto :STATIC
-%LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /DLL /OUT:%LJDLLNAME% lj_*.obj lib_*.obj
- at if errorlevel 1 goto :BAD
- at goto :MTDLL
-:STATIC
-%LJCOMPILE% lj_*.c lib_*.c
- at if errorlevel 1 goto :BAD
-%LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj
- at if errorlevel 1 goto :BAD
- at goto :MTDLL
-:AMALGDLL
- at if "%2"=="static" goto :AMALGSTATIC
-%LJCOMPILE% %LJDYNBUILD% ljamalg.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /DLL /OUT:%LJDLLNAME% ljamalg.obj lj_vm.obj
- at if errorlevel 1 goto :BAD
- at goto :MTDLL
-:AMALGSTATIC
-%LJCOMPILE% ljamalg.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /OUT:%LJDLLNAME% ljamalg.obj lj_vm.obj
- at if errorlevel 1 goto :BAD
-:MTDLL
-if exist %LJDLLNAME%.manifest^
- %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2
-
-%LJCOMPILE% luajit.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /OUT:luajit.exe luajit.obj %LJLIBNAME%
- at if errorlevel 1 goto :BAD
-if exist luajit.exe.manifest^
- %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe
-
- at del *.obj *.manifest minilua.exe buildvm.exe
- at del host\buildvm_arch.h
- at del lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h
- at echo.
- at echo === Successfully built LuaJIT for Windows/%LJARCH% ===
-
- at goto :END
-:SETHOSTVARS
- at if "%VSCMD_ARG_HOST_ARCH%_%VSCMD_ARG_TGT_ARCH%" equ "x64_arm64" (
- call "%VSINSTALLDIR%Common7\Tools\VsDevCmd.bat" -arch=%VSCMD_ARG_HOST_ARCH% -no_logo
- echo on
-)
- at goto :END
-:BAD
- at echo.
- at echo *******************************************************
- at echo *** Build FAILED -- Please check the error messages ***
- at echo *******************************************************
- at goto :END
-:FAIL
- at echo You must open a "Visual Studio Command Prompt" to run this script
-:END
+ at rem Script to build LuaJIT with MSVC.
+ at rem Copyright (C) 2005-2025 Mike Pall. See Copyright Notice in luajit.h
+ at rem
+ at rem Open a "Visual Studio Command Prompt" (either x86 or x64).
+ at rem Then cd to this directory and run this script. Use the following
+ at rem options (in order), if needed. The default is a dynamic release build.
+ at rem
+ at rem nogc64 disable LJ_GC64 mode for x64
+ at rem debug emit debug symbols
+ at rem amalg amalgamated build
+ at rem static static linkage
+
+ at if not defined INCLUDE goto :FAIL
+
+ at setlocal
+ at rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_ASSERT
+ at set DEBUGCFLAGS=
+ at set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
+ at set LJDYNBUILD=/DLUA_BUILD_AS_DLL /MD
+ at set LJDYNBUILD_DEBUG=/DLUA_BUILD_AS_DLL /MDd
+ at set LJCOMPILETARGET=/Zi
+ at set LJLINKTYPE=/DEBUG /RELEASE
+ at set LJLINKTYPE_DEBUG=/DEBUG
+ at set LJLINKTARGET=/OPT:REF /OPT:ICF /INCREMENTAL:NO
+ at set LJLINK=link /nologo
+ at set LJMT=mt /nologo
+ at set LJLIB=lib /nologo /nodefaultlib
+ at set DASMDIR=..\dynasm
+ at set DASM=%DASMDIR%\dynasm.lua
+ at set DASC=vm_x64.dasc
+ at set LJDLLNAME=lua51.dll
+ at set LJLIBNAME=lua51.lib
+ at set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
+
+ at setlocal
+ at call :SETHOSTVARS
+%LJCOMPILE% host\minilua.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+ at if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+ %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+ at endlocal
+
+ at set DASMFLAGS=-D WIN -D JIT -D FFI -D ENDIAN_LE -D FPU -D P64
+ at set LJARCH=x64
+ at minilua
+ at if errorlevel 8 goto :NO32
+ at set DASC=vm_x86.dasc
+ at set DASMFLAGS=-D WIN -D JIT -D FFI -D ENDIAN_LE -D FPU
+ at set LJARCH=x86
+ at set LJCOMPILE=%LJCOMPILE% /arch:SSE2
+ at goto :DA
+:NO32
+ at if "%VSCMD_ARG_TGT_ARCH%" neq "arm64" goto :X64
+ at set DASC=vm_arm64.dasc
+ at set DASMTARGET=-D LUAJIT_TARGET=LUAJIT_ARCH_ARM64
+ at set LJARCH=arm64
+ at goto :DA
+:X64
+ at if "%1" neq "nogc64" goto :DA
+ at shift
+ at set DASC=vm_x86.dasc
+ at set LJCOMPILE=%LJCOMPILE% /DLUAJIT_DISABLE_GC64
+:DA
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
+ at if errorlevel 1 goto :BAD
+
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
+minilua host\genversion.lua
+
+ at setlocal
+ at call :SETHOSTVARS
+%LJCOMPILE% /I "." /I %DASMDIR% %DASMTARGET% host\buildvm*.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+ at if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+ %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+ at endlocal
+
+buildvm -m peobj -o lj_vm.obj
+ at if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+ at if errorlevel 1 goto :BAD
+
+ at if "%1" neq "debug" goto :NODEBUG
+ at shift
+ at set LJCOMPILE=%LJCOMPILE% %DEBUGCFLAGS%
+ at set LJDYNBUILD=%LJDYNBUILD_DEBUG%
+ at set LJLINKTYPE=%LJLINKTYPE_DEBUG%
+:NODEBUG
+ at set LJCOMPILE=%LJCOMPILE% %LJCOMPILETARGET%
+ at set LJLINK=%LJLINK% %LJLINKTYPE% %LJLINKTARGET%
+ at if "%1"=="amalg" goto :AMALGDLL
+ at if "%1"=="static" goto :STATIC
+%LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /DLL /OUT:%LJDLLNAME% lj_*.obj lib_*.obj
+ at if errorlevel 1 goto :BAD
+ at goto :MTDLL
+:STATIC
+%LJCOMPILE% lj_*.c lib_*.c
+ at if errorlevel 1 goto :BAD
+%LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj
+ at if errorlevel 1 goto :BAD
+ at goto :MTDLL
+:AMALGDLL
+ at if "%2"=="static" goto :AMALGSTATIC
+%LJCOMPILE% %LJDYNBUILD% ljamalg.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /DLL /OUT:%LJDLLNAME% ljamalg.obj lj_vm.obj
+ at if errorlevel 1 goto :BAD
+ at goto :MTDLL
+:AMALGSTATIC
+%LJCOMPILE% ljamalg.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /OUT:%LJDLLNAME% ljamalg.obj lj_vm.obj
+ at if errorlevel 1 goto :BAD
+:MTDLL
+if exist %LJDLLNAME%.manifest^
+ %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2
+
+%LJCOMPILE% luajit.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /OUT:luajit.exe luajit.obj %LJLIBNAME%
+ at if errorlevel 1 goto :BAD
+if exist luajit.exe.manifest^
+ %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe
+
+ at del *.obj *.manifest minilua.exe buildvm.exe
+ at del host\buildvm_arch.h
+ at del lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h
+ at echo.
+ at echo === Successfully built LuaJIT for Windows/%LJARCH% ===
+
+ at goto :END
+:SETHOSTVARS
+ at if "%VSCMD_ARG_HOST_ARCH%_%VSCMD_ARG_TGT_ARCH%" equ "x64_arm64" (
+ call "%VSINSTALLDIR%Common7\Tools\VsDevCmd.bat" -arch=%VSCMD_ARG_HOST_ARCH% -no_logo
+ echo on
+)
+ at goto :END
+:BAD
+ at echo.
+ at echo *******************************************************
+ at echo *** Build FAILED -- Please check the error messages ***
+ at echo *******************************************************
+ at goto :END
+:FAIL
+ at echo You must open a "Visual Studio Command Prompt" to run this script
+:END
Modified: trunk/Build/source/libs/luajit/LuaJIT-src/src/nxbuild.bat
===================================================================
--- trunk/Build/source/libs/luajit/LuaJIT-src/src/nxbuild.bat 2025-02-03 00:52:36 UTC (rev 73708)
+++ trunk/Build/source/libs/luajit/LuaJIT-src/src/nxbuild.bat 2025-02-03 10:00:57 UTC (rev 73709)
@@ -1,165 +1,165 @@
- at rem Script to build LuaJIT with NintendoSDK + NX Addon.
- at rem Donated to the public domain by Swyter.
- at rem
- at rem To run this script you must open a "Native Tools Command Prompt for VS".
- at rem
- at rem Either the x86 version for NX32, or x64 for the NX64 target.
- at rem This is because the pointer size of the LuaJIT host tools (buildvm.exe)
- at rem must match the cross-compiled target (32 or 64 bits).
- at rem
- at rem Then cd to this directory and run this script.
- at rem
- at rem Recommended invocation:
- at rem
- at rem nxbuild # release build, amalgamated
- at rem nxbuild debug # debug build, amalgamated
- at rem
- at rem Additional command-line options (not generally recommended):
- at rem
- at rem noamalg # (after debug) non-amalgamated build
-
- at if not defined INCLUDE goto :FAIL
- at if not defined NINTENDO_SDK_ROOT goto :FAIL
- at if not defined PLATFORM goto :FAIL
-
- at if "%platform%" == "x86" goto :DO_NX32
- at if "%platform%" == "x64" goto :DO_NX64
-
- at echo Error: Current host platform is %platform%!
- at echo.
- at goto :FAIL
-
- at setlocal
-
-:DO_NX32
- at set DASC=vm_arm.dasc
- at set DASMFLAGS= -D HFABI -D FPU
- at set DASMTARGET= -D LUAJIT_TARGET=LUAJIT_ARCH_ARM
- at set HOST_PTR_SIZE=4
-goto :BEGIN
-
-:DO_NX64
- at set DASC=vm_arm64.dasc
- at set DASMFLAGS= -D ENDIAN_LE
- at set DASMTARGET= -D LUAJIT_TARGET=LUAJIT_ARCH_ARM64
- at set HOST_PTR_SIZE=8
-
-:BEGIN
- at rem ---- Host compiler ----
- at set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /wo4146 /wo4244 /D_CRT_SECURE_NO_DEPRECATE
- at set LJLINK=link /nologo
- at set LJMT=mt /nologo
- at set DASMDIR=..\dynasm
- at set DASM=%DASMDIR%\dynasm.lua
- at set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
-
-%LJCOMPILE% host\minilua.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /out:minilua.exe minilua.obj
- at if errorlevel 1 goto :BAD
-if exist minilua.exe.manifest^
- %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
-
- at rem Check that we have the right 32/64 bit host compiler to generate the right virtual machine files.
- at minilua
- at if "%ERRORLEVEL%" == "%HOST_PTR_SIZE%" goto :PASSED_PTR_CHECK
-
- at echo The pointer size of the host in bytes (%HOST_PTR_SIZE%) does not match the expected value (%errorlevel%).
- at echo Check that the script is being ran under the correct x86/x64 VS prompt.
- at goto :BAD
-
-:PASSED_PTR_CHECK
- at set DASMFLAGS=%DASMFLAGS% %DASMTARGET% -D LJ_TARGET_NX -D LUAJIT_OS=LUAJIT_OS_OTHER -D LUAJIT_DISABLE_JIT -D LUAJIT_DISABLE_FFI
-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
- at if errorlevel 1 goto :BAD
-
-if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
-minilua host\genversion.lua
-
-%LJCOMPILE% /I "." /I %DASMDIR% %DASMTARGET% -D LJ_TARGET_NX -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI host\buildvm*.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /out:buildvm.exe buildvm*.obj
- at if errorlevel 1 goto :BAD
-if exist buildvm.exe.manifest^
- %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
-
-buildvm -m elfasm -o lj_vm.s
- at if errorlevel 1 goto :BAD
-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
- at if errorlevel 1 goto :BAD
-
- at rem ---- Cross compiler ----
- at set NXCOMPILER_ROOT="%NINTENDO_SDK_ROOT%\Compilers\NintendoClang"
- at if "%platform%" neq "x64" goto :NX32_CROSSBUILD
- at 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
- at set LJLIB="%NXCOMPILER_ROOT%\bin\llvm-ar" rc
- at set TARGETLIB_SUFFIX=nx64
-
-%NXCOMPILER_ROOT%\bin\clang --target=aarch64-nintendo-nx-elf -o lj_vm.o -c lj_vm.s
-goto :DEBUGCHECK
-
-:NX32_CROSSBUILD
- at 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
- at set LJLIB="%NXCOMPILER_ROOT%\bin\llvm-ar" rc
- at set TARGETLIB_SUFFIX=nx32
-
-%NXCOMPILER_ROOT%\bin\clang --target=armv7l-nintendo-nx-eabihf -o lj_vm.o -c lj_vm.s
-:DEBUGCHECK
-
- at if "%1" neq "debug" goto :NODEBUG
- at shift
- at set LJCOMPILE=%LJCOMPILE% -DNN_SDK_BUILD_DEBUG -g -O0
- at set TARGETLIB=libluajitD_%TARGETLIB_SUFFIX%.a
-goto :BUILD
-:NODEBUG
- at set LJCOMPILE=%LJCOMPILE% -DNN_SDK_BUILD_RELEASE -O3
- at set TARGETLIB=libluajit_%TARGETLIB_SUFFIX%.a
-:BUILD
-del %TARGETLIB%
- at set LJCOMPILE=%LJCOMPILE% -fPIC
- at if "%1" neq "noamalg" goto :AMALG
-for %%f in (lj_*.c lib_*.c) do (
- %LJCOMPILE% %%f
- @if errorlevel 1 goto :BAD
-)
-
-%LJLIB% %TARGETLIB% lj_*.o lib_*.o
- at if errorlevel 1 goto :BAD
- at goto :NOAMALG
-:AMALG
-%LJCOMPILE% ljamalg.c
- at if errorlevel 1 goto :BAD
-%LJLIB% %TARGETLIB% ljamalg.o lj_vm.o
- at if errorlevel 1 goto :BAD
-:NOAMALG
-
- at del *.o *.obj *.manifest minilua.exe buildvm.exe
- at echo.
- at echo === Successfully built LuaJIT for Nintendo Switch (%TARGETLIB_SUFFIX%) ===
-
- at goto :END
-:BAD
- at echo.
- at echo *******************************************************
- at echo *** Build FAILED -- Please check the error messages ***
- at echo *******************************************************
- at goto :END
-:FAIL
- at echo To run this script you must open a "Native Tools Command Prompt for VS".
- at echo.
- at echo Either the x86 version for NX32, or x64 for the NX64 target.
- at echo This is because the pointer size of the LuaJIT host tools (buildvm.exe)
- at echo must match the cross-compiled target (32 or 64 bits).
- at echo.
- at echo Keep in mind that NintendoSDK + NX Addon must be installed, too.
-:END
+ at rem Script to build LuaJIT with NintendoSDK + NX Addon.
+ at rem Donated to the public domain by Swyter.
+ at rem
+ at rem To run this script you must open a "Native Tools Command Prompt for VS".
+ at rem
+ at rem Either the x86 version for NX32, or x64 for the NX64 target.
+ at rem This is because the pointer size of the LuaJIT host tools (buildvm.exe)
+ at rem must match the cross-compiled target (32 or 64 bits).
+ at rem
+ at rem Then cd to this directory and run this script.
+ at rem
+ at rem Recommended invocation:
+ at rem
+ at rem nxbuild # release build, amalgamated
+ at rem nxbuild debug # debug build, amalgamated
+ at rem
+ at rem Additional command-line options (not generally recommended):
+ at rem
+ at rem noamalg # (after debug) non-amalgamated build
+
+ at if not defined INCLUDE goto :FAIL
+ at if not defined NINTENDO_SDK_ROOT goto :FAIL
+ at if not defined PLATFORM goto :FAIL
+
+ at if "%platform%" == "x86" goto :DO_NX32
+ at if "%platform%" == "x64" goto :DO_NX64
+
+ at echo Error: Current host platform is %platform%!
+ at echo.
+ at goto :FAIL
+
+ at setlocal
+
+:DO_NX32
+ at set DASC=vm_arm.dasc
+ at set DASMFLAGS= -D HFABI -D FPU
+ at set DASMTARGET= -D LUAJIT_TARGET=LUAJIT_ARCH_ARM
+ at set HOST_PTR_SIZE=4
+goto :BEGIN
+
+:DO_NX64
+ at set DASC=vm_arm64.dasc
+ at set DASMFLAGS= -D ENDIAN_LE
+ at set DASMTARGET= -D LUAJIT_TARGET=LUAJIT_ARCH_ARM64
+ at set HOST_PTR_SIZE=8
+
+:BEGIN
+ at rem ---- Host compiler ----
+ at set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /wo4146 /wo4244 /D_CRT_SECURE_NO_DEPRECATE
+ at set LJLINK=link /nologo
+ at set LJMT=mt /nologo
+ at set DASMDIR=..\dynasm
+ at set DASM=%DASMDIR%\dynasm.lua
+ at set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
+
+%LJCOMPILE% host\minilua.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+ at if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+ %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+
+ at rem Check that we have the right 32/64 bit host compiler to generate the right virtual machine files.
+ at minilua
+ at if "%ERRORLEVEL%" == "%HOST_PTR_SIZE%" goto :PASSED_PTR_CHECK
+
+ at echo The pointer size of the host in bytes (%HOST_PTR_SIZE%) does not match the expected value (%errorlevel%).
+ at echo Check that the script is being ran under the correct x86/x64 VS prompt.
+ at goto :BAD
+
+:PASSED_PTR_CHECK
+ at set DASMFLAGS=%DASMFLAGS% %DASMTARGET% -D LJ_TARGET_NX -D LUAJIT_OS=LUAJIT_OS_OTHER -D LUAJIT_DISABLE_JIT -D LUAJIT_DISABLE_FFI
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
+ at if errorlevel 1 goto :BAD
+
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
+minilua host\genversion.lua
+
+%LJCOMPILE% /I "." /I %DASMDIR% %DASMTARGET% -D LJ_TARGET_NX -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI host\buildvm*.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+ at if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+ %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+
+buildvm -m elfasm -o lj_vm.s
+ at if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+ at if errorlevel 1 goto :BAD
+
+ at rem ---- Cross compiler ----
+ at set NXCOMPILER_ROOT="%NINTENDO_SDK_ROOT%\Compilers\NintendoClang"
+ at if "%platform%" neq "x64" goto :NX32_CROSSBUILD
+ at 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
+ at set LJLIB="%NXCOMPILER_ROOT%\bin\llvm-ar" rc
+ at set TARGETLIB_SUFFIX=nx64
+
+%NXCOMPILER_ROOT%\bin\clang --target=aarch64-nintendo-nx-elf -o lj_vm.o -c lj_vm.s
+goto :DEBUGCHECK
+
+:NX32_CROSSBUILD
+ at 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
+ at set LJLIB="%NXCOMPILER_ROOT%\bin\llvm-ar" rc
+ at set TARGETLIB_SUFFIX=nx32
+
+%NXCOMPILER_ROOT%\bin\clang --target=armv7l-nintendo-nx-eabihf -o lj_vm.o -c lj_vm.s
+:DEBUGCHECK
+
+ at if "%1" neq "debug" goto :NODEBUG
+ at shift
+ at set LJCOMPILE=%LJCOMPILE% -DNN_SDK_BUILD_DEBUG -g -O0
+ at set TARGETLIB=libluajitD_%TARGETLIB_SUFFIX%.a
+goto :BUILD
+:NODEBUG
+ at set LJCOMPILE=%LJCOMPILE% -DNN_SDK_BUILD_RELEASE -O3
+ at set TARGETLIB=libluajit_%TARGETLIB_SUFFIX%.a
+:BUILD
+del %TARGETLIB%
+ at set LJCOMPILE=%LJCOMPILE% -fPIC
+ at if "%1" neq "noamalg" goto :AMALG
+for %%f in (lj_*.c lib_*.c) do (
+ %LJCOMPILE% %%f
+ @if errorlevel 1 goto :BAD
+)
+
+%LJLIB% %TARGETLIB% lj_*.o lib_*.o
+ at if errorlevel 1 goto :BAD
+ at goto :NOAMALG
+:AMALG
+%LJCOMPILE% ljamalg.c
+ at if errorlevel 1 goto :BAD
+%LJLIB% %TARGETLIB% ljamalg.o lj_vm.o
+ at if errorlevel 1 goto :BAD
+:NOAMALG
+
+ at del *.o *.obj *.manifest minilua.exe buildvm.exe
+ at echo.
+ at echo === Successfully built LuaJIT for Nintendo Switch (%TARGETLIB_SUFFIX%) ===
+
+ at goto :END
+:BAD
+ at echo.
+ at echo *******************************************************
+ at echo *** Build FAILED -- Please check the error messages ***
+ at echo *******************************************************
+ at goto :END
+:FAIL
+ at echo To run this script you must open a "Native Tools Command Prompt for VS".
+ at echo.
+ at echo Either the x86 version for NX32, or x64 for the NX64 target.
+ at echo This is because the pointer size of the LuaJIT host tools (buildvm.exe)
+ at echo must match the cross-compiled target (32 or 64 bits).
+ at echo.
+ at echo Keep in mind that NintendoSDK + NX Addon must be installed, too.
+:END
Modified: trunk/Build/source/libs/luajit/LuaJIT-src/src/ps4build.bat
===================================================================
--- trunk/Build/source/libs/luajit/LuaJIT-src/src/ps4build.bat 2025-02-03 00:52:36 UTC (rev 73708)
+++ trunk/Build/source/libs/luajit/LuaJIT-src/src/ps4build.bat 2025-02-03 10:00:57 UTC (rev 73709)
@@ -1,127 +1,127 @@
- at rem Script to build LuaJIT with the PS4 SDK.
- at rem Donated to the public domain.
- at rem
- at rem Open a "Visual Studio .NET Command Prompt" (64 bit host compiler)
- at rem or "VS2015 x64 Native Tools Command Prompt".
- at rem
- at rem Then cd to this directory and run this script.
- at rem
- at rem Recommended invocation:
- at rem
- at rem ps4build release build, amalgamated, 64-bit GC
- at rem ps4build debug debug build, amalgamated, 64-bit GC
- at rem
- at rem Additional command-line options (not generally recommended):
- at rem
- at rem gc32 (before debug) 32-bit GC
- at rem noamalg (after debug) non-amalgamated build
-
- at if not defined INCLUDE goto :FAIL
- at if not defined SCE_ORBIS_SDK_DIR goto :FAIL
-
- at setlocal
- at rem ---- Host compiler ----
- at set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
- at set LJLINK=link /nologo
- at set LJMT=mt /nologo
- at set DASMDIR=..\dynasm
- at set DASM=%DASMDIR%\dynasm.lua
- at set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
- at set GC64=
- at set DASC=vm_x64.dasc
-
- at if "%1" neq "gc32" goto :NOGC32
- at shift
- at set GC64=-DLUAJIT_DISABLE_GC64
- at set DASC=vm_x86.dasc
-:NOGC32
-
-%LJCOMPILE% host\minilua.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /out:minilua.exe minilua.obj
- at if errorlevel 1 goto :BAD
-if exist minilua.exe.manifest^
- %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
-
- at rem Check for 64 bit host compiler.
- at minilua
- at if not errorlevel 8 goto :FAIL
-
- at set DASMFLAGS=-D P64 -D NO_UNWIND
-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
- at if errorlevel 1 goto :BAD
-
-if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
-minilua host\genversion.lua
-
-%LJCOMPILE% /I "." /I %DASMDIR% %GC64% -DLUAJIT_TARGET=LUAJIT_ARCH_X64 -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC -DLUAJIT_NO_UNWIND host\buildvm*.c
-
- at if errorlevel 1 goto :BAD
-%LJLINK% /out:buildvm.exe buildvm*.obj
- at if errorlevel 1 goto :BAD
-if exist buildvm.exe.manifest^
- %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
-
-buildvm -m elfasm -o lj_vm.s
- at if errorlevel 1 goto :BAD
-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
- at if errorlevel 1 goto :BAD
-
- at rem ---- Cross compiler ----
- at set LJCOMPILE="%SCE_ORBIS_SDK_DIR%\host_tools\bin\orbis-clang" -c -Wall -DLUAJIT_DISABLE_FFI %GC64%
- at set LJLIB="%SCE_ORBIS_SDK_DIR%\host_tools\bin\orbis-ar" rcus
- at set INCLUDE=""
-
-"%SCE_ORBIS_SDK_DIR%\host_tools\bin\orbis-as" -o lj_vm.o lj_vm.s
-
- at if "%1" neq "debug" goto :NODEBUG
- at shift
- at set LJCOMPILE=%LJCOMPILE% -g -O0
- at set TARGETLIB=libluajitD_ps4.a
-goto :BUILD
-:NODEBUG
- at set LJCOMPILE=%LJCOMPILE% -O2
- at set TARGETLIB=libluajit_ps4.a
-:BUILD
-del %TARGETLIB%
- at if "%1" neq "noamalg" goto :AMALG
-for %%f in (lj_*.c lib_*.c) do (
- %LJCOMPILE% %%f
- @if errorlevel 1 goto :BAD
-)
-
-%LJLIB% %TARGETLIB% lj_*.o lib_*.o
- at if errorlevel 1 goto :BAD
- at goto :NOAMALG
-:AMALG
-%LJCOMPILE% ljamalg.c
- at if errorlevel 1 goto :BAD
-%LJLIB% %TARGETLIB% ljamalg.o lj_vm.o
- at if errorlevel 1 goto :BAD
-:NOAMALG
-
- at del *.o *.obj *.manifest minilua.exe buildvm.exe
- at echo.
- at echo === Successfully built LuaJIT for PS4 ===
-
- at goto :END
-:BAD
- at echo.
- at echo *******************************************************
- at echo *** Build FAILED -- Please check the error messages ***
- at echo *******************************************************
- at goto :END
-:FAIL
- at echo To run this script you must open a "Visual Studio .NET Command Prompt"
- at echo (64 bit host compiler). The PS4 Orbis SDK must be installed, too.
-:END
+ at rem Script to build LuaJIT with the PS4 SDK.
+ at rem Donated to the public domain.
+ at rem
+ at rem Open a "Visual Studio .NET Command Prompt" (64 bit host compiler)
+ at rem or "VS2015 x64 Native Tools Command Prompt".
+ at rem
+ at rem Then cd to this directory and run this script.
+ at rem
+ at rem Recommended invocation:
+ at rem
+ at rem ps4build release build, amalgamated, 64-bit GC
+ at rem ps4build debug debug build, amalgamated, 64-bit GC
+ at rem
+ at rem Additional command-line options (not generally recommended):
+ at rem
+ at rem gc32 (before debug) 32-bit GC
+ at rem noamalg (after debug) non-amalgamated build
+
+ at if not defined INCLUDE goto :FAIL
+ at if not defined SCE_ORBIS_SDK_DIR goto :FAIL
+
+ at setlocal
+ at rem ---- Host compiler ----
+ at set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
+ at set LJLINK=link /nologo
+ at set LJMT=mt /nologo
+ at set DASMDIR=..\dynasm
+ at set DASM=%DASMDIR%\dynasm.lua
+ at set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
+ at set GC64=
+ at set DASC=vm_x64.dasc
+
+ at if "%1" neq "gc32" goto :NOGC32
+ at shift
+ at set GC64=-DLUAJIT_DISABLE_GC64
+ at set DASC=vm_x86.dasc
+:NOGC32
+
+%LJCOMPILE% host\minilua.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+ at if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+ %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+
+ at rem Check for 64 bit host compiler.
+ at minilua
+ at if not errorlevel 8 goto :FAIL
+
+ at set DASMFLAGS=-D P64 -D NO_UNWIND
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
+ at if errorlevel 1 goto :BAD
+
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
+minilua host\genversion.lua
+
+%LJCOMPILE% /I "." /I %DASMDIR% %GC64% -DLUAJIT_TARGET=LUAJIT_ARCH_X64 -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC -DLUAJIT_NO_UNWIND host\buildvm*.c
+
+ at if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+ at if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+ %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+
+buildvm -m elfasm -o lj_vm.s
+ at if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+ at if errorlevel 1 goto :BAD
+
+ at rem ---- Cross compiler ----
+ at set LJCOMPILE="%SCE_ORBIS_SDK_DIR%\host_tools\bin\orbis-clang" -c -Wall -DLUAJIT_DISABLE_FFI %GC64%
+ at set LJLIB="%SCE_ORBIS_SDK_DIR%\host_tools\bin\orbis-ar" rcus
+ at set INCLUDE=""
+
+"%SCE_ORBIS_SDK_DIR%\host_tools\bin\orbis-as" -o lj_vm.o lj_vm.s
+
+ at if "%1" neq "debug" goto :NODEBUG
+ at shift
+ at set LJCOMPILE=%LJCOMPILE% -g -O0
+ at set TARGETLIB=libluajitD_ps4.a
+goto :BUILD
+:NODEBUG
+ at set LJCOMPILE=%LJCOMPILE% -O2
+ at set TARGETLIB=libluajit_ps4.a
+:BUILD
+del %TARGETLIB%
+ at if "%1" neq "noamalg" goto :AMALG
+for %%f in (lj_*.c lib_*.c) do (
+ %LJCOMPILE% %%f
+ @if errorlevel 1 goto :BAD
+)
+
+%LJLIB% %TARGETLIB% lj_*.o lib_*.o
+ at if errorlevel 1 goto :BAD
+ at goto :NOAMALG
+:AMALG
+%LJCOMPILE% ljamalg.c
+ at if errorlevel 1 goto :BAD
+%LJLIB% %TARGETLIB% ljamalg.o lj_vm.o
+ at if errorlevel 1 goto :BAD
+:NOAMALG
+
+ at del *.o *.obj *.manifest minilua.exe buildvm.exe
+ at echo.
+ at echo === Successfully built LuaJIT for PS4 ===
+
+ at goto :END
+:BAD
+ at echo.
+ at echo *******************************************************
+ at echo *** Build FAILED -- Please check the error messages ***
+ at echo *******************************************************
+ at goto :END
+:FAIL
+ at echo To run this script you must open a "Visual Studio .NET Command Prompt"
+ at echo (64 bit host compiler). The PS4 Orbis SDK must be installed, too.
+:END
Modified: trunk/Build/source/libs/luajit/LuaJIT-src/src/ps5build.bat
===================================================================
--- trunk/Build/source/libs/luajit/LuaJIT-src/src/ps5build.bat 2025-02-03 00:52:36 UTC (rev 73708)
+++ trunk/Build/source/libs/luajit/LuaJIT-src/src/ps5build.bat 2025-02-03 10:00:57 UTC (rev 73709)
@@ -1,126 +1,126 @@
- at rem Script to build LuaJIT with the PS5 SDK.
- at rem Donated to the public domain.
- at rem
- at rem Open a "Visual Studio .NET Command Prompt" (64 bit host compiler)
- at rem or "VS20xx x64 Native Tools Command Prompt".
- at rem
- at rem Then cd to this directory and run this script.
- at rem
- at rem Recommended invocation:
- at rem
- at rem ps5build release build, amalgamated, 64-bit GC
- at rem ps5build debug debug build, amalgamated, 64-bit GC
- at rem
- at rem Additional command-line options (not generally recommended):
- at rem
- at rem gc32 (before debug) 32-bit GC
- at rem noamalg (after debug) non-amalgamated build
-
- at if not defined INCLUDE goto :FAIL
- at if not defined SCE_PROSPERO_SDK_DIR goto :FAIL
-
- at setlocal
- at rem ---- Host compiler ----
- at set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
- at set LJLINK=link /nologo
- at set LJMT=mt /nologo
- at set DASMDIR=..\dynasm
- at set DASM=%DASMDIR%\dynasm.lua
- at set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
- at set GC64=
- at set DASC=vm_x64.dasc
-
- at if "%1" neq "gc32" goto :NOGC32
- at shift
- at set GC64=-DLUAJIT_DISABLE_GC64
- at set DASC=vm_x86.dasc
-:NOGC32
-
-%LJCOMPILE% host\minilua.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /out:minilua.exe minilua.obj
- at if errorlevel 1 goto :BAD
-if exist minilua.exe.manifest^
- %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
-
- at rem Check for 64 bit host compiler.
- at minilua
- at if not errorlevel 8 goto :FAIL
-
- at set DASMFLAGS=-D P64 -D NO_UNWIND
-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
- at if errorlevel 1 goto :BAD
-
-if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
-minilua host\genversion.lua
-
-%LJCOMPILE% /I "." /I %DASMDIR% %GC64% -DLUAJIT_TARGET=LUAJIT_ARCH_X64 -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_NO_UNWIND host\buildvm*.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /out:buildvm.exe buildvm*.obj
- at if errorlevel 1 goto :BAD
-if exist buildvm.exe.manifest^
- %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
-
-buildvm -m elfasm -o lj_vm.s
- at if errorlevel 1 goto :BAD
-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
- at if errorlevel 1 goto :BAD
-
- at rem ---- Cross compiler ----
- at set LJCOMPILE="%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-clang" -c -Wall -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC %GC64%
- at set LJLIB="%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-llvm-ar" rcus
- at set INCLUDE=""
-
-"%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-clang" -c -o lj_vm.o lj_vm.s
-
- at if "%1" neq "debug" goto :NODEBUG
- at shift
- at set LJCOMPILE=%LJCOMPILE% -g -O0
- at set TARGETLIB=libluajitD_ps5.a
-goto :BUILD
-:NODEBUG
- at set LJCOMPILE=%LJCOMPILE% -O2
- at set TARGETLIB=libluajit_ps5.a
-:BUILD
-del %TARGETLIB%
- at if "%1" neq "noamalg" goto :AMALG
-for %%f in (lj_*.c lib_*.c) do (
- %LJCOMPILE% %%f
- @if errorlevel 1 goto :BAD
-)
-
-%LJLIB% %TARGETLIB% lj_*.o lib_*.o
- at if errorlevel 1 goto :BAD
- at goto :NOAMALG
-:AMALG
-%LJCOMPILE% ljamalg.c
- at if errorlevel 1 goto :BAD
-%LJLIB% %TARGETLIB% ljamalg.o lj_vm.o
- at if errorlevel 1 goto :BAD
-:NOAMALG
-
- at del *.o *.obj *.manifest minilua.exe buildvm.exe
- at echo.
- at echo === Successfully built LuaJIT for PS5 ===
-
- at goto :END
-:BAD
- at echo.
- at echo *******************************************************
- at echo *** Build FAILED -- Please check the error messages ***
- at echo *******************************************************
- at goto :END
-:FAIL
- at echo To run this script you must open a "Visual Studio .NET Command Prompt"
- at echo (64 bit host compiler). The PS5 Prospero SDK must be installed, too.
-:END
+ at rem Script to build LuaJIT with the PS5 SDK.
+ at rem Donated to the public domain.
+ at rem
+ at rem Open a "Visual Studio .NET Command Prompt" (64 bit host compiler)
+ at rem or "VS20xx x64 Native Tools Command Prompt".
+ at rem
+ at rem Then cd to this directory and run this script.
+ at rem
+ at rem Recommended invocation:
+ at rem
+ at rem ps5build release build, amalgamated, 64-bit GC
+ at rem ps5build debug debug build, amalgamated, 64-bit GC
+ at rem
+ at rem Additional command-line options (not generally recommended):
+ at rem
+ at rem gc32 (before debug) 32-bit GC
+ at rem noamalg (after debug) non-amalgamated build
+
+ at if not defined INCLUDE goto :FAIL
+ at if not defined SCE_PROSPERO_SDK_DIR goto :FAIL
+
+ at setlocal
+ at rem ---- Host compiler ----
+ at set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
+ at set LJLINK=link /nologo
+ at set LJMT=mt /nologo
+ at set DASMDIR=..\dynasm
+ at set DASM=%DASMDIR%\dynasm.lua
+ at set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
+ at set GC64=
+ at set DASC=vm_x64.dasc
+
+ at if "%1" neq "gc32" goto :NOGC32
+ at shift
+ at set GC64=-DLUAJIT_DISABLE_GC64
+ at set DASC=vm_x86.dasc
+:NOGC32
+
+%LJCOMPILE% host\minilua.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+ at if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+ %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+
+ at rem Check for 64 bit host compiler.
+ at minilua
+ at if not errorlevel 8 goto :FAIL
+
+ at set DASMFLAGS=-D P64 -D NO_UNWIND
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
+ at if errorlevel 1 goto :BAD
+
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
+minilua host\genversion.lua
+
+%LJCOMPILE% /I "." /I %DASMDIR% %GC64% -DLUAJIT_TARGET=LUAJIT_ARCH_X64 -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_NO_UNWIND host\buildvm*.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+ at if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+ %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+
+buildvm -m elfasm -o lj_vm.s
+ at if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+ at if errorlevel 1 goto :BAD
+
+ at rem ---- Cross compiler ----
+ at set LJCOMPILE="%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-clang" -c -Wall -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC %GC64%
+ at set LJLIB="%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-llvm-ar" rcus
+ at set INCLUDE=""
+
+"%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-clang" -c -o lj_vm.o lj_vm.s
+
+ at if "%1" neq "debug" goto :NODEBUG
+ at shift
+ at set LJCOMPILE=%LJCOMPILE% -g -O0
+ at set TARGETLIB=libluajitD_ps5.a
+goto :BUILD
+:NODEBUG
+ at set LJCOMPILE=%LJCOMPILE% -O2
+ at set TARGETLIB=libluajit_ps5.a
+:BUILD
+del %TARGETLIB%
+ at if "%1" neq "noamalg" goto :AMALG
+for %%f in (lj_*.c lib_*.c) do (
+ %LJCOMPILE% %%f
+ @if errorlevel 1 goto :BAD
+)
+
+%LJLIB% %TARGETLIB% lj_*.o lib_*.o
+ at if errorlevel 1 goto :BAD
+ at goto :NOAMALG
+:AMALG
+%LJCOMPILE% ljamalg.c
+ at if errorlevel 1 goto :BAD
+%LJLIB% %TARGETLIB% ljamalg.o lj_vm.o
+ at if errorlevel 1 goto :BAD
+:NOAMALG
+
+ at del *.o *.obj *.manifest minilua.exe buildvm.exe
+ at echo.
+ at echo === Successfully built LuaJIT for PS5 ===
+
+ at goto :END
+:BAD
+ at echo.
+ at echo *******************************************************
+ at echo *** Build FAILED -- Please check the error messages ***
+ at echo *******************************************************
+ at goto :END
+:FAIL
+ at echo To run this script you must open a "Visual Studio .NET Command Prompt"
+ at echo (64 bit host compiler). The PS5 Prospero SDK must be installed, too.
+:END
Modified: trunk/Build/source/libs/luajit/LuaJIT-src/src/psvitabuild.bat
===================================================================
--- trunk/Build/source/libs/luajit/LuaJIT-src/src/psvitabuild.bat 2025-02-03 00:52:36 UTC (rev 73708)
+++ trunk/Build/source/libs/luajit/LuaJIT-src/src/psvitabuild.bat 2025-02-03 10:00:57 UTC (rev 73709)
@@ -1,96 +1,96 @@
- at rem Script to build LuaJIT with the PS Vita SDK.
- at rem Donated to the public domain.
- at rem
- at rem Open a "Visual Studio .NET Command Prompt" (32 bit host compiler)
- at rem Then cd to this directory and run this script.
-
- at if not defined INCLUDE goto :FAIL
- at if not defined SCE_PSP2_SDK_DIR goto :FAIL
-
- at setlocal
- at rem ---- Host compiler ----
- at set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
- at set LJLINK=link /nologo
- at set LJMT=mt /nologo
- at set DASMDIR=..\dynasm
- at set DASM=%DASMDIR%\dynasm.lua
- at set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
-
-%LJCOMPILE% host\minilua.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /out:minilua.exe minilua.obj
- at if errorlevel 1 goto :BAD
-if exist minilua.exe.manifest^
- %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
-
- at rem Check for 32 bit host compiler.
- at minilua
- at if errorlevel 8 goto :FAIL
-
- at set DASMFLAGS=-D FPU -D HFABI
-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_arm.dasc
- at if errorlevel 1 goto :BAD
-
-if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
-minilua host\genversion.lua
-
-%LJCOMPILE% /I "." /I %DASMDIR% -DLUAJIT_TARGET=LUAJIT_ARCH_ARM -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLJ_TARGET_PSVITA=1 host\buildvm*.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /out:buildvm.exe buildvm*.obj
- at if errorlevel 1 goto :BAD
-if exist buildvm.exe.manifest^
- %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
-
-buildvm -m elfasm -o lj_vm.s
- at if errorlevel 1 goto :BAD
-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
- at if errorlevel 1 goto :BAD
-
- at rem ---- Cross compiler ----
- at set LJCOMPILE="%SCE_PSP2_SDK_DIR%\host_tools\build\bin\psp2snc" -c -w -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC
- at set LJLIB="%SCE_PSP2_SDK_DIR%\host_tools\build\bin\psp2ld32" -r --output=
- at set INCLUDE=""
-
-"%SCE_PSP2_SDK_DIR%\host_tools\build\bin\psp2as" -o lj_vm.o lj_vm.s
-
- at if "%1" neq "debug" goto :NODEBUG
- at shift
- at set LJCOMPILE=%LJCOMPILE% -g -O0
- at set TARGETLIB=libluajitD.a
-goto :BUILD
-:NODEBUG
- at set LJCOMPILE=%LJCOMPILE% -O2
- at set TARGETLIB=libluajit.a
-:BUILD
-del %TARGETLIB%
-
-%LJCOMPILE% ljamalg.c
- at if errorlevel 1 goto :BAD
-%LJLIB%%TARGETLIB% ljamalg.o lj_vm.o
- at if errorlevel 1 goto :BAD
-
- at del *.o *.obj *.manifest minilua.exe buildvm.exe
- at echo.
- at echo === Successfully built LuaJIT for PS Vita ===
-
- at goto :END
-:BAD
- at echo.
- at echo *******************************************************
- at echo *** Build FAILED -- Please check the error messages ***
- at echo *******************************************************
- at goto :END
-:FAIL
- at echo To run this script you must open a "Visual Studio .NET Command Prompt"
- at echo (32 bit host compiler). The PS Vita SDK must be installed, too.
-:END
+ at rem Script to build LuaJIT with the PS Vita SDK.
+ at rem Donated to the public domain.
+ at rem
+ at rem Open a "Visual Studio .NET Command Prompt" (32 bit host compiler)
+ at rem Then cd to this directory and run this script.
+
+ at if not defined INCLUDE goto :FAIL
+ at if not defined SCE_PSP2_SDK_DIR goto :FAIL
+
+ at setlocal
+ at rem ---- Host compiler ----
+ at set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
+ at set LJLINK=link /nologo
+ at set LJMT=mt /nologo
+ at set DASMDIR=..\dynasm
+ at set DASM=%DASMDIR%\dynasm.lua
+ at set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
+
+%LJCOMPILE% host\minilua.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+ at if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+ %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+
+ at rem Check for 32 bit host compiler.
+ at minilua
+ at if errorlevel 8 goto :FAIL
+
+ at set DASMFLAGS=-D FPU -D HFABI
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_arm.dasc
+ at if errorlevel 1 goto :BAD
+
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
+minilua host\genversion.lua
+
+%LJCOMPILE% /I "." /I %DASMDIR% -DLUAJIT_TARGET=LUAJIT_ARCH_ARM -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLJ_TARGET_PSVITA=1 host\buildvm*.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+ at if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+ %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+
+buildvm -m elfasm -o lj_vm.s
+ at if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+ at if errorlevel 1 goto :BAD
+
+ at rem ---- Cross compiler ----
+ at set LJCOMPILE="%SCE_PSP2_SDK_DIR%\host_tools\build\bin\psp2snc" -c -w -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC
+ at set LJLIB="%SCE_PSP2_SDK_DIR%\host_tools\build\bin\psp2ld32" -r --output=
+ at set INCLUDE=""
+
+"%SCE_PSP2_SDK_DIR%\host_tools\build\bin\psp2as" -o lj_vm.o lj_vm.s
+
+ at if "%1" neq "debug" goto :NODEBUG
+ at shift
+ at set LJCOMPILE=%LJCOMPILE% -g -O0
+ at set TARGETLIB=libluajitD.a
+goto :BUILD
+:NODEBUG
+ at set LJCOMPILE=%LJCOMPILE% -O2
+ at set TARGETLIB=libluajit.a
+:BUILD
+del %TARGETLIB%
+
+%LJCOMPILE% ljamalg.c
+ at if errorlevel 1 goto :BAD
+%LJLIB%%TARGETLIB% ljamalg.o lj_vm.o
+ at if errorlevel 1 goto :BAD
+
+ at del *.o *.obj *.manifest minilua.exe buildvm.exe
+ at echo.
+ at echo === Successfully built LuaJIT for PS Vita ===
+
+ at goto :END
+:BAD
+ at echo.
+ at echo *******************************************************
+ at echo *** Build FAILED -- Please check the error messages ***
+ at echo *******************************************************
+ at goto :END
+:FAIL
+ at echo To run this script you must open a "Visual Studio .NET Command Prompt"
+ at echo (32 bit host compiler). The PS Vita SDK must be installed, too.
+:END
Modified: trunk/Build/source/libs/luajit/LuaJIT-src/src/xb1build.bat
===================================================================
--- trunk/Build/source/libs/luajit/LuaJIT-src/src/xb1build.bat 2025-02-03 00:52:36 UTC (rev 73708)
+++ trunk/Build/source/libs/luajit/LuaJIT-src/src/xb1build.bat 2025-02-03 10:00:57 UTC (rev 73709)
@@ -1,104 +1,104 @@
- at rem Script to build LuaJIT with the Xbox One SDK.
- at rem Donated to the public domain.
- at rem
- at rem Open a "Visual Studio .NET Command Prompt" (64 bit host compiler)
- at rem Then cd to this directory and run this script.
-
- at if not defined INCLUDE goto :FAIL
- at if not defined DurangoXDK goto :FAIL
-
- at setlocal
- at echo ---- Host compiler ----
- at set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
- at set LJLINK=link /nologo
- at set LJMT=mt /nologo
- at set DASMDIR=..\dynasm
- at set DASM=%DASMDIR%\dynasm.lua
- at set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
-
-%LJCOMPILE% host\minilua.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /out:minilua.exe minilua.obj
- at if errorlevel 1 goto :BAD
-if exist minilua.exe.manifest^
- %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
-
- at rem Error out for 64 bit host compiler
- at minilua
- at if not errorlevel 8 goto :FAIL
-
- at set DASMFLAGS=-D WIN -D FFI -D P64
-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x64.dasc
- at if errorlevel 1 goto :BAD
-
-if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
-minilua host\genversion.lua
-
-%LJCOMPILE% /I "." /I %DASMDIR% /D_DURANGO host\buildvm*.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /out:buildvm.exe buildvm*.obj
- at if errorlevel 1 goto :BAD
-if exist buildvm.exe.manifest^
- %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
-
-buildvm -m peobj -o lj_vm.obj
- at if errorlevel 1 goto :BAD
-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
- at if errorlevel 1 goto :BAD
-
- at echo ---- Cross compiler ----
-
- at set CWD=%cd%
- at call "%DurangoXDK%\xdk\DurangoVars.cmd" XDK
- at cd /D "%CWD%"
- at shift
-
- at set LJCOMPILE="cl" /nologo /c /W3 /GF /Gm- /GR- /GS- /Gy /openmp- /D_CRT_SECURE_NO_DEPRECATE /D_LIB /D_UNICODE /D_DURANGO
- at set LJLIB="lib" /nologo
-
- at if "%1"=="debug" (
- @shift
- @set LJCOMPILE=%LJCOMPILE% /Zi /MDd /Od
- @set LJLINK=%LJLINK% /debug
-) else (
- @set LJCOMPILE=%LJCOMPILE% /MD /O2 /DNDEBUG
-)
-
- at if "%1"=="amalg" goto :AMALG
-%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
- at if errorlevel 1 goto :BAD
-%LJLIB% /OUT:luajit.lib lj_*.obj lib_*.obj
- at if errorlevel 1 goto :BAD
- at goto :NOAMALG
-:AMALG
-%LJCOMPILE% /DLUA_BUILD_AS_DLL ljamalg.c
- at if errorlevel 1 goto :BAD
-%LJLIB% /OUT:luajit.lib ljamalg.obj lj_vm.obj
- at if errorlevel 1 goto :BAD
-:NOAMALG
-
- at del *.obj *.manifest minilua.exe buildvm.exe
- at echo.
- at echo === Successfully built LuaJIT for Xbox One ===
-
- at goto :END
-:BAD
- at echo.
- at echo *******************************************************
- at echo *** Build FAILED -- Please check the error messages ***
- at echo *******************************************************
- at goto :END
-:FAIL
- at echo To run this script you must open a "Visual Studio .NET Command Prompt"
- at echo (64 bit host compiler). The Xbox One SDK must be installed, too.
-:END
+ at rem Script to build LuaJIT with the Xbox One SDK.
+ at rem Donated to the public domain.
+ at rem
+ at rem Open a "Visual Studio .NET Command Prompt" (64 bit host compiler)
+ at rem Then cd to this directory and run this script.
+
+ at if not defined INCLUDE goto :FAIL
+ at if not defined DurangoXDK goto :FAIL
+
+ at setlocal
+ at echo ---- Host compiler ----
+ at set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
+ at set LJLINK=link /nologo
+ at set LJMT=mt /nologo
+ at set DASMDIR=..\dynasm
+ at set DASM=%DASMDIR%\dynasm.lua
+ at set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
+
+%LJCOMPILE% host\minilua.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+ at if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+ %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+
+ at rem Error out for 64 bit host compiler
+ at minilua
+ at if not errorlevel 8 goto :FAIL
+
+ at set DASMFLAGS=-D WIN -D FFI -D P64
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x64.dasc
+ at if errorlevel 1 goto :BAD
+
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
+minilua host\genversion.lua
+
+%LJCOMPILE% /I "." /I %DASMDIR% /D_DURANGO host\buildvm*.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+ at if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+ %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+
+buildvm -m peobj -o lj_vm.obj
+ at if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+ at if errorlevel 1 goto :BAD
+
+ at echo ---- Cross compiler ----
+
+ at set CWD=%cd%
+ at call "%DurangoXDK%\xdk\DurangoVars.cmd" XDK
+ at cd /D "%CWD%"
+ at shift
+
+ at set LJCOMPILE="cl" /nologo /c /W3 /GF /Gm- /GR- /GS- /Gy /openmp- /D_CRT_SECURE_NO_DEPRECATE /D_LIB /D_UNICODE /D_DURANGO
+ at set LJLIB="lib" /nologo
+
+ at if "%1"=="debug" (
+ @shift
+ @set LJCOMPILE=%LJCOMPILE% /Zi /MDd /Od
+ @set LJLINK=%LJLINK% /debug
+) else (
+ @set LJCOMPILE=%LJCOMPILE% /MD /O2 /DNDEBUG
+)
+
+ at if "%1"=="amalg" goto :AMALG
+%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
+ at if errorlevel 1 goto :BAD
+%LJLIB% /OUT:luajit.lib lj_*.obj lib_*.obj
+ at if errorlevel 1 goto :BAD
+ at goto :NOAMALG
+:AMALG
+%LJCOMPILE% /DLUA_BUILD_AS_DLL ljamalg.c
+ at if errorlevel 1 goto :BAD
+%LJLIB% /OUT:luajit.lib ljamalg.obj lj_vm.obj
+ at if errorlevel 1 goto :BAD
+:NOAMALG
+
+ at del *.obj *.manifest minilua.exe buildvm.exe
+ at echo.
+ at echo === Successfully built LuaJIT for Xbox One ===
+
+ at goto :END
+:BAD
+ at echo.
+ at echo *******************************************************
+ at echo *** Build FAILED -- Please check the error messages ***
+ at echo *******************************************************
+ at goto :END
+:FAIL
+ at echo To run this script you must open a "Visual Studio .NET Command Prompt"
+ at echo (64 bit host compiler). The Xbox One SDK must be installed, too.
+:END
Modified: trunk/Build/source/libs/luajit/LuaJIT-src/src/xedkbuild.bat
===================================================================
--- trunk/Build/source/libs/luajit/LuaJIT-src/src/xedkbuild.bat 2025-02-03 00:52:36 UTC (rev 73708)
+++ trunk/Build/source/libs/luajit/LuaJIT-src/src/xedkbuild.bat 2025-02-03 10:00:57 UTC (rev 73709)
@@ -1,95 +1,95 @@
- at rem Script to build LuaJIT with the Xbox 360 SDK.
- at rem Donated to the public domain.
- at rem
- at rem Open a "Visual Studio .NET Command Prompt" (32 bit host compiler)
- at rem Then cd to this directory and run this script.
-
- at if not defined INCLUDE goto :FAIL
- at if not defined XEDK goto :FAIL
-
- at setlocal
- at rem ---- Host compiler ----
- at set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
- at set LJLINK=link /nologo
- at set LJMT=mt /nologo
- at set DASMDIR=..\dynasm
- at set DASM=%DASMDIR%\dynasm.lua
- at set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
-
-%LJCOMPILE% host\minilua.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /out:minilua.exe minilua.obj
- at if errorlevel 1 goto :BAD
-if exist minilua.exe.manifest^
- %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
-
- at rem Error out for 64 bit host compiler
- at minilua
- at if errorlevel 8 goto :FAIL
-
- at set DASMFLAGS=-D GPR64 -D FRAME32 -D PPE -D SQRT -D DUALNUM
-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_ppc.dasc
- at if errorlevel 1 goto :BAD
-
-if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
-minilua host\genversion.lua
-
-%LJCOMPILE% /I "." /I %DASMDIR% /D_XBOX_VER=200 /DLUAJIT_TARGET=LUAJIT_ARCH_PPC host\buildvm*.c
- at if errorlevel 1 goto :BAD
-%LJLINK% /out:buildvm.exe buildvm*.obj
- at if errorlevel 1 goto :BAD
-if exist buildvm.exe.manifest^
- %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
-
-buildvm -m peobj -o lj_vm.obj
- at if errorlevel 1 goto :BAD
-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
- at if errorlevel 1 goto :BAD
-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
- at if errorlevel 1 goto :BAD
-
- at rem ---- Cross compiler ----
- at set LJCOMPILE="%XEDK%\bin\win32\cl" /nologo /c /MT /O2 /W3 /GF /Gm- /GR- /GS- /Gy /openmp- /D_CRT_SECURE_NO_DEPRECATE /DNDEBUG /D_XBOX /D_LIB /DLUAJIT_USE_SYSMALLOC
- at set LJLIB="%XEDK%\bin\win32\lib" /nologo
- at set "INCLUDE=%XEDK%\include\xbox"
-
- at if "%1" neq "debug" goto :NODEBUG
- at shift
- at set "LJCOMPILE=%LJCOMPILE% /Zi"
-:NODEBUG
- at if "%1"=="amalg" goto :AMALG
-%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
- at if errorlevel 1 goto :BAD
-%LJLIB% /OUT:luajit20.lib lj_*.obj lib_*.obj
- at if errorlevel 1 goto :BAD
- at goto :NOAMALG
-:AMALG
-%LJCOMPILE% /DLUA_BUILD_AS_DLL ljamalg.c
- at if errorlevel 1 goto :BAD
-%LJLIB% /OUT:luajit20.lib ljamalg.obj lj_vm.obj
- at if errorlevel 1 goto :BAD
-:NOAMALG
-
- at del *.obj *.manifest minilua.exe buildvm.exe
- at echo.
- at echo === Successfully built LuaJIT for Xbox 360 ===
-
- at goto :END
-:BAD
- at echo.
- at echo *******************************************************
- at echo *** Build FAILED -- Please check the error messages ***
- at echo *******************************************************
- at goto :END
-:FAIL
- at echo To run this script you must open a "Visual Studio .NET Command Prompt"
- at echo (32 bit host compiler). The Xbox 360 SDK must be installed, too.
-:END
+ at rem Script to build LuaJIT with the Xbox 360 SDK.
+ at rem Donated to the public domain.
+ at rem
+ at rem Open a "Visual Studio .NET Command Prompt" (32 bit host compiler)
+ at rem Then cd to this directory and run this script.
+
+ at if not defined INCLUDE goto :FAIL
+ at if not defined XEDK goto :FAIL
+
+ at setlocal
+ at rem ---- Host compiler ----
+ at set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
+ at set LJLINK=link /nologo
+ at set LJMT=mt /nologo
+ at set DASMDIR=..\dynasm
+ at set DASM=%DASMDIR%\dynasm.lua
+ at set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
+
+%LJCOMPILE% host\minilua.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+ at if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+ %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+
+ at rem Error out for 64 bit host compiler
+ at minilua
+ at if errorlevel 8 goto :FAIL
+
+ at set DASMFLAGS=-D GPR64 -D FRAME32 -D PPE -D SQRT -D DUALNUM
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_ppc.dasc
+ at if errorlevel 1 goto :BAD
+
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
+minilua host\genversion.lua
+
+%LJCOMPILE% /I "." /I %DASMDIR% /D_XBOX_VER=200 /DLUAJIT_TARGET=LUAJIT_ARCH_PPC host\buildvm*.c
+ at if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+ at if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+ %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+
+buildvm -m peobj -o lj_vm.obj
+ at if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+ at if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+ at if errorlevel 1 goto :BAD
+
+ at rem ---- Cross compiler ----
+ at set LJCOMPILE="%XEDK%\bin\win32\cl" /nologo /c /MT /O2 /W3 /GF /Gm- /GR- /GS- /Gy /openmp- /D_CRT_SECURE_NO_DEPRECATE /DNDEBUG /D_XBOX /D_LIB /DLUAJIT_USE_SYSMALLOC
+ at set LJLIB="%XEDK%\bin\win32\lib" /nologo
+ at set "INCLUDE=%XEDK%\include\xbox"
+
+ at if "%1" neq "debug" goto :NODEBUG
+ at shift
+ at set "LJCOMPILE=%LJCOMPILE% /Zi"
+:NODEBUG
+ at if "%1"=="amalg" goto :AMALG
+%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
+ at if errorlevel 1 goto :BAD
+%LJLIB% /OUT:luajit20.lib lj_*.obj lib_*.obj
+ at if errorlevel 1 goto :BAD
+ at goto :NOAMALG
+:AMALG
+%LJCOMPILE% /DLUA_BUILD_AS_DLL ljamalg.c
+ at if errorlevel 1 goto :BAD
+%LJLIB% /OUT:luajit20.lib ljamalg.obj lj_vm.obj
+ at if errorlevel 1 goto :BAD
+:NOAMALG
+
+ at del *.obj *.manifest minilua.exe buildvm.exe
+ at echo.
+ at echo === Successfully built LuaJIT for Xbox 360 ===
+
+ at goto :END
+:BAD
+ at echo.
+ at echo *******************************************************
+ at echo *** Build FAILED -- Please check the error messages ***
+ at echo *******************************************************
+ at goto :END
+:FAIL
+ at echo To run this script you must open a "Visual Studio .NET Command Prompt"
+ at echo (32 bit host compiler). The Xbox 360 SDK must be installed, too.
+:END
More information about the tex-live-commits
mailing list.