.appveyor.yml

@@ -11,10 +11,11 @@ environment:
   matrix:
   - QTDIR: C:\Qt\5.15\msvc2019_64
     OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
-    NSISDEF: /DOPENSSL /DANGLE
+    OPENSSLVERSION: 1_1
   - QTDIR: C:\Qt\6.5\msvc2019_64
     OPENSSLDIR: C:\OpenSSL-v30-Win64\bin
-    NSISDEF: /DQT6 /DOPENSSL
+    OPENSSLVERSION: 3
+    NSISDEF: /DQT6
 
 install:
 - cmd: |-
@@ -36,8 +37,8 @@ build_script:
     xcopy lang\*.qm installer\translations\ /sy
     xcopy icons\symbols installer\symbols /i
     copy licence.txt installer
-    copy %OPENSSLDIR%\libcrypto-*-x64.dll installer
-    copy %OPENSSLDIR%\libssl-*-x64.dll installer
+    copy %OPENSSLDIR%\libcrypto-%OPENSSLVERSION%-x64.dll installer
+    copy %OPENSSLDIR%\libssl-%OPENSSLVERSION%-x64.dll installer
 
     makensis.exe %NSISDEF% installer\gpxsee64.nsi
 

pkg/windows/gpxsee64.nsi

@@ -249,7 +249,7 @@ Section "GPXSee" SEC_APP
 
 SectionEnd
 
-Section "Qt framework" SEC_QT
+Section "QT framework" SEC_QT
 
   SectionIn RO
 
@@ -281,7 +281,6 @@ Section "Qt framework" SEC_QT
   File /r "printsupport"
 !endif
   File /r "platforms"
-  File /r "iconengines"
   File /r "imageformats"
   File /r "styles"
   File /r "sqldrivers"
@@ -300,30 +299,21 @@ Section "MSVC runtime" SEC_MSVC
 
 SectionEnd
 
-!ifdef ICU
-Section "ICU" SEC_ICU
-
-  SectionIn RO
-
-  File "icudt*.dll"
-  File "icuin*.dll"
-  File "icuuc*.dll"
-
-SectionEnd
-!endif
-
-!ifdef OPENSSL
 Section "OpenSSL" SEC_OPENSSL
 
   SectionIn RO
 
-  File "libcrypto-*-x64.dll"
-  File "libssl-*-x64.dll"
-
-SectionEnd
+!ifdef QT6
+  File "libcrypto-3-x64.dll"
+  File "libssl-3-x64.dll"
+!else
+  File "libcrypto-1_1-x64.dll"
+  File "libssl-1_1-x64.dll"
 !endif
 
-!ifdef ANGLE
+SectionEnd
+
+!ifndef QT6
 Section "ANGLE" SEC_ANGLE
 
   File "libGLESv2.dll"
@@ -479,24 +469,13 @@ SectionEnd
 ; Descriptions
 
 ; Language strings
-!ifdef QT6
 LangString DESC_QT ${LANG_ENGLISH} \
-  "Qt6 cross-platform application framework."
-!else
-LangString DESC_QT ${LANG_ENGLISH} \
-  "Qt5 cross-platform application framework."
-!endif
+  "QT cross-platform application framework."
 LangString DESC_MSVC ${LANG_ENGLISH} \
-  "Microsoft Visual C++ runtime. If already installed, will be skipped."
-!ifdef ICU
-LangString DESC_ICU ${LANG_ENGLISH} \
-  "ICU library. Required for character set/encoding conversions."
-!endif
-!ifdef OPENSSL
+  "Microsoft Visual C++ 2019 runtime. If already installed, will be skipped."
 LangString DESC_OPENSSL ${LANG_ENGLISH} \
-  "OpenSSL library. Qt SSL/TLS backend for HTTPS."
-!endif
-!ifdef ANGLE
+  "OpenSSL library. Required for HTTPS to work."
+!ifndef QT6
 LangString DESC_ANGLE ${LANG_ENGLISH} \
   "ANGLE (OpenGL via Direct3D). Enables OpenGL on systems without native OpenGL drivers."
 !endif
@@ -508,13 +487,8 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
 ; Assign language strings to sections
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_QT} $(DESC_QT)
-!ifdef ICU
-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_ICU} $(DESC_ICU)
-!endif
-!ifdef OPENSSL
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_OPENSSL} $(DESC_OPENSSL)
-!endif
-!ifdef ANGLE
+!ifndef QT6
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_ANGLE} $(DESC_ANGLE)
 !endif
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC)