diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-28 13:22:08 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-28 13:22:08 +0200 |
| commit | 6513bb7b269ea8b39dfed0e86a2df9a01ee23416 (patch) | |
| tree | 18869207bab0ea24611f179a41f75739598b9109 /msvc-14 | |
| parent | 0e2b7b99f9cc769cf4b094dca39b5d452f1de32b (diff) | |
Add infrastructure for Windows 10 SDK discovery
Diffstat (limited to 'msvc-14')
| -rwxr-xr-x | msvc-14/msvc-14u0-32 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/msvc-14/msvc-14u0-32 b/msvc-14/msvc-14u0-32 index ec7b82b..2d101cd 100755 --- a/msvc-14/msvc-14u0-32 +++ b/msvc-14/msvc-14u0-32 @@ -8,6 +8,11 @@ if [ -z "$MSVC_INSTALLDIR" ]; then MSVC_INSTALLDIR="Microsoft Visual Studio 14.0" fi +if [ -z "$MSVC_SDKVERSION" ]; then + source "$src_dir/msvc-common/msvc-sdk" + MSVC_SDKVERSION="$(windows10_sdkversion)" +fi + # SDK # SDK="C:\\Program Files (x86)\\Windows Kits\\8.1" @@ -19,7 +24,7 @@ LIB="$SDK\\lib\\winv6.3\\um\\x86" # CRT # CRT="C:\\Program Files (x86)\\Windows Kits\\10" -CRTVER="10.0.10150.0" +CRTVER="$MSVC_SDKVERSION.0" # Originally "10.0.10150". INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE" LIB="$CRT\\lib\\$CRTVER\\ucrt\\x86;$LIB" |