diff --git a/Software/dist_windows/script_qt6.iss b/Software/dist_windows/script_qt6.iss index 0114dd60..4b09b97e 100644 --- a/Software/dist_windows/script_qt6.iss +++ b/Software/dist_windows/script_qt6.iss @@ -68,8 +68,8 @@ Source: "content/platforms/*"; DestDir: "{app}\platforms"; Flags: ignoreversion Source: "content/styles/*"; DestDir: "{app}\styles"; Flags: ignoreversion Source: "content/Plugins/*"; DestDir: "{#UserSettingsDirName}\Plugins"; Flags: onlyifdoesntexist createallsubdirs recursesubdirs ; Use ssleay32.dll and libeay32.dll here for OpenSSL < 1.1 -Source: "content/libcrypto-1_1-x64.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "content/libssl-1_1-x64.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "content/libcrypto-3-x64.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "content/libssl-3-x64.dll"; DestDir: "{app}"; Flags: ignoreversion ; These are needed only when including the bass library for sound visualization Source: "content/bass.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "content/basswasapi.dll"; DestDir: "{app}"; Flags: ignoreversion diff --git a/Software/src/src.pro b/Software/src/src.pro index 4fe19050..b5f0b1e4 100644 --- a/Software/src/src.pro +++ b/Software/src/src.pro @@ -142,8 +142,12 @@ win32 { if $(PlatformToolsetVersion) EQU 140 copy /y \"$(VcInstallDir)redist\\$(PlatformTarget)\\Microsoft.VC$(PlatformToolsetVersion).CRT\\vcruntime$(PlatformToolsetVersion).dll\" .\ $$escape_expand(\r\n)\ if $(PlatformToolsetVersion) GTR 140 copy /y \"$(VcInstallDir)Redist\\MSVC\\$(VCToolsRedistVersion)\\$(PlatformTarget)\\Microsoft.VC$(PlatformToolsetVersion).CRT\\vcruntime*.dll\" .\ $$escape_expand(\r\n) !contains(DEFINES, NO_OPENSSL) { - # QT switched to OpenSSL 1.1 in 5.12.4, which has different binary names - versionAtLeast(QT_VERSION, "5.12.4") { + # QT switched to OpenSSL 1.1 in 5.12.4 and to 3.x in 6, which has different binary names + versionAtLeast(QT_VERSION, "6.0.0") { + QMAKE_POST_LINK += copy /y \"$${OPENSSL_DIR}\\libcrypto-3-x64.dll\" .\ $$escape_expand(\r\n)\ + copy /y \"$${OPENSSL_DIR}\\libssl-3-x64.dll\" .\ $$escape_expand(\r\n)\ + IF EXIST \"$${OPENSSL_DIR}\\msvcr*.dll\" copy /y \"$${OPENSSL_DIR}\\msvcr*.dll\" .\ $$escape_expand(\r\n) + } else:versionAtLeast(QT_VERSION, "5.12.4") { QMAKE_POST_LINK += copy /y \"$${OPENSSL_DIR}\\libcrypto-1_1-x64.dll\" .\ $$escape_expand(\r\n)\ copy /y \"$${OPENSSL_DIR}\\libssl-1_1-x64.dll\" .\ $$escape_expand(\r\n)\ IF EXIST \"$${OPENSSL_DIR}\\msvcr*.dll\" copy /y \"$${OPENSSL_DIR}\\msvcr*.dll\" .\ $$escape_expand(\r\n)