root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 03:35:53 +01:00
Code Issues Projects Releases Activity

Use OpenSSL v3 for Windows Qt6 builds

Browse Source
This commit is contained in:
Martin Tůma 2023-09-14 23:32:35 +02:00
parent d310399b4f
commit 1304fd5c3c
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.appveyor.yml
View File

@ -8,10 +8,13 @@ image:
environment: environment:
NSISDIR: C:\Program Files (x86)\NSIS NSISDIR: C:\Program Files (x86)\NSIS
OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
matrix: matrix:
- QTDIR: C:\Qt\5.15\msvc2019_64 - QTDIR: C:\Qt\5.15\msvc2019_64
OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
OPENSSLVERSION: 1_1
- QTDIR: C:\Qt\6.5\msvc2019_64 - QTDIR: C:\Qt\6.5\msvc2019_64
OPENSSLDIR: C:\OpenSSL-v30-Win64\bin
OPENSSLVERSION: 3
NSISDEF: /DQT6 NSISDEF: /DQT6
install: install:
@ -34,8 +37,8 @@ build_script:
xcopy lang\*.qm installer\translations\ /sy xcopy lang\*.qm installer\translations\ /sy
xcopy icons\symbols installer\symbols /i xcopy icons\symbols installer\symbols /i
copy licence.txt installer copy licence.txt installer
copy %OPENSSLDIR%\libcrypto-1_1-x64.dll installer copy %OPENSSLDIR%\libcrypto-%OPENSSLVERSION%-x64.dll installer
copy %OPENSSLDIR%\libssl-1_1-x64.dll installer copy %OPENSSLDIR%\libssl-%OPENSSLVERSION%-x64.dll installer
makensis.exe %NSISDEF% installer\gpxsee64.nsi makensis.exe %NSISDEF% installer\gpxsee64.nsi

5
pkg/windows/gpxsee64.nsi
View File

@ -302,8 +302,13 @@ Section "OpenSSL" SEC_OPENSSL
SectionIn RO SectionIn RO
!ifdef QT6
File "libcrypto-3-x64.dll"
File "libssl-3-x64.dll"
!else
File "libcrypto-1_1-x64.dll" File "libcrypto-1_1-x64.dll"
File "libssl-1_1-x64.dll" File "libssl-1_1-x64.dll"
!endif
SectionEnd SectionEnd