diff --git a/.appveyor.yml b/.appveyor.yml index eb66f0aa..3e1a4a33 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -27,6 +27,7 @@ environment: OPENSSLDIR: C:\OpenSSL-v111-Win64\bin LIBCRYPTO: libssl-1_1-x64.dll LIBSSL: libcrypto-1_1-x64.dll + NSISDEF: /DQT6 install: - cmd: >- @@ -66,6 +67,6 @@ build_script: copy %OPENSSLDIR%\%LIBSSL% installer - makensis.exe installer\%NSI% + makensis.exe %NSISDEF% installer\%NSI% artifacts: - path: installer\GPXSee-*.exe diff --git a/pkg/gpxsee64.nsi b/pkg/gpxsee64.nsi index 552b259c..a6c3ca79 100644 --- a/pkg/gpxsee64.nsi +++ b/pkg/gpxsee64.nsi @@ -182,6 +182,17 @@ Section "QT framework" SEC_QT SectionIn RO +!ifdef QT6 + File "Qt6Concurrent.dll" + File "Qt6Core.dll" + File "Qt6Gui.dll" + File "Qt6Network.dll" + File "Qt6OpenGL.dll" + File "Qt6OpenGLWidgets.dll" + File "Qt6PrintSupport.dll" + File "Qt6Sql.dll" + File "Qt6Widgets.dll" +!else File "Qt5Core.dll" File "Qt5Gui.dll" File "Qt5Widgets.dll" @@ -189,6 +200,7 @@ Section "QT framework" SEC_QT File "Qt5Network.dll" File "Qt5Sql.dll" File "Qt5Concurrent.dll" +!endif File /r "platforms" File /r "imageformats" File /r "printsupport" @@ -215,6 +227,7 @@ Section "OpenSSL" SEC_OPENSSL SectionEnd +!ifndef QT6 Section "ANGLE" SEC_ANGLE File "libGLESv2.dll" @@ -222,6 +235,7 @@ Section "ANGLE" SEC_ANGLE File "D3DCompiler_47.dll" SectionEnd +!endif SectionGroup "Localization" SEC_LOCALIZATION !insertmacro LOCALIZATION "Czech" "cs"