Browse Source

Merge branch 'master' into v2.1

Mike Pall 2 years ago
parent
commit
54ef81f864
7 changed files with 7 additions and 7 deletions
  1. 1 1
      src/msvcbuild.bat
  2. 1 1
      src/nxbuild.bat
  3. 1 1
      src/ps4build.bat
  4. 1 1
      src/ps5build.bat
  5. 1 1
      src/psvitabuild.bat
  6. 1 1
      src/xb1build.bat
  7. 1 1
      src/xedkbuild.bat

+ 1 - 1
src/msvcbuild.bat

@@ -51,7 +51,7 @@ if exist minilua.exe.manifest^
 minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
 @if errorlevel 1 goto :BAD
 
-git show -s --format=%ct >luajit_relver.txt
+git show -s --format=%%ct >luajit_relver.txt
 minilua host\genversion.lua
 
 %LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c

+ 1 - 1
src/nxbuild.bat

@@ -73,7 +73,7 @@ if exist minilua.exe.manifest^
 minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
 @if errorlevel 1 goto :BAD
 
-git show -s --format=%ct >luajit_relver.txt
+git show -s --format=%%ct >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

+ 1 - 1
src/ps4build.bat

@@ -51,7 +51,7 @@ if exist minilua.exe.manifest^
 minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
 @if errorlevel 1 goto :BAD
 
-git show -s --format=%ct >luajit_relver.txt
+git show -s --format=%%ct >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

+ 1 - 1
src/ps5build.bat

@@ -51,7 +51,7 @@ if exist minilua.exe.manifest^
 minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
 @if errorlevel 1 goto :BAD
 
-git show -s --format=%ct >luajit_relver.txt
+git show -s --format=%%ct >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

+ 1 - 1
src/psvitabuild.bat

@@ -31,7 +31,7 @@ if exist minilua.exe.manifest^
 minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_arm.dasc
 @if errorlevel 1 goto :BAD
 
-git show -s --format=%ct >luajit_relver.txt
+git show -s --format=%%ct >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

+ 1 - 1
src/xb1build.bat

@@ -31,7 +31,7 @@ if exist minilua.exe.manifest^
 minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x64.dasc
 @if errorlevel 1 goto :BAD
 
-git show -s --format=%ct >luajit_relver.txt
+git show -s --format=%%ct >luajit_relver.txt
 minilua host\genversion.lua
 
 %LJCOMPILE% /I "." /I %DASMDIR% /D_DURANGO host\buildvm*.c

+ 1 - 1
src/xedkbuild.bat

@@ -31,7 +31,7 @@ if exist minilua.exe.manifest^
 minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_ppc.dasc
 @if errorlevel 1 goto :BAD
 
-git show -s --format=%ct >luajit_relver.txt
+git show -s --format=%%ct >luajit_relver.txt
 minilua host\genversion.lua
 
 %LJCOMPILE% /I "." /I %DASMDIR% /D_XBOX_VER=200 /DLUAJIT_TARGET=LUAJIT_ARCH_PPC  host\buildvm*.c