Reorganize the script structure

3 files changed, 74 insertions, 1 deletions

diff --git a/msvc-14 b/msvc-14/msvc-14u0-32
index 77e2259..ec7b82b 100755
--- a/msvc-14
+++ b/msvc-14/msvc-14u0-32
@@ -4,6 +4,9 @@
 #
 # Should set the SDKBIN, VCBIN, VCDLL, INCLUDE, and LIB variables.
 #
+if [ -z "$MSVC_INSTALLDIR" ]; then
+  MSVC_INSTALLDIR="Microsoft Visual Studio 14.0"
+fi
 
 # SDK
 #
@@ -23,7 +26,7 @@ LIB="$CRT\\lib\\$CRTVER\\ucrt\\x86;$LIB"
 
 # VC
 #
-VC="C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC"
+VC="C:\\Program Files (x86)\\$MSVC_INSTALLDIR\\VC"
 VCBIN="$VC\\bin\\amd64_x86"
 VCDLL="$VC\\bin\\amd64"
 
diff --git a/msvc-14/msvc-14u2-32 b/msvc-14/msvc-14u2-32
new file mode 100755
index 0000000..0d54bb7
--- /dev/null
+++ b/msvc-14/msvc-14u2-32
@@ -0,0 +1,35 @@
+#! /usr/bin/env bash
+
+# MSVC 14U2 32-bit setup/configuration (note: using 64-to-32 cross-compiler).
+#
+# Should set the SDKBIN, VCBIN, VCDLL, INCLUDE, and LIB variables.
+#
+if [ -z "$MSVC_INSTALLDIR" ]; then
+  MSVC_INSTALLDIR="Microsoft Visual Studio 14.0"
+fi
+
+# SDK
+#
+SDK="C:\\Program Files (x86)\\Windows Kits\\10"
+SDKBIN="$SDK\\bin\\x86"
+SDKVER="10.0.10586.0"
+
+INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt"
+LIB="$SDK\\lib\\$SDKVER\\um\\x86"
+
+# CRT
+#
+CRT="C:\\Program Files (x86)\\Windows Kits\\10"
+CRTVER="10.0.10586.0"
+
+INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE"
+LIB="$CRT\\lib\\$CRTVER\\ucrt\\x86;$LIB"
+
+# VC
+#
+VC="C:\\Program Files (x86)\\$MSVC_INSTALLDIR\\VC"
+VCBIN="$VC\\bin\\amd64_x86"
+VCDLL="$VC\\bin\\amd64"
+
+INCLUDE="$VC\\include;$INCLUDE"
+LIB="$VC\\lib;$LIB"
diff --git a/msvc-14/msvc-14u2-64 b/msvc-14/msvc-14u2-64
new file mode 100755
index 0000000..5ac895b
--- /dev/null
+++ b/msvc-14/msvc-14u2-64
@@ -0,0 +1,35 @@
+#! /usr/bin/env bash
+
+# MSVC 14U2 64-bit setup/configuration.
+#
+# Should set the SDKBIN, VCBIN, VCDLL, INCLUDE, and LIB variables.
+#
+if [ -z "$MSVC_INSTALLDIR" ]; then
+  MSVC_INSTALLDIR="Microsoft Visual Studio 14.0"
+fi
+
+# SDK
+#
+SDK="C:\\Program Files (x86)\\Windows Kits\\10"
+SDKBIN="$SDK\\bin\\x64"
+SDKVER="10.0.10586.0"
+
+INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt"
+LIB="$SDK\\lib\\$SDKVER\\um\\x64"
+
+# CRT
+#
+CRT="C:\\Program Files (x86)\\Windows Kits\\10"
+CRTVER="10.0.10586.0"
+
+INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE"
+LIB="$CRT\\lib\\$CRTVER\\ucrt\\x64;$LIB"
+
+# VC
+#
+VC="C:\\Program Files (x86)\\$MSVC_INSTALLDIR\\VC"
+VCBIN="$VC\\bin\\amd64"
+VCDLL="$VC\\bin\\amd64"
+
+INCLUDE="$VC\\include;$INCLUDE"
+LIB="$VC\\lib\\amd64;$LIB"