| Index: Installer/dxgl.nsi |
| — | — | @@ -36,7 +36,7 @@ |
| 37 | 37 | !define PRODUCT_UNINST_ROOT_KEY "HKLM"
|
| 38 | 38 | !include "..\common\version.nsh"
|
| 39 | 39 |
|
| 40 | | -!if ${COMPILER} == "VC2017_8"
|
| | 40 | +!if ${COMPILER} == "VC2017_9"
|
| 41 | 41 | !ifdef _DEBUG
|
| 42 | 42 | !define SRCDIR "Debug VS2017"
|
| 43 | 43 | !else
|
| — | — | @@ -112,12 +112,12 @@ |
| 113 | 113 | !define runtime_regkey SOFTWARE\Microsoft\DevDiv\vc\Servicing\12.0\RuntimeMinimum
|
| 114 | 114 | !define runtime_regvalue Install
|
| 115 | 115 | !define PRODUCT_SUFFIX "-msvc12"
|
| 116 | | -!else if ${COMPILER} == "VC2017_8"
|
| | 116 | +!else if ${COMPILER} == "VC2017_9"
|
| 117 | 117 | !define download_runtime 1
|
| 118 | | -!define runtime_url http://www.dxgl.org/download/runtimes/vc14.15/vc_redist.x86.exe
|
| 119 | | -!define runtime_name "Visual C++ 2017.8"
|
| | 118 | +!define runtime_url http://www.dxgl.org/download/runtimes/vc14.16/vc_redist.x86.exe
|
| | 119 | +!define runtime_name "Visual C++ 2017.9"
|
| 120 | 120 | !define runtime_filename "vc_redist.x86.exe"
|
| 121 | | -!define runtime_sha512 "05B02AB523D7DDEA468C94F28D4EDB1BD945BDC525B87DE11F7F995196407D412D9E76A950F9F3134467D88A4F6E0B3456E9E941AB7118EDE04025E19F1D2751"
|
| | 121 | +!define runtime_sha512 "F895E1146ACD8A4F01F13A9E94CCF5FB4C0726CE6554FE1AE93EA1FA07A484A074E6FA0AECCF1A22733EA164D49CF993F6E5983A991072DC5968E9561E7DE2DD"
|
| 122 | 122 | !define runtime_regkey SOFTWARE\Microsoft\DevDiv\vc\Servicing\14.0\RuntimeMinimum
|
| 123 | 123 | !define runtime_regvalue Install
|
| 124 | 124 | !define runtime_regvalue2 Version
|
| — | — | @@ -259,7 +259,7 @@ |
| 260 | 260 |
|
| 261 | 261 |
|
| 262 | 262 | Function .onInit
|
| 263 | | - !if ${COMPILER} == "VC2017_8"
|
| | 263 | + !if ${COMPILER} == "VC2017_9"
|
| 264 | 264 | dxgl-nsis::CheckSSE2 $0
|
| 265 | 265 | Pop $0
|
| 266 | 266 | ${If} $0 == "0"
|
| — | — | @@ -312,12 +312,12 @@ |
| 313 | 313 | !else
|
| 314 | 314 | !if ${download_runtime} >= 1
|
| 315 | 315 | ReadRegDWORD $0 HKLM ${runtime_regkey} ${runtime_regvalue}
|
| 316 | | - !if ${COMPILER} == "VC2017_8"
|
| | 316 | + !if ${COMPILER} == "VC2017_9"
|
| 317 | 317 | StrCmp $0 1 skipvcredist1
|
| 318 | 318 | goto vcinstall
|
| 319 | 319 | skipvcredist1:
|
| 320 | 320 | ReadRegDWORD $0 HKLM ${runtime_regkey} ${runtime_regvalue2}
|
| 321 | | - ${VersionCompare} "$0" "14.15.26706" $1
|
| | 321 | + ${VersionCompare} "$0" "14.16.27012" $1
|
| 322 | 322 | ${If} $1 == 0
|
| 323 | 323 | goto skipvcredist
|
| 324 | 324 | ${EndIf}
|
| Index: buildtool/buildtool.c |
| — | — | @@ -216,8 +216,13 @@ |
| 217 | 217 | strncpy(findptr, "\"VC2010\"\n", 13);
|
| 218 | 218 | #elif (_MSC_VER == 1800)
|
| 219 | 219 | strncpy(findptr, "\"VC2013\"\n", 13);
|
| 220 | | - #elif (_MSC_VER == 1915)
|
| 221 | | - strncpy(findptr, "\"VC2017_8\"\n", 13);
|
| | 220 | + #elif (_MSC_VER == 1916)
|
| | 221 | + strncpy(findptr, "\"VC2017_9\"\n", 13);
|
| | 222 | + #elif ((MSC_VER > 1900) && (_MSC_VER < 1916))
|
| | 223 | + #error Please update your Visual Studio 2017 to version 2017.9 before continuing.
|
| | 224 | + #elif (MSC_VER > 1916)
|
| | 225 | + #pragma message ("Detected a newer version of Visual Studio, compiling assuming 2017.9.")
|
| | 226 | + strncpy(findptr, "\"VC2017_9\"\n", 13);
|
| 222 | 227 | #else
|
| 223 | 228 | strncpy(findptr, "\"UNKNOWN\"\n", 13);
|
| 224 | 229 | #endif
|