Add infrastructure for Windows 10 SDK discovery

6 files changed, 12 insertions, 30 deletions

diff --git a/msvc-common/msvc-cl-common b/msvc-common/msvc-cl-common
index 57d389e..833baec 100755
--- a/msvc-common/msvc-cl-common
+++ b/msvc-common/msvc-cl-common
@@ -6,12 +6,6 @@
 # linker, SDKBIN, LIB variables to be set for the specific MSVC
 # version/configuration.
 
-trap "{ exit 1; }" ERR
-set -o errtrace # Trap in functions.
-
-function info () { echo "$*" 1>&2; }
-function error () { info "$*"; exit 1; }
-
 source "$src_dir/msvc-common/msvc-common"
 
 # File descriptor where the diagnostics will be sent. Unless STDOUT is used
diff --git a/msvc-common/msvc-lib-common b/msvc-common/msvc-lib-common
index a38bcd3..5f8295a 100755
--- a/msvc-common/msvc-lib-common
+++ b/msvc-common/msvc-lib-common
@@ -8,12 +8,6 @@
 # It's not clear/documented why we need LIB or what the /LIBPATH option is
 # for. Perhaps for link-time code generation (/LTCG).
 
-trap "{ exit 1; }" ERR
-set -o errtrace # Trap in functions.
-
-function info () { echo "$*" 1>&2; }
-function error () { info "$*"; exit 1; }
-
 source "$src_dir/msvc-common/msvc-common"
 
 # Translate absolute paths from POSIX to Windows. Use bash array to store
diff --git a/msvc-common/msvc-link-common b/msvc-common/msvc-link-common
index 931a251..04f37d6 100755
--- a/msvc-common/msvc-link-common
+++ b/msvc-common/msvc-link-common
@@ -5,12 +5,6 @@
 # Common link.exe driver that expects the VCBIN, SDKBIN, and LIB variables to
 # be set for the specific MSVC version/configuration.
 
-trap "{ exit 1; }" ERR
-set -o errtrace # Trap in functions.
-
-function info () { echo "$*" 1>&2; }
-function error () { info "$*"; exit 1; }
-
 source "$src_dir/msvc-common/msvc-common"
 
 # Translate absolute paths from POSIX to Windows. Use bash array to store
diff --git a/msvc-common/msvc-mt-common b/msvc-common/msvc-mt-common
index 305d98e..7a452bc 100755
--- a/msvc-common/msvc-mt-common
+++ b/msvc-common/msvc-mt-common
@@ -5,12 +5,6 @@
 # Common mt.exe driver that expects the SDKBIN variable to be set for the
 # specific MSVC version/configuration.
 
-trap "{ exit 1; }" ERR
-set -o errtrace # Trap in functions.
-
-function info () { echo "$*" 1>&2; }
-function error () { info "$*"; exit 1; }
-
 source "$src_dir/msvc-common/msvc-common"
 
 # Translate absolute paths from POSIX to Windows. Use bash array to store
diff --git a/msvc-common/msvc-rc-common b/msvc-common/msvc-rc-common
index ca986b4..b406bac 100755
--- a/msvc-common/msvc-rc-common
+++ b/msvc-common/msvc-rc-common
@@ -5,12 +5,6 @@
 # Common rc.exe driver that expects the SDKBIN and INCLUDE variables to be set
 # for the specific MSVC version/configuration.
 
-trap "{ exit 1; }" ERR
-set -o errtrace # Trap in functions.
-
-function info () { echo "$*" 1>&2; }
-function error () { info "$*"; exit 1; }
-
 source "$src_dir/msvc-common/msvc-common"
 
 # Translate absolute paths from POSIX to Windows. Use bash array to store
diff --git a/msvc-common/msvc-sdk-common b/msvc-common/msvc-sdk-common
new file mode 100755
index 0000000..b29777e
--- /dev/null
+++ b/msvc-common/msvc-sdk-common
@@ -0,0 +1,12 @@
+#! /usr/bin/env bash
+
+# Figure out the latest Windows 10 SDK version. Fail if none is found.
+#
+function windows10_sdkversion ()
+{
+  # This path will probably always be the same (VC never asks for the SDK
+  # installation location).
+  #
+  local sdk_root="C:\\Program Files (x86)\\Windows Kits\\10"
+
+}