aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2023-08-21 04:03:25 +0200
committerMike Pall <mike>2023-08-21 04:03:25 +0200
commit3c290f817f0a80458201ae6b3cfd7e6d52de464c (patch)
tree5a4c2bb7f582c1a5f117fea2ac741ecc98453d81 /src
parent2090842410e0ba6f81fad310a77bf5432488249a (diff)
parent6351abc78f9dfe9c462ed6cc3fc0c512d2fad696 (diff)
downloadluajit-3c290f817f0a80458201ae6b3cfd7e6d52de464c.tar.gz
luajit-3c290f817f0a80458201ae6b3cfd7e6d52de464c.tar.bz2
luajit-3c290f817f0a80458201ae6b3cfd7e6d52de464c.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
-rw-r--r--src/msvcbuild.bat3
-rw-r--r--src/nxbuild.bat4
-rw-r--r--src/ps4build.bat4
-rw-r--r--src/ps5build.bat3
-rw-r--r--src/psvitabuild.bat3
-rw-r--r--src/xb1build.bat3
-rw-r--r--src/xedkbuild.bat3
7 files changed, 23 insertions, 0 deletions
diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index dfe98e16..0ef021f1 100644
--- a/src/msvcbuild.bat
+++ b/src/msvcbuild.bat
@@ -51,6 +51,9 @@ if exist minilua.exe.manifest^
51minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC% 51minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
52@if errorlevel 1 goto :BAD 52@if errorlevel 1 goto :BAD
53 53
54git show -s --format=%ct >luajit_relver.txt
55minilua host\genversion.lua
56
54%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c 57%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c
55@if errorlevel 1 goto :BAD 58@if errorlevel 1 goto :BAD
56%LJLINK% /out:buildvm.exe buildvm*.obj 59%LJLINK% /out:buildvm.exe buildvm*.obj
diff --git a/src/nxbuild.bat b/src/nxbuild.bat
index 5c7088ee..b925d7e5 100644
--- a/src/nxbuild.bat
+++ b/src/nxbuild.bat
@@ -72,6 +72,10 @@ if exist minilua.exe.manifest^
72@set DASMFLAGS=%DASMFLAGS% %DASMTARGET% -D LJ_TARGET_NX -D LUAJIT_OS=LUAJIT_OS_OTHER -D LUAJIT_DISABLE_JIT -D LUAJIT_DISABLE_FFI 72@set DASMFLAGS=%DASMFLAGS% %DASMTARGET% -D LJ_TARGET_NX -D LUAJIT_OS=LUAJIT_OS_OTHER -D LUAJIT_DISABLE_JIT -D LUAJIT_DISABLE_FFI
73minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC% 73minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
74@if errorlevel 1 goto :BAD 74@if errorlevel 1 goto :BAD
75
76git show -s --format=%ct >luajit_relver.txt
77minilua host\genversion.lua
78
75%LJCOMPILE% /I "." /I %DASMDIR% %DASMTARGET% -D LJ_TARGET_NX -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI host\buildvm*.c 79%LJCOMPILE% /I "." /I %DASMDIR% %DASMTARGET% -D LJ_TARGET_NX -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI host\buildvm*.c
76@if errorlevel 1 goto :BAD 80@if errorlevel 1 goto :BAD
77%LJLINK% /out:buildvm.exe buildvm*.obj 81%LJLINK% /out:buildvm.exe buildvm*.obj
diff --git a/src/ps4build.bat b/src/ps4build.bat
index 034e2c87..0bd86b1b 100644
--- a/src/ps4build.bat
+++ b/src/ps4build.bat
@@ -51,7 +51,11 @@ if exist minilua.exe.manifest^
51minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC% 51minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
52@if errorlevel 1 goto :BAD 52@if errorlevel 1 goto :BAD
53 53
54git show -s --format=%ct >luajit_relver.txt
55minilua host\genversion.lua
56
54%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 57%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
58
55@if errorlevel 1 goto :BAD 59@if errorlevel 1 goto :BAD
56%LJLINK% /out:buildvm.exe buildvm*.obj 60%LJLINK% /out:buildvm.exe buildvm*.obj
57@if errorlevel 1 goto :BAD 61@if errorlevel 1 goto :BAD
diff --git a/src/ps5build.bat b/src/ps5build.bat
index 56818c2e..77357887 100644
--- a/src/ps5build.bat
+++ b/src/ps5build.bat
@@ -51,6 +51,9 @@ if exist minilua.exe.manifest^
51minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC% 51minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
52@if errorlevel 1 goto :BAD 52@if errorlevel 1 goto :BAD
53 53
54git show -s --format=%ct >luajit_relver.txt
55minilua host\genversion.lua
56
54%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 57%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
55@if errorlevel 1 goto :BAD 58@if errorlevel 1 goto :BAD
56%LJLINK% /out:buildvm.exe buildvm*.obj 59%LJLINK% /out:buildvm.exe buildvm*.obj
diff --git a/src/psvitabuild.bat b/src/psvitabuild.bat
index 2980e157..35441142 100644
--- a/src/psvitabuild.bat
+++ b/src/psvitabuild.bat
@@ -31,6 +31,9 @@ if exist minilua.exe.manifest^
31minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_arm.dasc 31minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_arm.dasc
32@if errorlevel 1 goto :BAD 32@if errorlevel 1 goto :BAD
33 33
34git show -s --format=%ct >luajit_relver.txt
35minilua host\genversion.lua
36
34%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 37%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
35@if errorlevel 1 goto :BAD 38@if errorlevel 1 goto :BAD
36%LJLINK% /out:buildvm.exe buildvm*.obj 39%LJLINK% /out:buildvm.exe buildvm*.obj
diff --git a/src/xb1build.bat b/src/xb1build.bat
index 2eb68171..32903a99 100644
--- a/src/xb1build.bat
+++ b/src/xb1build.bat
@@ -31,6 +31,9 @@ if exist minilua.exe.manifest^
31minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x64.dasc 31minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x64.dasc
32@if errorlevel 1 goto :BAD 32@if errorlevel 1 goto :BAD
33 33
34git show -s --format=%ct >luajit_relver.txt
35minilua host\genversion.lua
36
34%LJCOMPILE% /I "." /I %DASMDIR% /D_DURANGO host\buildvm*.c 37%LJCOMPILE% /I "." /I %DASMDIR% /D_DURANGO host\buildvm*.c
35@if errorlevel 1 goto :BAD 38@if errorlevel 1 goto :BAD
36%LJLINK% /out:buildvm.exe buildvm*.obj 39%LJLINK% /out:buildvm.exe buildvm*.obj
diff --git a/src/xedkbuild.bat b/src/xedkbuild.bat
index 37322d03..1a5d888e 100644
--- a/src/xedkbuild.bat
+++ b/src/xedkbuild.bat
@@ -31,6 +31,9 @@ if exist minilua.exe.manifest^
31minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_ppc.dasc 31minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_ppc.dasc
32@if errorlevel 1 goto :BAD 32@if errorlevel 1 goto :BAD
33 33
34git show -s --format=%ct >luajit_relver.txt
35minilua host\genversion.lua
36
34%LJCOMPILE% /I "." /I %DASMDIR% /D_XBOX_VER=200 /DLUAJIT_TARGET=LUAJIT_ARCH_PPC host\buildvm*.c 37%LJCOMPILE% /I "." /I %DASMDIR% /D_XBOX_VER=200 /DLUAJIT_TARGET=LUAJIT_ARCH_PPC host\buildvm*.c
35@if errorlevel 1 goto :BAD 38@if errorlevel 1 goto :BAD
36%LJLINK% /out:buildvm.exe buildvm*.obj 39%LJLINK% /out:buildvm.exe buildvm*.obj
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-16 23:29:05 +0000