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

Thanks to Miku AuahDark. #1127

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 @@
 @if not defined INCLUDE goto :FAIL

 

 @setlocal

-@rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_APICHECK

+@rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_ASSERT

 @set DEBUGCFLAGS=

 @set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline

-@set LJDYNBUILD=/MD /DLUA_BUILD_AS_DLL

+@set LJDYNBUILD=/DLUA_BUILD_AS_DLL /MD

+@set LJDYNBUILD_DEBUG=/DLUA_BUILD_AS_DLL /MDd 

+@set LJCOMPILETARGET=/Zi

+@set LJLINKTYPE=/DEBUG /RELEASE

+@set LJLINKTYPE_DEBUG=/DEBUG

+@set LJLINKTARGET=/OPT:REF /OPT:ICF /INCREMENTAL:NO

 @set LJLINK=link /nologo

 @set LJMT=mt /nologo

 @set LJLIB=lib /nologo /nodefaultlib

@@ -25,7 +30,6 @@
 @set DASC=vm_x64.dasc

 @set LJDLLNAME=lua51.dll

 @set LJLIBNAME=lua51.lib

-@set BUILDTYPE=release

 @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

 

 @setlocal

@@ -92,12 +96,12 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
 

 @if "%1" neq "debug" goto :NODEBUG

 @shift

-@set BUILDTYPE=debug

-@set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS%

-@set LJDYNBUILD=/MDd /DLUA_BUILD_AS_DLL

-@set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no

+@set LJCOMPILE=%LJCOMPILE% %DEBUGCFLAGS%

+@set LJDYNBUILD=%LJDYNBUILD_DEBUG%

+@set LJLINKTYPE=%LJLINKTYPE_DEBUG%

 :NODEBUG

-@set LJLINK=%LJLINK% /%BUILDTYPE%

+@set LJCOMPILE=%LJCOMPILE% %LJCOMPILETARGET%

+@set LJLINK=%LJLINK% %LJLINKTYPE% %LJLINKTARGET%

 @if "%1"=="amalg" goto :AMALGDLL

 @if "%1"=="static" goto :STATIC

 %LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c