diff options
author | Mike Pall <mike> | 2024-11-14 17:21:00 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2024-11-14 17:21:00 +0100 |
commit | fe71d0fb54ceadfb5b5f3b6baf29e486d97f6059 (patch) | |
tree | 23a4d423de0f7a55f2f2d76314154319b5fedc24 /src | |
parent | fca66335d131669cf017420af6963a7565babb58 (diff) | |
download | luajit-fe71d0fb54ceadfb5b5f3b6baf29e486d97f6059.tar.gz luajit-fe71d0fb54ceadfb5b5f3b6baf29e486d97f6059.tar.bz2 luajit-fe71d0fb54ceadfb5b5f3b6baf29e486d97f6059.zip |
Windows: Allow amalgamated static builds with msvcbuild.bat.
Reported by Naman Dixit. #1289
Diffstat (limited to 'src')
-rw-r--r-- | src/msvcbuild.bat | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat index 13b8175a..5b493ba5 100644 --- a/src/msvcbuild.bat +++ b/src/msvcbuild.bat | |||
@@ -106,7 +106,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c | |||
106 | @if "%1"=="static" goto :STATIC | 106 | @if "%1"=="static" goto :STATIC |
107 | %LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c | 107 | %LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c |
108 | @if errorlevel 1 goto :BAD | 108 | @if errorlevel 1 goto :BAD |
109 | %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj | 109 | %LJLINK% /DLL /OUT:%LJDLLNAME% lj_*.obj lib_*.obj |
110 | @if errorlevel 1 goto :BAD | 110 | @if errorlevel 1 goto :BAD |
111 | @goto :MTDLL | 111 | @goto :MTDLL |
112 | :STATIC | 112 | :STATIC |
@@ -116,9 +116,16 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c | |||
116 | @if errorlevel 1 goto :BAD | 116 | @if errorlevel 1 goto :BAD |
117 | @goto :MTDLL | 117 | @goto :MTDLL |
118 | :AMALGDLL | 118 | :AMALGDLL |
119 | @if "%2"=="static" goto :AMALGSTATIC | ||
119 | %LJCOMPILE% %LJDYNBUILD% ljamalg.c | 120 | %LJCOMPILE% %LJDYNBUILD% ljamalg.c |
120 | @if errorlevel 1 goto :BAD | 121 | @if errorlevel 1 goto :BAD |
121 | %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj | 122 | %LJLINK% /DLL /OUT:%LJDLLNAME% ljamalg.obj lj_vm.obj |
123 | @if errorlevel 1 goto :BAD | ||
124 | @goto :MTDLL | ||
125 | :AMALGSTATIC | ||
126 | %LJCOMPILE% ljamalg.c | ||
127 | @if errorlevel 1 goto :BAD | ||
128 | %LJLINK% /OUT:%LJDLLNAME% ljamalg.obj lj_vm.obj | ||
122 | @if errorlevel 1 goto :BAD | 129 | @if errorlevel 1 goto :BAD |
123 | :MTDLL | 130 | :MTDLL |
124 | if exist %LJDLLNAME%.manifest^ | 131 | if exist %LJDLLNAME%.manifest^ |
@@ -126,7 +133,7 @@ if exist %LJDLLNAME%.manifest^ | |||
126 | 133 | ||
127 | %LJCOMPILE% luajit.c | 134 | %LJCOMPILE% luajit.c |
128 | @if errorlevel 1 goto :BAD | 135 | @if errorlevel 1 goto :BAD |
129 | %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME% | 136 | %LJLINK% /OUT:luajit.exe luajit.obj %LJLIBNAME% |
130 | @if errorlevel 1 goto :BAD | 137 | @if errorlevel 1 goto :BAD |
131 | if exist luajit.exe.manifest^ | 138 | if exist luajit.exe.manifest^ |
132 | %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe | 139 | %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe |