Another build tweak

bigfug · Mar 3, 2024 · 93bfe6e · 93bfe6e
1 parent 05341f9
commit 93bfe6e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -118,20 +118,21 @@ find_package( OpenSSL )
 if( OPENSSL_FOUND )
     message( "OpenSSL: ${OPENSSL_VERSION}" )
 
-	find_package(Qt6 COMPONENTS Core QUIET)
-
-	if (Qt6_FOUND)
-		install( FILES
-			${OPENSSL_ROOT_DIR}/bin/libcrypto-3-x64.dll
-			${OPENSSL_ROOT_DIR}/bin/libssl-3-x64.dll
-			DESTINATION ${PATH_APP} )
-	else()
-		install( FILES
-			${OPENSSL_ROOT_DIR}/bin/libcrypto-1_1-x64.dll
-			${OPENSSL_ROOT_DIR}/bin/libssl-1_1-x64.dll
-			DESTINATION ${PATH_APP} )
+	if( WIN32 )
+		find_package(Qt6 COMPONENTS Core QUIET)
+
+		if (Qt6_FOUND)
+			install( FILES
+				${OPENSSL_ROOT_DIR}/bin/libcrypto-3-x64.dll
+				${OPENSSL_ROOT_DIR}/bin/libssl-3-x64.dll
+				DESTINATION ${PATH_APP} )
+		else()
+			install( FILES
+				${OPENSSL_ROOT_DIR}/bin/libcrypto-1_1-x64.dll
+				${OPENSSL_ROOT_DIR}/bin/libssl-1_1-x64.dll
+				DESTINATION ${PATH_APP} )
+		endif()
 	endif()
-
 endif()
 
 #------------------------------------------------------------------------------

diff --git a/FugioLib/globalprivate.cpp b/FugioLib/globalprivate.cpp
@@ -91,7 +91,11 @@ void GlobalPrivate::loadPlugins( QDir pDir )
 
 	qInfo() << "Adding DLL search path:" << LibsPath;
 
+#ifdef UNICODE
 	SetDllDirectory( (LPCWSTR)LibsPath.utf16() );
+#else
+	SetDllDirectory( (LPCSTR)LibsPath..toStdString().c_str() );
+#endif
 #endif
 
 	mPluginManager.loadPlugins( pDir );