diff options
author | Mike Pall <mike> | 2024-04-19 11:01:13 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2024-04-19 11:01:13 +0200 |
commit | b3e498738962cdb08686f3dd612cf060382d88f2 (patch) | |
tree | 14d707c1df0238ffd86f79ac69833265312689d7 | |
parent | 75e92777988017fe47c5eb290998021bbf972d1f (diff) | |
download | luajit-b3e498738962cdb08686f3dd612cf060382d88f2.tar.gz luajit-b3e498738962cdb08686f3dd612cf060382d88f2.tar.bz2 luajit-b3e498738962cdb08686f3dd612cf060382d88f2.zip |
Windows/MSVC: Cleanup msvcbuild.bat and always generate PDB.
Thanks to Miku AuahDark. #1127
-rw-r--r-- | src/msvcbuild.bat | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat index 91cfd065..13b8175a 100644 --- a/src/msvcbuild.bat +++ b/src/msvcbuild.bat | |||
@@ -13,10 +13,15 @@ | |||
13 | @if not defined INCLUDE goto :FAIL | 13 | @if not defined INCLUDE goto :FAIL |
14 | 14 | ||
15 | @setlocal | 15 | @setlocal |
16 | @rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_APICHECK | 16 | @rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_ASSERT |
17 | @set DEBUGCFLAGS= | 17 | @set DEBUGCFLAGS= |
18 | @set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline | 18 | @set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline |
19 | @set LJDYNBUILD=/MD /DLUA_BUILD_AS_DLL | 19 | @set LJDYNBUILD=/DLUA_BUILD_AS_DLL /MD |
20 | @set LJDYNBUILD_DEBUG=/DLUA_BUILD_AS_DLL /MDd | ||
21 | @set LJCOMPILETARGET=/Zi | ||
22 | @set LJLINKTYPE=/DEBUG /RELEASE | ||
23 | @set LJLINKTYPE_DEBUG=/DEBUG | ||
24 | @set LJLINKTARGET=/OPT:REF /OPT:ICF /INCREMENTAL:NO | ||
20 | @set LJLINK=link /nologo | 25 | @set LJLINK=link /nologo |
21 | @set LJMT=mt /nologo | 26 | @set LJMT=mt /nologo |
22 | @set LJLIB=lib /nologo /nodefaultlib | 27 | @set LJLIB=lib /nologo /nodefaultlib |
@@ -25,7 +30,6 @@ | |||
25 | @set DASC=vm_x64.dasc | 30 | @set DASC=vm_x64.dasc |
26 | @set LJDLLNAME=lua51.dll | 31 | @set LJDLLNAME=lua51.dll |
27 | @set LJLIBNAME=lua51.lib | 32 | @set LJLIBNAME=lua51.lib |
28 | @set BUILDTYPE=release | ||
29 | @set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c | 33 | @set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c |
30 | 34 | ||
31 | @setlocal | 35 | @setlocal |
@@ -92,12 +96,12 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c | |||
92 | 96 | ||
93 | @if "%1" neq "debug" goto :NODEBUG | 97 | @if "%1" neq "debug" goto :NODEBUG |
94 | @shift | 98 | @shift |
95 | @set BUILDTYPE=debug | 99 | @set LJCOMPILE=%LJCOMPILE% %DEBUGCFLAGS% |
96 | @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS% | 100 | @set LJDYNBUILD=%LJDYNBUILD_DEBUG% |
97 | @set LJDYNBUILD=/MDd /DLUA_BUILD_AS_DLL | 101 | @set LJLINKTYPE=%LJLINKTYPE_DEBUG% |
98 | @set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no | ||
99 | :NODEBUG | 102 | :NODEBUG |
100 | @set LJLINK=%LJLINK% /%BUILDTYPE% | 103 | @set LJCOMPILE=%LJCOMPILE% %LJCOMPILETARGET% |
104 | @set LJLINK=%LJLINK% %LJLINKTYPE% %LJLINKTARGET% | ||
101 | @if "%1"=="amalg" goto :AMALGDLL | 105 | @if "%1"=="amalg" goto :AMALGDLL |
102 | @if "%1"=="static" goto :STATIC | 106 | @if "%1"=="static" goto :STATIC |
103 | %LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c | 107 | %LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c |