diff options
author | Mike Pall <mike> | 2023-12-10 15:00:52 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2023-12-10 15:00:52 +0100 |
commit | 856423f5dabb5bbf86d36816a247663e90c69d35 (patch) | |
tree | 8b7aee4df76ba0fce1eee19b99c49a5bc336a511 | |
parent | dcf3627d79091e8c5535b15fc0ef40281ec9b9f7 (diff) | |
download | luajit-856423f5dabb5bbf86d36816a247663e90c69d35.tar.gz luajit-856423f5dabb5bbf86d36816a247663e90c69d35.tar.bz2 luajit-856423f5dabb5bbf86d36816a247663e90c69d35.zip |
Fix runtime library flags for MSVC debug builds.
Reported by igor725. #1127
-rw-r--r-- | src/msvcbuild.bat | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat index 1f60b8f4..0ac65409 100644 --- a/src/msvcbuild.bat +++ b/src/msvcbuild.bat | |||
@@ -15,6 +15,7 @@ | |||
15 | @rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_APICHECK | 15 | @rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_APICHECK |
16 | @set DEBUGCFLAGS= | 16 | @set DEBUGCFLAGS= |
17 | @set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline | 17 | @set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline |
18 | @set LJDYNBUILD=/MD /DLUA_BUILD_AS_DLL | ||
18 | @set LJLINK=link /nologo | 19 | @set LJLINK=link /nologo |
19 | @set LJMT=mt /nologo | 20 | @set LJMT=mt /nologo |
20 | @set LJLIB=lib /nologo /nodefaultlib | 21 | @set LJLIB=lib /nologo /nodefaultlib |
@@ -71,11 +72,12 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c | |||
71 | @shift | 72 | @shift |
72 | @set BUILDTYPE=debug | 73 | @set BUILDTYPE=debug |
73 | @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS% | 74 | @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS% |
75 | @set LJDYNBUILD=/MDd /DLUA_BUILD_AS_DLL | ||
74 | :NODEBUG | 76 | :NODEBUG |
75 | @set LJLINK=%LJLINK% /%BUILDTYPE% | 77 | @set LJLINK=%LJLINK% /%BUILDTYPE% |
76 | @if "%1"=="amalg" goto :AMALGDLL | 78 | @if "%1"=="amalg" goto :AMALGDLL |
77 | @if "%1"=="static" goto :STATIC | 79 | @if "%1"=="static" goto :STATIC |
78 | %LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c | 80 | %LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c |
79 | @if errorlevel 1 goto :BAD | 81 | @if errorlevel 1 goto :BAD |
80 | %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj | 82 | %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj |
81 | @if errorlevel 1 goto :BAD | 83 | @if errorlevel 1 goto :BAD |
@@ -87,7 +89,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c | |||
87 | @if errorlevel 1 goto :BAD | 89 | @if errorlevel 1 goto :BAD |
88 | @goto :MTDLL | 90 | @goto :MTDLL |
89 | :AMALGDLL | 91 | :AMALGDLL |
90 | %LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c | 92 | %LJCOMPILE% %LJDYNBUILD% ljamalg.c |
91 | @if errorlevel 1 goto :BAD | 93 | @if errorlevel 1 goto :BAD |
92 | %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj | 94 | %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj |
93 | @if errorlevel 1 goto :BAD | 95 | @if errorlevel 1 goto :BAD |