| 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} == "VC2019_1"
|
| | 40 | +!if ${COMPILER} == "VC2019_2"
|
| 41 | 41 | !ifdef _DEBUG
|
| 42 | 42 | !define SRCDIR "Debug VS2019"
|
| 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} == "VC2019_1"
|
| | 116 | +!else if ${COMPILER} == "VC2019_2"
|
| 117 | 117 | !define download_runtime 1
|
| 118 | | -!define runtime_url http://www.dxgl.org/download/runtimes/vc14.21/vc_redist.x86.exe
|
| 119 | | -!define runtime_name "Visual C++ 2019.1"
|
| | 118 | +!define runtime_url http://www.dxgl.org/download/runtimes/vc14.22/vc_redist.x86.exe
|
| | 119 | +!define runtime_name "Visual C++ 2019.2"
|
| 120 | 120 | !define runtime_filename "vc_redist.x86.exe"
|
| 121 | | -!define runtime_sha512 "2DE5956C1C55DE35B5863372BBC7C662F2840B03A9D4115FE14A9036BFAC334F415FFBB5E60AD3E59A79C755980216D8D54D027D1AA2E84BA5109B900C9E5629"
|
| | 121 | +!define runtime_sha512 "9E023DD1258B20D3DD29EB3858282D5E99F86DC980BECB044A867A0AA8C5210EEBB426B3F7D574C3E10B58A72436C7E360C644A64F5653F19AD28B9C96ECD183"
|
| 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} == "VC2019_1"
|
| | 263 | + !if ${COMPILER} == "VC2019_2"
|
| 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} == "VC2019_1"
|
| | 316 | + !if ${COMPILER} == "VC2019_2"
|
| 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.21.27702" $1
|
| | 321 | + ${VersionCompare} "$0" "14.22.27821" $1
|
| 322 | 322 | ${If} $1 == 0
|
| 323 | 323 | goto skipvcredist
|
| 324 | 324 | ${EndIf}
|
| — | — | @@ -427,7 +427,7 @@ |
| 428 | 428 |
|
| 429 | 429 | !if ${SIGNTOOL} == 1
|
| 430 | 430 | !finalize 'signtool sign /t http://timestamp.comodoca.com %1'
|
| 431 | | -!if ${COMPILER} == "VC2019_1"
|
| | 431 | +!if ${COMPILER} == "VC2019_2"
|
| 432 | 432 | !finalize 'signtool sign /tr http://timestamp.comodoca.com /td sha256 /fd sha256 /as %1'
|
| 433 | 433 | !endif
|
| 434 | 434 | !endif |
| \ No newline at end of file |
| Index: buildtool/buildtool.c |
| — | — | @@ -222,13 +222,13 @@ |
| 223 | 223 | strncpy(findptr, "\"VC2010\"\n", 13);
|
| 224 | 224 | #elif (_MSC_VER == 1800)
|
| 225 | 225 | strncpy(findptr, "\"VC2013\"\n", 13);
|
| 226 | | - #elif (_MSC_VER == 1921)
|
| 227 | | - strncpy(findptr, "\"VC2019_1\"\n", 13);
|
| | 226 | + #elif (_MSC_VER == 1922)
|
| | 227 | + strncpy(findptr, "\"VC2019_2\"\n", 13);
|
| 228 | 228 | #elif ((_MSC_VER > 1900) && (_MSC_VER < 1916))
|
| 229 | 229 | #error Please update your Visual Studio 2017 to version 2017.9 before continuing.
|
| 230 | | - #elif (_MSC_VER > 1921)
|
| 231 | | - #pragma message ("Detected a newer version of Visual Studio, compiling assuming 2019.1.")
|
| 232 | | - strncpy(findptr, "\"VC2019_1\"\n", 13);
|
| | 230 | + #elif (_MSC_VER > 1922)
|
| | 231 | + #pragma message ("Detected a newer version of Visual Studio, compiling assuming 2019.2.")
|
| | 232 | + strncpy(findptr, "\"VC2019_2\"\n", 13);
|
| 233 | 233 | #else
|
| 234 | 234 | strncpy(findptr, "\"UNKNOWN\"\n", 13);
|
| 235 | 235 | #endif
|