1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 11:45:53 +01:00

Added support for NSIS QT6 build

This commit is contained in:
Martin Tůma 2021-01-09 13:06:31 +01:00
parent 0a5480ba2c
commit 34b5323fb6
2 changed files with 16 additions and 1 deletions

View File

@ -27,6 +27,7 @@ environment:
OPENSSLDIR: C:\OpenSSL-v111-Win64\bin OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
LIBCRYPTO: libssl-1_1-x64.dll LIBCRYPTO: libssl-1_1-x64.dll
LIBSSL: libcrypto-1_1-x64.dll LIBSSL: libcrypto-1_1-x64.dll
NSISDEF: /DQT6
install: install:
- cmd: >- - cmd: >-
@ -66,6 +67,6 @@ build_script:
copy %OPENSSLDIR%\%LIBSSL% installer copy %OPENSSLDIR%\%LIBSSL% installer
makensis.exe installer\%NSI% makensis.exe %NSISDEF% installer\%NSI%
artifacts: artifacts:
- path: installer\GPXSee-*.exe - path: installer\GPXSee-*.exe

View File

@ -182,6 +182,17 @@ Section "QT framework" SEC_QT
SectionIn RO 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 "Qt5Core.dll"
File "Qt5Gui.dll" File "Qt5Gui.dll"
File "Qt5Widgets.dll" File "Qt5Widgets.dll"
@ -189,6 +200,7 @@ Section "QT framework" SEC_QT
File "Qt5Network.dll" File "Qt5Network.dll"
File "Qt5Sql.dll" File "Qt5Sql.dll"
File "Qt5Concurrent.dll" File "Qt5Concurrent.dll"
!endif
File /r "platforms" File /r "platforms"
File /r "imageformats" File /r "imageformats"
File /r "printsupport" File /r "printsupport"
@ -215,6 +227,7 @@ Section "OpenSSL" SEC_OPENSSL
SectionEnd SectionEnd
!ifndef QT6
Section "ANGLE" SEC_ANGLE Section "ANGLE" SEC_ANGLE
File "libGLESv2.dll" File "libGLESv2.dll"
@ -222,6 +235,7 @@ Section "ANGLE" SEC_ANGLE
File "D3DCompiler_47.dll" File "D3DCompiler_47.dll"
SectionEnd SectionEnd
!endif
SectionGroup "Localization" SEC_LOCALIZATION SectionGroup "Localization" SEC_LOCALIZATION
!insertmacro LOCALIZATION "Czech" "cs" !insertmacro LOCALIZATION "Czech" "cs"