Windows/MSVC: Cleanup msvcbuild.bat and always generate PDB.

Thanks to Miku AuahDark. #1127

diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index 91cfd065091370d94a209ba9558098dc443785ed..13b8175ad15e0bf07925babc06e23b9bfe1fa77d 100644 (file)
--- a/src/msvcbuild.bat
+++ b/src/msvcbuild.bat
@@ -13,10 +13,15 @@
 @if not defined INCLUDE goto :FAIL\r
 \r
 @setlocal\r
-@rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_APICHECK\r
+@rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_ASSERT\r
 @set DEBUGCFLAGS=\r
 @set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline\r
-@set LJDYNBUILD=/MD /DLUA_BUILD_AS_DLL\r
+@set LJDYNBUILD=/DLUA_BUILD_AS_DLL /MD\r
+@set LJDYNBUILD_DEBUG=/DLUA_BUILD_AS_DLL /MDd \r
+@set LJCOMPILETARGET=/Zi\r
+@set LJLINKTYPE=/DEBUG /RELEASE\r
+@set LJLINKTYPE_DEBUG=/DEBUG\r
+@set LJLINKTARGET=/OPT:REF /OPT:ICF /INCREMENTAL:NO\r
 @set LJLINK=link /nologo\r
 @set LJMT=mt /nologo\r
 @set LJLIB=lib /nologo /nodefaultlib\r
@@ -25,7 +30,6 @@
 @set DASC=vm_x64.dasc\r
 @set LJDLLNAME=lua51.dll\r
 @set LJLIBNAME=lua51.lib\r
-@set BUILDTYPE=release\r
 @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\r
 \r
 @setlocal\r
@@ -92,12 +96,12 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
 \r
 @if "%1" neq "debug" goto :NODEBUG\r
 @shift\r
-@set BUILDTYPE=debug\r
-@set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS%\r
-@set LJDYNBUILD=/MDd /DLUA_BUILD_AS_DLL\r
-@set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no\r
+@set LJCOMPILE=%LJCOMPILE% %DEBUGCFLAGS%\r
+@set LJDYNBUILD=%LJDYNBUILD_DEBUG%\r
+@set LJLINKTYPE=%LJLINKTYPE_DEBUG%\r
 :NODEBUG\r
-@set LJLINK=%LJLINK% /%BUILDTYPE%\r
+@set LJCOMPILE=%LJCOMPILE% %LJCOMPILETARGET%\r
+@set LJLINK=%LJLINK% %LJLINKTYPE% %LJLINKTARGET%\r
 @if "%1"=="amalg" goto :AMALGDLL\r
 @if "%1"=="static" goto :STATIC\r
 %LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c\r