[NSIS installer] Bump MSVCRT version checks / links

To VCRT14 = 14.15.26706
Warzone2100 · Dec 20, 2018 · 4d1f7b8 · 4d1f7b8
1 parent c8ec8cd
commit 4d1f7b8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/pkg/nsis/NSIS.definitions.in b/pkg/nsis/NSIS.definitions.in
@@ -8,11 +8,23 @@
 !define TOP_BUILDDIR "@BUILD_DIR@"
 !if "@NSIS_MSVCRUNTIME@" == "ON"
   !define MSVCRUNTIME "ON"
-  !define MSVCRT14_BLD_MINIMUM 26405 ; (14.14.26405)
+  !define MSVCRT14_BLD_MINIMUM 26706 ; (14.15.26706)
 
-  !define MSVCRT_PORTABLE_DL_URL1 "https://github.com/past-due/applocalconfig/releases/download/v1.0.1/applocalconfig-vc2017-x86.zip"
-  !define MSVCRT_PORTABLE_DL_URL2 "https://downloads.sourceforge.net/project/applocalconfig/releases/1.0.1/applocalconfig-vc2017-x86.zip"
-  !define MSVCRT_PORTABLE_DL_URL_HTTPALT "http://downloads.sourceforge.net/project/applocalconfig/releases/1.0.1/applocalconfig-vc2017-x86.zip"
-  !define MSVCRT_PORTABLE_DL_SHA512 "a7b435294f0beace13823bb9b3b070a1af7e974d952aef9441bf55eeda5bffcac83780c31da981fd45bd23e5aae098ad35c325692cfa2061a72ae1ce2bdc5bc6"
-  !define MSVCRT_PORTABLE_DL_CAPTION "Downloading applocalconfig-vc2017-x86.zip"
+  !if "@CMAKE_VS_PLATFORM_NAME@" == "Win32"
+    !define MSVCRT_PORTABLE_DL_URL1 "https://github.com/past-due/applocalconfig/releases/download/v1.0.2/applocalconfig-vc2017-x86.zip"
+    !define MSVCRT_PORTABLE_DL_URL2 "https://downloads.sourceforge.net/project/applocalconfig/releases/1.0.2/applocalconfig-vc2017-x86.zip"
+    !define MSVCRT_PORTABLE_DL_URL_HTTPALT "http://downloads.sourceforge.net/project/applocalconfig/releases/1.0.2/applocalconfig-vc2017-x86.zip"
+    !define MSVCRT_PORTABLE_DL_SHA512 "1f679a3ed4f4af6a565111970446f1e0cf2911205178f7e1c26a1f245e85908f0c30585eab6fa37313c3375ee5bcdcb0cde9b0a3bc0c555688a28565e5073217"
+    !define MSVCRT_PORTABLE_DL_CAPTION "Downloading applocalconfig-vc2017-x86.zip"
+  !else
+    !if "@CMAKE_VS_PLATFORM_NAME@" == "x64"
+      !define MSVCRT_PORTABLE_DL_URL1 "https://github.com/past-due/applocalconfig/releases/download/v1.0.2/applocalconfig-vc2017-x64.zip"
+      !define MSVCRT_PORTABLE_DL_URL2 "https://downloads.sourceforge.net/project/applocalconfig/releases/1.0.2/applocalconfig-vc2017-x64.zip"
+      !define MSVCRT_PORTABLE_DL_URL_HTTPALT "http://downloads.sourceforge.net/project/applocalconfig/releases/1.0.2/applocalconfig-vc2017-x64.zip"
+      !define MSVCRT_PORTABLE_DL_SHA512 "1311c6b21c10cb8b0c5dafcc3c8c2de3266064fcdb9ce4317fb75d40507a411115858af9a8f9679d4c70280721d624e5dc0f08dbd22f9542ccaeba6cfad666ac"
+      !define MSVCRT_PORTABLE_DL_CAPTION "Downloading applocalconfig-vc2017-x64.zip"
+    !else
+      !warning "Missing defines for platform: (@CMAKE_VS_PLATFORM_NAME@) in NSIS.definitions.in"
+    !endif
+  !endif
 !endif
diff --git a/pkg/nsis/NSIS.template.in b/pkg/nsis/NSIS.template.in
@@ -411,10 +411,9 @@ ${EndIf}
           DetailPrint "$0" ; print error message to log
         ${EndIf}
       ${Else}
-        MessageBox MB_OK|MB_ICONSTOP "Download of applocal system library (x86) failed: $Result_MSVCDownload"
+        MessageBox MB_OK|MB_ICONSTOP "Download of applocal system library failed: $Result_MSVCDownload"
       ${EndIf}
 
-      ; TODO: In the future, also support downloading the x64 applocal runtimes?
     SectionEnd
   !endif
 !endif