DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: Fix lua52compat option for msvcbuild.bat.

Browse Source 
Thanks to Alex Orlenko. #1395 #1366
This commit is contained in:
Mike Pall
2025-10-28 04:59:18 +01:00
parent 8651ef6df4
commit 864e78d66c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/msvcbuild.bat
View File

@@ -6,8 +6,8 @@
@rem options (in order), if needed. The default is a dynamic release build. @rem options (in order), if needed. The default is a dynamic release build.
@rem @rem
@rem nogc64 disable LJ_GC64 mode for x64 @rem nogc64 disable LJ_GC64 mode for x64
@rem debug emit debug symbols
@rem lua52compat enable extra Lua 5.2 extensions @rem lua52compat enable extra Lua 5.2 extensions
@rem debug emit debug symbols
@rem amalg amalgamated build @rem amalg amalgamated build
@rem static create static lib to statically link into your project @rem static create static lib to statically link into your project
@rem mixed create static lib to build a DLL in your project @rem mixed create static lib to build a DLL in your project
@@ -19,7 +19,7 @@
@set DEBUGCFLAGS= @set DEBUGCFLAGS=
@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline @set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
@set LJDYNBUILD=/DLUA_BUILD_AS_DLL /MD @set LJDYNBUILD=/DLUA_BUILD_AS_DLL /MD
@set LJDYNBUILD_DEBUG=/DLUA_BUILD_AS_DLL /MDd @set LJDYNBUILD_DEBUG=/DLUA_BUILD_AS_DLL /MDd
@set LJCOMPILETARGET=/Zi @set LJCOMPILETARGET=/Zi
@set LJLINKTYPE=/DEBUG /RELEASE @set LJLINKTYPE=/DEBUG /RELEASE
@set LJLINKTYPE_DEBUG=/DEBUG @set LJLINKTYPE_DEBUG=/DEBUG
@@ -65,6 +65,10 @@ if exist minilua.exe.manifest^
@set DASC=vm_x86.dasc @set DASC=vm_x86.dasc
@set LJCOMPILE=%LJCOMPILE% /DLUAJIT_DISABLE_GC64 @set LJCOMPILE=%LJCOMPILE% /DLUAJIT_DISABLE_GC64
:DA :DA
@if "%1" neq "lua52compat" goto :NOLUA52COMPAT
@shift
@set LJCOMPILE=%LJCOMPILE% /DLUAJIT_ENABLE_LUA52COMPAT
:NOLUA52COMPAT
minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC% minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
@if errorlevel 1 goto :BAD @if errorlevel 1 goto :BAD
@@ -102,10 +106,6 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
@set LJDYNBUILD=%LJDYNBUILD_DEBUG% @set LJDYNBUILD=%LJDYNBUILD_DEBUG%
@set LJLINKTYPE=%LJLINKTYPE_DEBUG% @set LJLINKTYPE=%LJLINKTYPE_DEBUG%
:NODEBUG :NODEBUG
@if "%1" neq "lua52compat" goto :NOLUA52COMPAT
@shift
@set LJCOMPILE=%LJCOMPILE% /DLUAJIT_ENABLE_LUA52COMPAT
:NOLUA52COMPAT
@set LJCOMPILE=%LJCOMPILE% %LJCOMPILETARGET% @set LJCOMPILE=%LJCOMPILE% %LJCOMPILETARGET%
@set LJLINK=%LJLINK% %LJLINKTYPE% %LJLINKTARGET% @set LJLINK=%LJLINK% %LJLINKTYPE% %LJLINKTARGET%
@if "%1"=="amalg" goto :AMALGDLL @if "%1"=="amalg" goto :AMALGDLL