Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2017-04-17 12:29:52 +02:00
commit dc5eb65ccf

View File

@ -14,7 +14,7 @@
@if not defined INCLUDE goto :FAIL
@setlocal
@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
@set LJLINK=link /nologo
@set LJMT=mt /nologo
@set LJLIB=lib /nologo /nodefaultlib