Fix OpenSSL3 deployment

psieg · Feb 10, 2024 · 2f21462 · 2f21462
1 parent 7ca6737
commit 2f21462
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/Software/dist_windows/script_qt6.iss b/Software/dist_windows/script_qt6.iss
@@ -66,10 +66,11 @@ Source: "content/prismatik-unhook32.dll"; DestDir: "{app}"; MinVersion: 6.1.7600
 Source: "content/UpdateElevate.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "content/platforms/*"; DestDir: "{app}\platforms"; Flags: ignoreversion
 Source: "content/styles/*"; DestDir: "{app}\styles"; Flags: ignoreversion
+Source: "content/tls/qopensslbackend.dll"; DestDir: "{app}\tls"; 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
+; Use ssleay32.dll and libeay32.dll here for OpenSSL < 1.1, 1_1 instead of 3 for OpenSSL 1.1
+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/LightpackApplication.cpp b/Software/src/LightpackApplication.cpp
@@ -145,7 +145,7 @@ void LightpackApplication::determineConfigDir(QString overrideDir)
 	cout << "Configuration directory: " << appDirPath.toStdString() << endl;
 
 	m_configDirPath = appDirPath;
-	setLibraryPaths(QStringList(appDirPath + QStringLiteral("/plugins")));
+	addLibraryPath(appDirPath + QStringLiteral("/plugins"));
 	setId("Prismatik-" + m_configDirPath);
 }
 

diff --git 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)