Windows: Allow amalgamated static builds with msvcbuild.bat.

Reported by Naman Dixit. #1289

diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index 13b8175ad15e0bf07925babc06e23b9bfe1fa77d..5b493ba57a5cad1667936d419739c624b20487b7 100644 (file)
--- a/src/msvcbuild.bat
+++ b/src/msvcbuild.bat
@@ -106,7 +106,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
 @if "%1"=="static" goto :STATIC\r
 %LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c\r
 @if errorlevel 1 goto :BAD\r
-%LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj\r
+%LJLINK% /DLL /OUT:%LJDLLNAME% lj_*.obj lib_*.obj\r
 @if errorlevel 1 goto :BAD\r
 @goto :MTDLL\r
 :STATIC\r
@@ -116,9 +116,16 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
 @if errorlevel 1 goto :BAD\r
 @goto :MTDLL\r
 :AMALGDLL\r
+@if "%2"=="static" goto :AMALGSTATIC\r
 %LJCOMPILE% %LJDYNBUILD% ljamalg.c\r
 @if errorlevel 1 goto :BAD\r
-%LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj\r
+%LJLINK% /DLL /OUT:%LJDLLNAME% ljamalg.obj lj_vm.obj\r
+@if errorlevel 1 goto :BAD\r
+@goto :MTDLL\r
+:AMALGSTATIC\r
+%LJCOMPILE% ljamalg.c\r
+@if errorlevel 1 goto :BAD\r
+%LJLINK% /OUT:%LJDLLNAME% ljamalg.obj lj_vm.obj\r
 @if errorlevel 1 goto :BAD\r
 :MTDLL\r
 if exist %LJDLLNAME%.manifest^\r
@@ -126,7 +133,7 @@ if exist %LJDLLNAME%.manifest^
 \r
 %LJCOMPILE% luajit.c\r
 @if errorlevel 1 goto :BAD\r
-%LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME%\r
+%LJLINK% /OUT:luajit.exe luajit.obj %LJLIBNAME%\r
 @if errorlevel 1 goto :BAD\r
 if exist luajit.exe.manifest^\r
   %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe\r