Windows: Allow mixed builds with msvcbuild.bat.

Suggested by alex4814. #1341

1 files changed, 7 insertions, 2 deletions

diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index fa30d11d..69c0c61a 100644
--- a/src/msvcbuild.bat
+++ b/src/msvcbuild.bat
@@ -8,7 +8,8 @@
 @rem   nogc64   disable LJ_GC64 mode for x64

 @rem   debug    emit debug symbols

 @rem   amalg    amalgamated build

-@rem   static   static linkage

+@rem   static   create static lib to statically link into your project

+@rem   mixed    create static lib to build a DLL in your project

 

 @if not defined INCLUDE goto :FAIL

 

@@ -106,12 +107,14 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
 @if "%1"=="static" goto :STATIC

 %LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c

 @if errorlevel 1 goto :BAD

+@if "%1"=="mixed" goto :STATICLIB

 %LJLINK% /DLL /OUT:%LJDLLNAME% lj_*.obj lib_*.obj

 @if errorlevel 1 goto :BAD

 @goto :MTDLL

 :STATIC

 %LJCOMPILE% lj_*.c lib_*.c

 @if errorlevel 1 goto :BAD

+:STATICLIB

 %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj

 @if errorlevel 1 goto :BAD

 @goto :MTDLL

@@ -119,13 +122,15 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
 @if "%2"=="static" goto :AMALGSTATIC

 %LJCOMPILE% %LJDYNBUILD% ljamalg.c

 @if errorlevel 1 goto :BAD

+@if "%2"=="mixed" goto :AMALGSTATICLIB

 %LJLINK% /DLL /OUT:%LJDLLNAME% ljamalg.obj lj_vm.obj

 @if errorlevel 1 goto :BAD

 @goto :MTDLL

 :AMALGSTATIC

 %LJCOMPILE% ljamalg.c

 @if errorlevel 1 goto :BAD

-%LJLINK% /OUT:%LJDLLNAME% ljamalg.obj lj_vm.obj

+:AMALGSTATICLIB

+%LJLIB% /OUT:%LJLIBNAME% ljamalg.obj lj_vm.obj

 @if errorlevel 1 goto :BAD

 :MTDLL

 if exist %LJDLLNAME%.manifest^