|
9 | 9 | @rem lua52c enable lua52 compat mode |
10 | 10 | @rem debug emit debug symbols |
11 | 11 | @rem amalg amalgamated build |
12 | | -@rem static static linkage |
| 12 | +@rem static create static lib to statically link into your project |
| 13 | +@rem mixed create static lib to build a DLL in your project |
13 | 14 |
|
14 | 15 | @if not defined INCLUDE goto :FAIL |
15 | 16 |
|
@@ -112,26 +113,30 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c |
112 | 113 | @if "%1"=="static" goto :STATIC |
113 | 114 | %LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c |
114 | 115 | @if errorlevel 1 goto :BAD |
| 116 | +@if "%1"=="mixed" goto :STATICLIB |
115 | 117 | %LJLINK% /DLL /OUT:%LJDLLNAME% lj_*.obj lib_*.obj |
116 | 118 | @if errorlevel 1 goto :BAD |
117 | 119 | @goto :MTDLL |
118 | 120 | :STATIC |
119 | 121 | %LJCOMPILE% lj_*.c lib_*.c |
120 | 122 | @if errorlevel 1 goto :BAD |
| 123 | +:STATICLIB |
121 | 124 | %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj |
122 | 125 | @if errorlevel 1 goto :BAD |
123 | 126 | @goto :MTDLL |
124 | 127 | :AMALGDLL |
125 | 128 | @if "%2"=="static" goto :AMALGSTATIC |
126 | 129 | %LJCOMPILE% %LJDYNBUILD% ljamalg.c |
127 | 130 | @if errorlevel 1 goto :BAD |
| 131 | +@if "%2"=="mixed" goto :AMALGSTATICLIB |
128 | 132 | %LJLINK% /DLL /OUT:%LJDLLNAME% ljamalg.obj lj_vm.obj |
129 | 133 | @if errorlevel 1 goto :BAD |
130 | 134 | @goto :MTDLL |
131 | 135 | :AMALGSTATIC |
132 | 136 | %LJCOMPILE% ljamalg.c |
133 | 137 | @if errorlevel 1 goto :BAD |
134 | | -%LJLINK% /OUT:%LJDLLNAME% ljamalg.obj lj_vm.obj |
| 138 | +:AMALGSTATICLIB |
| 139 | +%LJLIB% /OUT:%LJLIBNAME% ljamalg.obj lj_vm.obj |
135 | 140 | @if errorlevel 1 goto :BAD |
136 | 141 | :MTDLL |
137 | 142 | if exist %LJDLLNAME%.manifest^ |
|
0 commit comments