Merge branch 'master' into v2.1

3 files changed, 23 insertions, 53 deletions

diff --git a/doc/install.html b/doc/install.html
index 8085573b..700d6edf 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -116,14 +116,14 @@ operating systems, CPUs and compilers:
 <td class="compatos">GCC 4.2+</td>
 <td class="compatos">GCC 4.2+</td>
 <td class="compatos">XCode 5.0+<br>Clang</td>
-<td class="compatos">MSVC, MSVC/EE<br>WinSDK<br>MinGW, Cygwin</td>
+<td class="compatos">MSVC<br>MinGW, Cygwin</td>
 </tr>
 <tr class="even">
 <td class="compatcpu">x64 (64 bit)</td>
 <td class="compatos">GCC 4.2+</td>
 <td class="compatos">GCC 4.2+<br>ORBIS (<a href="#ps4">PS4</a>)</td>
 <td class="compatos">XCode 5.0+<br>Clang</td>
-<td class="compatos">MSVC + SDK v7.0<br>WinSDK v7.0<br>Durango (<a href="#xboxone">Xbox One</a>)</td>
+<td class="compatos">MSVC<br>Durango (<a href="#xboxone">Xbox One</a>)</td>
 </tr>
 <tr class="odd">
 <td class="compatcpu"><a href="#cross2">ARMv5+<br>ARM9E+</a></td>
@@ -168,7 +168,7 @@ only).</li>
 <li><tt>src/Makefile</tt> has settings for <b>compiling</b> LuaJIT
 under POSIX, MinGW or Cygwin.</li>
 <li><tt>src/msvcbuild.bat</tt> has settings for compiling LuaJIT with
-MSVC or WinSDK.</li>
+MSVC (Visual Studio).</li>
 </ul>
 <p>
 Please read the instructions given in these files, before changing
@@ -253,17 +253,7 @@ Either install one of the open source SDKs
 (<a href="http://mingw.org/"><span class="ext">&raquo;</span>&nbsp;MinGW</a> or
 <a href="http://www.cygwin.com/"><span class="ext">&raquo;</span>&nbsp;Cygwin</a>), which come with a modified
 GCC plus the required development headers.
-</p>
-<p>
-Or install Microsoft's Visual C++ (MSVC). The freely downloadable
-<a href="http://www.microsoft.com/Express/VC/"><span class="ext">&raquo;</span>&nbsp;Express Edition</a>
-works just fine, but only contains an x86 compiler.
-</p>
-<p>
-The freely downloadable
-<a href="http://msdn.microsoft.com/en-us/windowsserver/bb980924.aspx"><span class="ext">&raquo;</span>&nbsp;Windows SDK</a>
-only comes with command line tools, but this is all you need to build LuaJIT.
-It contains x86 and x64 compilers.
+Or install Microsoft's Visual Studio (MSVC).
 </p>
 <p>
 Next, download the source package and unpack it using an archive manager
@@ -271,7 +261,7 @@ Next, download the source package and unpack it using an archive manager
 </p>
 <h3>Building with MSVC</h3>
 <p>
-Open a "Visual Studio .NET Command Prompt", <tt>cd</tt> to the
+Open a "Visual Studio Command Prompt" (either x86 or x64), <tt>cd</tt> to the
 directory where you've unpacked the sources and run these commands:
 </p>
 <pre class="code">
@@ -279,30 +269,7 @@ cd src
 msvcbuild
 </pre>
 <p>
-Then follow the installation instructions below.
-</p>
-<h3>Building with the Windows SDK</h3>
-<p>
-Open a "Windows SDK Command Shell" and select the x86 compiler:
-</p>
-<pre class="code">
-setenv /release /x86
-</pre>
-<p>
-Or select the x64 compiler:
-</p>
-<pre class="code">
-setenv /release /x64
-</pre>
-<p>
-Then <tt>cd</tt> to the directory where you've unpacked the sources
-and run these commands:
-</p>
-<pre class="code">
-cd src
-msvcbuild
-</pre>
-<p>
+Check the <tt>msvcbuild.bat</tt> file for more options.
 Then follow the installation instructions below.
 </p>
 <h3>Building with MinGW or Cygwin</h3>
diff --git a/src/lj_def.h b/src/lj_def.h
index e67bb24c..b1208f6b 100644
--- a/src/lj_def.h
+++ b/src/lj_def.h
@@ -8,8 +8,8 @@
 
 #include "lua.h"
 
-#if defined(_MSC_VER)
-/* MSVC is stuck in the last century and doesn't have C99's stdint.h. */
+#if defined(_MSC_VER) && (_MSC_VER < 1700)
+/* Old MSVC is stuck in the last century and doesn't have C99's stdint.h. */
 typedef __int8 int8_t;
 typedef __int16 int16_t;
 typedef __int32 int32_t;
diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index 71bde759..4abc461a 100644
--- a/src/msvcbuild.bat
+++ b/src/msvcbuild.bat
@@ -1,19 +1,19 @@
 @rem Script to build LuaJIT with MSVC.

-@rem Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h

+@rem Copyright (C) 2005-2019 Mike Pall. See Copyright Notice in luajit.h

 @rem

-@rem Either open a "Visual Studio .NET Command Prompt"

-@rem (Note that the Express Edition does not contain an x64 compiler)

-@rem -or-

-@rem Open a "Windows SDK Command Shell" and set the compiler environment:

-@rem     setenv /release /x86

-@rem   -or-

-@rem     setenv /release /x64

+@rem Open a "Visual Studio Command Prompt" (either x86 or x64).

+@rem Then cd to this directory and run this script. Use the following

+@rem options (in order), if needed. The default is a dynamic release build.

 @rem

-@rem Then cd to this directory and run this script.

+@rem   debug    emit debug symbols

+@rem   amalg    amalgamated build

+@rem   static   static linkage

 

 @if not defined INCLUDE goto :FAIL

 

 @setlocal

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

+@set DEBUGCFLAGS=

 @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

@@ -23,6 +23,7 @@
 @set DASC=vm_x86.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

 

 %LJCOMPILE% host\minilua.c

@@ -72,9 +73,11 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
 

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

 @shift

-@set LJCOMPILE=%LJCOMPILE% /Zi

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

+@set BUILDTYPE=debug

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

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

 :NODEBUG

+@set LJLINK=%LJLINK% /%BUILDTYPE%

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

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

 %LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c

@@ -118,5 +121,5 @@ if exist luajit.exe.manifest^
 @echo *******************************************************

 @goto :END

 :FAIL

-@echo You must open a "Visual Studio .NET Command Prompt" to run this script

+@echo You must open a "Visual Studio Command Prompt" to run this script

 :END