| 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_7"
|
| | 40 | +!if ${COMPILER} == "VC2017_8"
|
| 41 | 41 | !ifdef _DEBUG
|
| 42 | 42 | !define SRCDIR "Debug VS2017"
|
| 43 | 43 | !else
|
| — | — | @@ -109,12 +109,12 @@ |
| 110 | 110 | !define runtime_sha512 "729251371ED208898430040FE48CABD286A5671BD7F472A30E9021B68F73B2D49D85A0879920232426B139520F7E21321BA92646985216BF2F733C64E014A71D"
|
| 111 | 111 | !define runtime_regkey SOFTWARE\Microsoft\DevDiv\vc\Servicing\12.0\RuntimeMinimum
|
| 112 | 112 | !define runtime_regvalue Install
|
| 113 | | -!else if ${COMPILER} == "VC2017_7"
|
| | 113 | +!else if ${COMPILER} == "VC2017_8"
|
| 114 | 114 | !define download_runtime 1
|
| 115 | | -!define runtime_url http://www.dxgl.info/download/runtimes/vc14.14/vc_redist.x86.exe
|
| 116 | | -!define runtime_name "Visual C++ 2017.7"
|
| | 115 | +!define runtime_url http://www.dxgl.info/download/runtimes/vc14.15/vc_redist.x86.exe
|
| | 116 | +!define runtime_name "Visual C++ 2017.8"
|
| 117 | 117 | !define runtime_filename "vc_redist.x86.exe"
|
| 118 | | -!define runtime_sha512 "9D954611243942F4AF6CE37D531EA67CB88CA8CFE5BBE7942606AF11577B12F250F3A9622255760B8BF0610EE72C647BAF42BCCC1F708D3EA05B63B6945DEB8F"
|
| | 118 | +!define runtime_sha512 "05B02AB523D7DDEA468C94F28D4EDB1BD945BDC525B87DE11F7F995196407D412D9E76A950F9F3134467D88A4F6E0B3456E9E941AB7118EDE04025E19F1D2751"
|
| 119 | 119 | !define runtime_regkey SOFTWARE\Microsoft\DevDiv\vc\Servicing\14.0\RuntimeMinimum
|
| 120 | 120 | !define runtime_regvalue Install
|
| 121 | 121 | !define runtime_regvalue2 Version
|
| — | — | @@ -253,7 +253,7 @@ |
| 254 | 254 |
|
| 255 | 255 |
|
| 256 | 256 | Function .onInit
|
| 257 | | - !if ${COMPILER} == "VC2017_7"
|
| | 257 | + !if ${COMPILER} == "VC2017_8"
|
| 258 | 258 | dxgl-nsis::CheckSSE2 $0
|
| 259 | 259 | Pop $0
|
| 260 | 260 | ${If} $0 == "0"
|
| — | — | @@ -306,12 +306,12 @@ |
| 307 | 307 | !else
|
| 308 | 308 | !if ${download_runtime} >= 1
|
| 309 | 309 | ReadRegDWORD $0 HKLM ${runtime_regkey} ${runtime_regvalue}
|
| 310 | | - !if ${COMPILER} == "VC2017_7"
|
| | 310 | + !if ${COMPILER} == "VC2017_8"
|
| 311 | 311 | StrCmp $0 1 skipvcredist1
|
| 312 | 312 | goto vcinstall
|
| 313 | 313 | skipvcredist1:
|
| 314 | 314 | ReadRegDWORD $0 HKLM ${runtime_regkey} ${runtime_regvalue2}
|
| 315 | | - ${VersionCompare} "$0" "14.14.26429" $1
|
| | 315 | + ${VersionCompare} "$0" "14.15.26706" $1
|
| 316 | 316 | ${If} $1 == 0
|
| 317 | 317 | goto skipvcredist
|
| 318 | 318 | ${EndIf}
|
| Index: buildtool/buildtool.c |
| — | — | @@ -216,8 +216,8 @@ |
| 217 | 217 | strncpy(findptr, "\"VC2010\"\n", 13);
|
| 218 | 218 | #elif (_MSC_VER == 1800)
|
| 219 | 219 | strncpy(findptr, "\"VC2013\"\n", 13);
|
| 220 | | - #elif (_MSC_VER == 1914)
|
| 221 | | - strncpy(findptr, "\"VC2017_7\"\n", 13);
|
| | 220 | + #elif (_MSC_VER == 1915)
|
| | 221 | + strncpy(findptr, "\"VC2017_8\"\n", 13);
|
| 222 | 222 | #else
|
| 223 | 223 | strncpy(findptr, "\"UNKNOWN\"\n", 13);
|
| 224 | 224 | #endif
|