diff options
Diffstat (limited to '0020-Use-.dll.a-as-import-lib-extension.patch')
| -rw-r--r-- | 0020-Use-.dll.a-as-import-lib-extension.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/0020-Use-.dll.a-as-import-lib-extension.patch b/0020-Use-.dll.a-as-import-lib-extension.patch deleted file mode 100644 index 3fe7ac9253e0..000000000000 --- a/0020-Use-.dll.a-as-import-lib-extension.patch +++ /dev/null @@ -1,66 +0,0 @@ -From cf9f7a67dedc858d1f8b1e16747a31747787cb4e Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Sun, 18 Sep 2016 18:26:18 +0200 -Subject: [PATCH 20/34] Use *.dll.a as import lib extension - -The variables used here are provided by -mingw-w64 specific mkspec ---- - mkspecs/features/create_cmake.prf | 5 +++-- - qmake/generators/win32/winmakefile.cpp | 15 +++++++++++---- - 2 files changed, 14 insertions(+), 6 deletions(-) - -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index e67917cc96..2a94964b49 100644 ---- a/mkspecs/features/create_cmake.prf -+++ b/mkspecs/features/create_cmake.prf -@@ -238,8 +238,9 @@ mac { - CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl - CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl - } else { -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -+ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a -+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.$${QMAKE_EXTENSION_IMPORTLIB} -+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} - } - } else { - CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib -diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 87157f31ae..4592fed7b2 100644 ---- a/qmake/generators/win32/winmakefile.cpp -+++ b/qmake/generators/win32/winmakefile.cpp -@@ -80,9 +80,13 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg) - bool - Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) - { -- ProStringList impexts = project->values("QMAKE_LIB_EXTENSIONS"); -- if (impexts.isEmpty()) -- impexts = project->values("QMAKE_EXTENSION_STATICLIB"); -+ ProStringList impexts; -+ if (project->isActiveConfig("staticlib")) { -+ impexts.append(project->values("QMAKE_EXTENSION_STATICLIB")); -+ } else { -+ impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB")); -+ impexts.append(project->values("QMAKE_EXTENSION_STATICLIB")); -+ } - QList<QMakeLocalFileName> dirs; - for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) - dirs.append(QMakeLocalFileName(dlib.toQString())); -@@ -255,9 +259,12 @@ void Win32MakefileGenerator::fixTargetExt() - if (!project->values("QMAKE_APP_FLAG").isEmpty()) { - project->values("TARGET_EXT").append(".exe"); - } else if (project->isActiveConfig("shared")) { -+ ProString impext = project->first("QMAKE_EXTENSION_IMPORTLIB"); -+ if (impext.isEmpty()) -+ impext = project->first("QMAKE_PREFIX_STATICLIB"); - project->values("LIB_TARGET").prepend(project->first("QMAKE_PREFIX_STATICLIB") - + project->first("TARGET") + project->first("TARGET_VERSION_EXT") -- + '.' + project->first("QMAKE_EXTENSION_STATICLIB")); -+ + '.' + impext); - project->values("TARGET_EXT").append(project->first("TARGET_VERSION_EXT") + "." - + project->first("QMAKE_EXTENSION_SHLIB")); - project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); --- -2.21.0 - |