diff options
author | Martchus | 2019-02-05 21:22:01 +0100 |
---|---|---|
committer | Martchus | 2019-02-05 21:22:01 +0100 |
commit | b09d72afed69584884f0784e2bd58872cc3fa911 (patch) | |
tree | 4c6075aa5a6920a20b0fc3a698d0a76ca2e91585 /0020-Use-.dll.a-as-import-lib-extension.patch | |
parent | 8cb0a8e8891db5cb17bf0225b243a6983519e19e (diff) | |
download | aur-b09d72afed69584884f0784e2bd58872cc3fa911.tar.gz |
Update to 5.12.1
Diffstat (limited to '0020-Use-.dll.a-as-import-lib-extension.patch')
-rw-r--r-- | 0020-Use-.dll.a-as-import-lib-extension.patch | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/0020-Use-.dll.a-as-import-lib-extension.patch b/0020-Use-.dll.a-as-import-lib-extension.patch index bd08de63a059..e6b4ff5d472c 100644 --- a/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/0020-Use-.dll.a-as-import-lib-extension.patch @@ -1,14 +1,14 @@ -From 47c3ea27e0aba1475c450dcc590f01846b054a07 Mon Sep 17 00:00:00 2001 +From 5e28a49dd99a5b682fcc9cd78985fc138a1cbc2f Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:26:18 +0200 -Subject: [PATCH 20/33] Use *.dll.a as import lib extension +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 | 17 ++++++++++++----- - 2 files changed, 15 insertions(+), 7 deletions(-) + 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 @@ -27,29 +27,27 @@ index e67917cc96..2a94964b49 100644 } 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 37eee7fca3..59b394ca51 100644 +index 87157f31ae..4592fed7b2 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp -@@ -80,10 +80,14 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg) +@@ -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"); -- QList<QMakeLocalFileName> dirs; -+ 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; - static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE", - "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr }; - for (int i = 0; lflags[i]; i++) { -@@ -253,9 +257,12 @@ void Win32MakefileGenerator::fixTargetExt() ++ 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")) { |