krb5 commit: Require Visual Studio 2013 in Windows README

[Greg Hudson]

https://github.com/krb5/krb5/commit/b9ce1cab1ea78f6cb23683c075882e00eb8fcd2c
commit b9ce1cab1ea78f6cb23683c075882e00eb8fcd2c
Author: Greg Hudson <ghudson at mit.edu>
Date:   Fri May 18 01:05:46 2018 -0400

    Require Visual Studio 2013 in Windows README
    
    The recently added SPAKE edwards25519 code, adapted from BoringSSL,
    makes frequent use of mixed declarations and code, which is supported
    by VS2013 but not VS2012 and earlier.  Require VS2013 as the minimum
    version in the Windows README.  Add suport for VS2013 and VS2015 to
    the installer.
    
    ticket: 8662

 src/windows/README                   |   28 ++++++++++------------------
 src/windows/installer/wix/config.wxi |    4 ++++
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/windows/README b/src/windows/README
index c79a178..158427e 100644
--- a/src/windows/README
+++ b/src/windows/README
@@ -8,13 +8,13 @@ MIT Kerberos Ticket Manager application.
 
 To build Kerberos 5 on Windows, you will need the following:
 
-* A version of Visual Studio which includes the Microsoft Foundation
-  Classes libraries.  These instructions will work for Visual Studio
-  2017 Community or Professional, both of which include the MFC
-  libraries if the "Visual C++ MFC" checkbox is selected after
-  enabling the "Desktop development with C++" workload.  If you do not
-  plan to build the graphical ticket manager application, the MFC
-  libraries are not required.
+* A version of Visual Studio (at least 2013) which includes the
+  Microsoft Foundation Classes libraries.  These instructions will
+  work for Visual Studio 2017 Community or Professional, both of which
+  include the MFC libraries if the "Visual C++ MFC" checkbox is
+  selected after enabling the "Desktop development with C++" workload.
+  If you do not plan to build the graphical ticket manager
+  application, the MFC libraries are not required.
 
 * A version of Perl.
 
@@ -112,17 +112,9 @@ Step 10 may be skipped if uicc is already in your command-line path
 (try running "uicc" to see if you get a usage message or a not-found
 error), or if you are not building the graphical ticket manager.
 
-Visual Studio 2012 provides only a single command prompt.  Within this
-prompt, use "vcvarsall.bat x86" and "vcvarsall.bat amd64" to switch to
-32-bit and 64-bit mode.
-
-With Visual Studio 2010, it is necessary to separately install the
-Windows SDK version 7.1 and use the Microsoft Windows SDK -> Windows
-SDK X.Y Command Prompt menu item.  Within this command prompt, run
-"setenv /x86" and "setenv /x64" to switch to 32-bit and 64-bit mode.
-Also include the "/release" option if building with NODEBUG.  If you
-are building with NO_LEASH=1, Visual Studio 2010 itself is not
-necessary; Windows SDK version 7.1 alone is sufficient.
+Visual Studio 2013 and 2015 provide only a single command prompt.
+Within this prompt, use "vcvarsall.bat x86" and "vcvarsall.bat amd64"
+to switch to 32-bit and 64-bit mode.
 
 
 Running Kerberos 5 Apps:
diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi
index 313f2f1..2c68cb1 100644
--- a/src/windows/installer/wix/config.wxi
+++ b/src/windows/installer/wix/config.wxi
@@ -55,6 +55,10 @@
         <?define VCVer="100"?>
     <?elseif $(env.VISUALSTUDIOVERSION) = "11.0"?>
         <?define VCVer="110"?>
+    <?elseif $(env.VISUALSTUDIOVERSION) = "12.0"?>
+        <?define VCVer="120"?>
+    <?elseif $(env.VISUALSTUDIOVERSION) = "14.0"?>
+        <?define VCVer="140"?>
     <?elseif $(env.VISUALSTUDIOVERSION) = "15.0"?>
         <?define VCVer="141"?>
     <?else?>