|
|
@@ -14,10 +14,10 @@
|
|
|
@if not defined INCLUDE goto :FAIL
|
|
|
|
|
|
@setlocal
|
|
|
-@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
|
|
|
+@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
|
|
|
@set LJLINK=link /nologo
|
|
|
@set LJMT=mt /nologo
|
|
|
-@set LJLIB=lib /nologo
|
|
|
+@set LJLIB=lib /nologo /nodefaultlib
|
|
|
@set DASMDIR=..\dynasm
|
|
|
@set DASM=%DASMDIR%\dynasm.lua
|
|
|
@set LJDLLNAME=lua51.dll
|
|
|
@@ -70,19 +70,19 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
|
|
|
:NODEBUG
|
|
|
@if "%1"=="amalg" goto :AMALGDLL
|
|
|
@if "%1"=="static" goto :STATIC
|
|
|
-%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
|
|
|
+%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
|
|
|
@if errorlevel 1 goto :BAD
|
|
|
%LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj
|
|
|
@if errorlevel 1 goto :BAD
|
|
|
@goto :MTDLL
|
|
|
:STATIC
|
|
|
-%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
|
|
|
+%LJCOMPILE% lj_*.c lib_*.c
|
|
|
@if errorlevel 1 goto :BAD
|
|
|
%LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj
|
|
|
@if errorlevel 1 goto :BAD
|
|
|
@goto :MTDLL
|
|
|
:AMALGDLL
|
|
|
-%LJCOMPILE% /DLUA_BUILD_AS_DLL ljamalg.c
|
|
|
+%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c
|
|
|
@if errorlevel 1 goto :BAD
|
|
|
%LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj
|
|
|
@if errorlevel 1 goto :BAD
|
Mike Pall