Update installer for 1.10

leplatrem · leplatrem · commit ec820876325b · 2022-07-24T18:28:01.000+02:00
diff --git a/src/subtivals.pro b/src/subtivals.pro
@@ -104,4 +104,6 @@ OTHER_FILES += \
     ../debian/control \
     ../debian/rules \
     ../debian/changelog \
-    ../win-installer/installer.nsi
+    ../win-installer/installer.nsi \
+    ../win-installer/files.nsi \
+    ../win-installer/unfiles.nsi
diff --git a/win-installer/files.nsi b/win-installer/files.nsi
@@ -1,5 +1,6 @@
 ; This list was obtained using Dependency Walker
 ; Do not forget to update unfiles.nsi when modified this.
+File /a "C:\Windows\System32\MSVCRT.DLL"
 File /a "${mingwdir}\bin\LIBGCC_S_SEH-1.DLL"
 File /a "${mingwdir}\bin\LIBSTDC++-6.DLL"
 File /a "${mingwdir}\bin\LIBWINPTHREAD-1.DLL"
diff --git a/win-installer/installer.nsi b/win-installer/installer.nsi
@@ -23,16 +23,16 @@
 
 RequestExecutionLevel admin
 
-!define setup "subtivals-setup-1.9.0.exe"
+!define setup "subtivals-setup-1.10.0.exe"
 
 ; change this to wherever the files to be packaged reside
 !define srcdir "..\subtivals-build-desktop\release"
 
 !define prodname "Subtivals"
 !define exec "subtivals.exe"
 
-!define qtdirdesktop "C:\Qt\5.14.1\mingw73_64"
-!define mingwdir "C:\Qt\Tools\mingw730_64"
+!define qtdirdesktop "C:\Qt\5.15.2\mingw81_64"
+!define mingwdir "C:\Qt\Tools\mingw810_64"
 
 ; optional stuff
  
diff --git a/win-installer/unfiles.nsi b/win-installer/unfiles.nsi
@@ -1,3 +1,4 @@
+Delete "$INSTDIR\MSVCRT.DLL"
 Delete "$INSTDIR\LIBGCC_S_SEH-1.DLL"
 Delete "$INSTDIR\LIBSTDC++-6.DLL"
 Delete "$INSTDIR\LIBWINPTHREAD-1.DLL"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+Delete "$INSTDIR\MSVCRT.DLL"`
`1`	`2`	`Delete "$INSTDIR\LIBGCC_S_SEH-1.DLL"`
`2`	`3`	`Delete "$INSTDIR\LIBSTDC++-6.DLL"`
`3`	`4`	`Delete "$INSTDIR\LIBWINPTHREAD-1.DLL"`