aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2023-08-21 13:09:52 +0200
committerMike Pall <mike>2023-08-21 13:09:52 +0200
commit54ef81f864e18729f6dafb6b1c9f9176fcb67bb5 (patch)
treeaacf9e196edc83e3ba4b5c76b32a2522a2ebba6d /src
parent3c290f817f0a80458201ae6b3cfd7e6d52de464c (diff)
parented21acd86354241a5d1365500336eb47c50ee253 (diff)
downloadluajit-54ef81f864e18729f6dafb6b1c9f9176fcb67bb5.tar.gz
luajit-54ef81f864e18729f6dafb6b1c9f9176fcb67bb5.tar.bz2
luajit-54ef81f864e18729f6dafb6b1c9f9176fcb67bb5.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
-rw-r--r--src/msvcbuild.bat2
-rw-r--r--src/nxbuild.bat2
-rw-r--r--src/ps4build.bat2
-rw-r--r--src/ps5build.bat2
-rw-r--r--src/psvitabuild.bat2
-rw-r--r--src/xb1build.bat2
-rw-r--r--src/xedkbuild.bat2
7 files changed, 7 insertions, 7 deletions
diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index 0ef021f1..44d9e48b 100644
--- a/src/msvcbuild.bat
+++ b/src/msvcbuild.bat
@@ -51,7 +51,7 @@ 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 54git show -s --format=%%ct >luajit_relver.txt
55minilua host\genversion.lua 55minilua host\genversion.lua
56 56
57%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c 57%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c
diff --git a/src/nxbuild.bat b/src/nxbuild.bat
index b925d7e5..ab36dd8b 100644
--- a/src/nxbuild.bat
+++ b/src/nxbuild.bat
@@ -73,7 +73,7 @@ if exist minilua.exe.manifest^
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 75
76git show -s --format=%ct >luajit_relver.txt 76git show -s --format=%%ct >luajit_relver.txt
77minilua host\genversion.lua 77minilua host\genversion.lua
78 78
79%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
diff --git a/src/ps4build.bat b/src/ps4build.bat
index 0bd86b1b..52a9e7d7 100644
--- a/src/ps4build.bat
+++ b/src/ps4build.bat
@@ -51,7 +51,7 @@ 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 54git show -s --format=%%ct >luajit_relver.txt
55minilua host\genversion.lua 55minilua host\genversion.lua
56 56
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 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
diff --git a/src/ps5build.bat b/src/ps5build.bat
index 77357887..ec98a88a 100644
--- a/src/ps5build.bat
+++ b/src/ps5build.bat
@@ -51,7 +51,7 @@ 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 54git show -s --format=%%ct >luajit_relver.txt
55minilua host\genversion.lua 55minilua host\genversion.lua
56 56
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 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
diff --git a/src/psvitabuild.bat b/src/psvitabuild.bat
index 35441142..770dd80e 100644
--- a/src/psvitabuild.bat
+++ b/src/psvitabuild.bat
@@ -31,7 +31,7 @@ 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 34git show -s --format=%%ct >luajit_relver.txt
35minilua host\genversion.lua 35minilua host\genversion.lua
36 36
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 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
diff --git a/src/xb1build.bat b/src/xb1build.bat
index 32903a99..250138ad 100644
--- a/src/xb1build.bat
+++ b/src/xb1build.bat
@@ -31,7 +31,7 @@ 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 34git show -s --format=%%ct >luajit_relver.txt
35minilua host\genversion.lua 35minilua host\genversion.lua
36 36
37%LJCOMPILE% /I "." /I %DASMDIR% /D_DURANGO host\buildvm*.c 37%LJCOMPILE% /I "." /I %DASMDIR% /D_DURANGO host\buildvm*.c
diff --git a/src/xedkbuild.bat b/src/xedkbuild.bat
index 1a5d888e..b8fd0461 100644
--- a/src/xedkbuild.bat
+++ b/src/xedkbuild.bat
@@ -31,7 +31,7 @@ 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 34git show -s --format=%%ct >luajit_relver.txt
35minilua host\genversion.lua 35minilua host\genversion.lua
36 36
37%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
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 22:35:32 +0000