File 0001-Use-lib-prefix-for-shared-libraries-and-mo... of Package mingw32-libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Use-lib-prefix-for-shared-libraries-and-module-on-Wi.patch of Package mingw32-libqt5-qtbase (Revision 96fdf584bbfba92b7e42b8714b7023ab)

Currently displaying revision 96fdf584bbfba92b7e42b8714b7023ab , Show latest

From 3c64782ce9db2613f84b08160fc87c9f783888e2 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 29 May 2024 09:13:56 +0200
Subject: [PATCH] Use 'lib' prefix for shared libraries and module on Windows
 to be different from msvc

Change-Id: I69be89a96f98761edcc53d4bc2d0a93bf6b4a6f9
---
 mkspecs/common/g++-win32.conf     | 2 +-
 mkspecs/features/create_cmake.prf | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
index c3a1f3a37..21c4cdbc0 100644
--- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf
@@ -52,7 +52,7 @@ equals(QMAKE_HOST.os, Windows) {
 }
 QMAKE_EXT_OBJ           = .o
 QMAKE_EXT_RES           = _res.o
-QMAKE_PREFIX_SHLIB      =
+QMAKE_PREFIX_SHLIB      = lib
 QMAKE_EXTENSION_SHLIB   = dll
 QMAKE_PREFIX_STATICLIB  = lib
 QMAKE_EXTENSION_STATICLIB = a
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 64639f177..1cb567486 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -225,8 +225,8 @@ contains(CONFIG, plugin) {
         CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl
 
         isEmpty(CMAKE_STATIC_TYPE) {
-            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.dll
-            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.dll
+            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$$QMAKE_PREFIX_SHLIB$${CMAKE_QT_STEM}.dll
+            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$$QMAKE_PREFIX_SHLIB$${CMAKE_QT_STEM}$${debug_suffix}.dll
         } else:mingw {
             CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a
             CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a
@@ -325,8 +325,8 @@ mac {
 
     !mingw|qtConfig(debug_and_release): debug_suffix="d"
 
-    CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
-    CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
+    CMAKE_LIB_FILE_LOCATION_DEBUG = $$QMAKE_PREFIX_SHLIB$${CMAKE_QT_STEM}$${debug_suffix}.dll
+    CMAKE_LIB_FILE_LOCATION_RELEASE = $$QMAKE_PREFIX_SHLIB$${CMAKE_QT_STEM}.dll
 
     !isEmpty(CMAKE_STATIC_TYPE) {
         CMAKE_STATIC_WINDOWS_BUILD = "true"
-- 
2.44.0

Places

File 0001-Use-lib-prefix-for-shared-libraries-and-module-on-Wi.patch of Package mingw32-libqt5-qtbase (Revision 96fdf584bbfba92b7e42b8714b7023ab)

Places