From 3209a9fa6e87ad4d2f9d1087a1206347df4c6214 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 24 Nov 2016 11:38:44 +0200
Subject: Reorganize the script structure

---
 msvc-14              | 31 -------------------------------
 msvc-14/msvc-14u0-32 | 34 ++++++++++++++++++++++++++++++++++
 msvc-14/msvc-14u2-32 | 35 +++++++++++++++++++++++++++++++++++
 msvc-14/msvc-14u2-64 | 35 +++++++++++++++++++++++++++++++++++
 4 files changed, 104 insertions(+), 31 deletions(-)
 delete mode 100755 msvc-14
 create mode 100755 msvc-14/msvc-14u0-32
 create mode 100755 msvc-14/msvc-14u2-32
 create mode 100755 msvc-14/msvc-14u2-64

(limited to 'msvc-14')

diff --git a/msvc-14 b/msvc-14
deleted file mode 100755
index 77e2259..0000000
--- a/msvc-14
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env bash
-
-# MSVC 14 32-bit setup/configuration (note: using 64-to-32 cross-compiler).
-#
-# Should set the SDKBIN, VCBIN, VCDLL, INCLUDE, and LIB variables.
-#
-
-# SDK
-#
-SDK="C:\\Program Files (x86)\\Windows Kits\\8.1"
-SDKBIN="$SDK\\bin\\x86"
-
-INCLUDE="$SDK\\include\\shared;$SDK\\include\\um;$SDK\\include\\winrt"
-LIB="$SDK\\lib\\winv6.3\\um\\x86"
-
-# CRT
-#
-CRT="C:\\Program Files (x86)\\Windows Kits\\10"
-CRTVER="10.0.10150.0"
-
-INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE"
-LIB="$CRT\\lib\\$CRTVER\\ucrt\\x86;$LIB"
-
-# VC
-#
-VC="C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC"
-VCBIN="$VC\\bin\\amd64_x86"
-VCDLL="$VC\\bin\\amd64"
-
-INCLUDE="$VC\\include;$INCLUDE"
-LIB="$VC\\lib;$LIB"
diff --git a/msvc-14/msvc-14u0-32 b/msvc-14/msvc-14u0-32
new file mode 100755
index 0000000..ec7b82b
--- /dev/null
+++ b/msvc-14/msvc-14u0-32
@@ -0,0 +1,34 @@
+#! /usr/bin/env bash
+
+# MSVC 14 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\\8.1"
+SDKBIN="$SDK\\bin\\x86"
+
+INCLUDE="$SDK\\include\\shared;$SDK\\include\\um;$SDK\\include\\winrt"
+LIB="$SDK\\lib\\winv6.3\\um\\x86"
+
+# CRT
+#
+CRT="C:\\Program Files (x86)\\Windows Kits\\10"
+CRTVER="10.0.10150.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-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"
-- 
cgit v1.1