mirror of
https://github.com/LuaJIT/LuaJIT.git
synced 2025-02-07 15:14:08 +00:00
Merge branch 'master' into v2.1
This commit is contained in:
commit
e4168fae5b
@ -16,6 +16,7 @@
|
|||||||
@rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_APICHECK
|
@rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_APICHECK
|
||||||
@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=/MD /DLUA_BUILD_AS_DLL
|
||||||
@set LJLINK=link /nologo
|
@set LJLINK=link /nologo
|
||||||
@set LJMT=mt /nologo
|
@set LJMT=mt /nologo
|
||||||
@set LJLIB=lib /nologo /nodefaultlib
|
@set LJLIB=lib /nologo /nodefaultlib
|
||||||
@ -93,12 +94,13 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
|
|||||||
@shift
|
@shift
|
||||||
@set BUILDTYPE=debug
|
@set BUILDTYPE=debug
|
||||||
@set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS%
|
@set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS%
|
||||||
|
@set LJDYNBUILD=/MDd /DLUA_BUILD_AS_DLL
|
||||||
@set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no
|
@set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no
|
||||||
:NODEBUG
|
:NODEBUG
|
||||||
@set LJLINK=%LJLINK% /%BUILDTYPE%
|
@set LJLINK=%LJLINK% /%BUILDTYPE%
|
||||||
@if "%1"=="amalg" goto :AMALGDLL
|
@if "%1"=="amalg" goto :AMALGDLL
|
||||||
@if "%1"=="static" goto :STATIC
|
@if "%1"=="static" goto :STATIC
|
||||||
%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
|
%LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c
|
||||||
@if errorlevel 1 goto :BAD
|
@if errorlevel 1 goto :BAD
|
||||||
%LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj
|
%LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj
|
||||||
@if errorlevel 1 goto :BAD
|
@if errorlevel 1 goto :BAD
|
||||||
@ -110,7 +112,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
|
|||||||
@if errorlevel 1 goto :BAD
|
@if errorlevel 1 goto :BAD
|
||||||
@goto :MTDLL
|
@goto :MTDLL
|
||||||
:AMALGDLL
|
:AMALGDLL
|
||||||
%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c
|
%LJCOMPILE% %LJDYNBUILD% ljamalg.c
|
||||||
@if errorlevel 1 goto :BAD
|
@if errorlevel 1 goto :BAD
|
||||||
%LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj
|
%LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj
|
||||||
@if errorlevel 1 goto :BAD
|
@if errorlevel 1 goto :BAD
|
||||||
|
Loading…
Reference in New Issue
Block a user