diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2016-11-29 03:23:59 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2016-11-29 19:59:24 +0300 |
| commit | 1e9c3d01783d0c4c8f4d38baa662fa2b836a710b (patch) | |
| tree | 3b470678b1b36dc88ab7a6ef9cc4ae91e60b2f5c /msvc-15 | |
| parent | 6513bb7b269ea8b39dfed0e86a2df9a01ee23416 (diff) | |
Add Windows 10 SDK discovery
Diffstat (limited to 'msvc-15')
| -rwxr-xr-x | msvc-15/msvc-15rc1-32 | 9 | ||||
| -rwxr-xr-x | msvc-15/msvc-15rc1-64 | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/msvc-15/msvc-15rc1-32 b/msvc-15/msvc-15rc1-32 index 774065a..5e0f4c8 100755 --- a/msvc-15/msvc-15rc1-32 +++ b/msvc-15/msvc-15rc1-32 @@ -8,11 +8,16 @@ if [ -z "$MSVC_INSTALLDIR" ]; then MSVC_INSTALLDIR="Microsoft Visual Studio 15.0" fi +if [ -z "$MSVC_SDKVERSION" ]; then + source "$src_dir/msvc-common/msvc-sdk-common" + MSVC_SDKVERSION="$(windows10_sdkversion)" +fi + # SDK # SDK="C:\\Program Files (x86)\\Windows Kits\\10" SDKBIN="$SDK\\bin\\x86" -SDKVER="10.0.14393.0" +SDKVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393". INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt" LIB="$SDK\\lib\\$SDKVER\\um\\x86" @@ -20,7 +25,7 @@ LIB="$SDK\\lib\\$SDKVER\\um\\x86" # CRT # CRT="C:\\Program Files (x86)\\Windows Kits\\10" -CRTVER="10.0.14393.0" +CRTVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393". INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE" LIB="$CRT\\lib\\$CRTVER\\ucrt\\x86;$LIB" diff --git a/msvc-15/msvc-15rc1-64 b/msvc-15/msvc-15rc1-64 index 60c03be..e50d91b 100755 --- a/msvc-15/msvc-15rc1-64 +++ b/msvc-15/msvc-15rc1-64 @@ -8,11 +8,16 @@ if [ -z "$MSVC_INSTALLDIR" ]; then MSVC_INSTALLDIR="Microsoft Visual Studio 15.0" fi +if [ -z "$MSVC_SDKVERSION" ]; then + source "$src_dir/msvc-common/msvc-sdk-common" + MSVC_SDKVERSION="$(windows10_sdkversion)" +fi + # SDK # SDK="C:\\Program Files (x86)\\Windows Kits\\10" SDKBIN="$SDK\\bin\\x64" -SDKVER="10.0.14393.0" +SDKVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393". INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt" LIB="$SDK\\lib\\$SDKVER\\um\\x64" @@ -20,7 +25,7 @@ LIB="$SDK\\lib\\$SDKVER\\um\\x64" # CRT # CRT="C:\\Program Files (x86)\\Windows Kits\\10" -CRTVER="10.0.14393.0" +CRTVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393". INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE" LIB="$CRT\\lib\\$CRTVER\\ucrt\\x64;$LIB" |