Windows: Allow mixed builds with msvcbuild.bat.

Suggested by alex4814. #1341

diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index fa30d11df84497d5dfc546e65c6cc729dd8d40d9..69c0c61a9f6558a2bcc2b637790fdd2e255559cb 100644 (file)
--- a/src/msvcbuild.bat
+++ b/src/msvcbuild.bat
@@ -8,7 +8,8 @@
 @rem   nogc64   disable LJ_GC64 mode for x64\r
 @rem   debug    emit debug symbols\r
 @rem   amalg    amalgamated build\r
-@rem   static   static linkage\r
+@rem   static   create static lib to statically link into your project\r
+@rem   mixed    create static lib to build a DLL in your project\r
 \r
 @if not defined INCLUDE goto :FAIL\r
 \r
@@ -106,12 +107,14 @@ 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
+@if "%1"=="mixed" goto :STATICLIB\r
 %LJLINK% /DLL /OUT:%LJDLLNAME% lj_*.obj lib_*.obj\r
 @if errorlevel 1 goto :BAD\r
 @goto :MTDLL\r
 :STATIC\r
 %LJCOMPILE% lj_*.c lib_*.c\r
 @if errorlevel 1 goto :BAD\r
+:STATICLIB\r
 %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj\r
 @if errorlevel 1 goto :BAD\r
 @goto :MTDLL\r
@@ -119,13 +122,15 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
 @if "%2"=="static" goto :AMALGSTATIC\r
 %LJCOMPILE% %LJDYNBUILD% ljamalg.c\r
 @if errorlevel 1 goto :BAD\r
+@if "%2"=="mixed" goto :AMALGSTATICLIB\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
+:AMALGSTATICLIB\r
+%LJLIB% /OUT:%LJLIBNAME% ljamalg.obj lj_vm.obj\r
 @if errorlevel 1 goto :BAD\r
 :MTDLL\r
 if exist %LJDLLNAME%.manifest^\r