From ec820876325bd51e860bf2e329d171321853dad1 Mon Sep 17 00:00:00 2001 From: Mathieu Leplatre Date: Sun, 24 Jul 2022 18:28:01 +0200 Subject: [PATCH] Update installer for 1.10 --- src/subtivals.pro | 4 +++- win-installer/files.nsi | 1 + win-installer/installer.nsi | 6 +++--- win-installer/unfiles.nsi | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/subtivals.pro b/src/subtivals.pro index f639f79..cb5c53e 100644 --- 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 index c461653..c53783d 100644 --- 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 index d0358ce..2af891c 100644 --- a/win-installer/installer.nsi +++ b/win-installer/installer.nsi @@ -23,7 +23,7 @@ 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" @@ -31,8 +31,8 @@ RequestExecutionLevel admin !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 index 1dfd4ba..28f3c92 100644 --- 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"