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-12            | 23 -----------------------
 msvc-12/msvc-12-32 | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 23 deletions(-)
 delete mode 100755 msvc-12
 create mode 100755 msvc-12/msvc-12-32

(limited to 'msvc-12')

diff --git a/msvc-12 b/msvc-12
deleted file mode 100755
index e4d9500..0000000
--- a/msvc-12
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /usr/bin/env bash
-
-# MSVC 12 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"
-
-# VC
-#
-VC="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC"
-VCBIN="$VC\\bin\\amd64_x86"
-VCDLL="$VC\\bin\\amd64"
-
-INCLUDE="$VC\\include;$INCLUDE"
-LIB="$VC\\lib;$LIB"
diff --git a/msvc-12/msvc-12-32 b/msvc-12/msvc-12-32
new file mode 100755
index 0000000..6d77ff6
--- /dev/null
+++ b/msvc-12/msvc-12-32
@@ -0,0 +1,26 @@
+#! /usr/bin/env bash
+
+# MSVC 12 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 12.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"
+
+# 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"
-- 
cgit v1.1