diff options
Diffstat (limited to '0019-Use-.dll.a-as-import-lib-extension.patch')
| -rw-r--r-- | 0019-Use-.dll.a-as-import-lib-extension.patch | 56 |
1 files changed, 39 insertions, 17 deletions
diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch index 6626db504f38..22c9f9f0c371 100644 --- a/0019-Use-.dll.a-as-import-lib-extension.patch +++ b/0019-Use-.dll.a-as-import-lib-extension.patch @@ -1,23 +1,23 @@ -From 7c2c449e7d286be7aa1df1494e19ec1c3130792d Mon Sep 17 00:00:00 2001 +From 2baddbdcdde10ac0610bfd81b37020f174561dc3 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:26:18 +0200 -Subject: [PATCH 19/33] Use *.dll.a as import lib extension +Subject: [PATCH 19/32] Use *.dll.a as import lib extension The variables used here are provided by g++-win32.conf -Change-Id: I40acb56685628ed52b3e6b89aab7f53f9a872b1a +Change-Id: Ic8915ea40b4db3d9f60533d21daf8ff1ec1bd803 --- - mkspecs/features/create_cmake.prf | 5 +++-- - mkspecs/features/qt.prf | 15 ++++++++++++--- - qmake/generators/win32/winmakefile.cpp | 15 +++++++++++---- - 3 files changed, 26 insertions(+), 9 deletions(-) + mkspecs/features/create_cmake.prf | 5 ++-- + mkspecs/features/qt.prf | 38 ++++++++++---------------- + qmake/generators/win32/winmakefile.cpp | 15 +++++++--- + 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 593161f362..37689938eb 100644 +index 6cd94f8058..ac089a2f9f 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -332,8 +332,9 @@ mac { +@@ -339,8 +339,9 @@ mac { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a @@ -30,20 +30,37 @@ index 593161f362..37689938eb 100644 CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 2bc7b1dedd..b79b324b88 100644 +index 8096d01c34..b79b324b88 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -216,12 +216,21 @@ for(ever) { +@@ -215,32 +215,22 @@ for(ever) { + # Linking frameworks by absolute path does not work. LIBS$$var_sfx += -framework $$framework } else { - lib = $$MODULE_MODULE$$qtPlatformTargetSuffix() +- candidates = $$MODULE_MODULE$$qtPlatformTargetSuffix() +- darwin: candidates *= $$MODULE_MODULE - win32|contains(MODULE_CONFIG, staticlib) { +- lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB +- lib_suffix = $$QMAKE_EXTENSION_STATICLIB +- add_lib_to_pretargetdeps = true ++ lib = $$MODULE_MODULE$$qtPlatformTargetSuffix() + contains(MODULE_CONFIG, staticlib) { - lib = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB$${lib}.$$QMAKE_EXTENSION_STATICLIB - PRE_TARGETDEPS += $$lib ++ lib = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB$${lib}.$$QMAKE_EXTENSION_STATICLIB ++ PRE_TARGETDEPS += $$lib } else { -- lib = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB$${lib}.$$QMAKE_EXTENSION_SHLIB +- lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB +- lib_suffix = $$QMAKE_EXTENSION_SHLIB +- add_lib_to_pretargetdeps = false - } +- lib_missing = true +- lib_fallback = +- for(lib_base, candidates) { +- lib = $${lib_prefix}$${lib_base}.$${lib_suffix} +- isEmpty(lib_fallback): \ +- lib_fallback = $$lib +- exists($$lib) { +- lib_missing = false +- break() + win32 { + shared|actually_a_shared_build { + lib = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB$${lib}.$$QMAKE_EXTENSION_IMPORTLIB @@ -53,7 +70,12 @@ index 2bc7b1dedd..b79b324b88 100644 + PRE_TARGETDEPS += $$lib + } else { + lib = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB$${lib}.$$QMAKE_EXTENSION_SHLIB -+ } + } +- } +- $$lib_missing: \ +- lib = $$lib_fallback +- $$add_lib_to_pretargetdeps: \ +- PRE_TARGETDEPS += $$lib + } LIBS$$var_sfx += $$lib } @@ -94,5 +116,5 @@ index 183cef2908..03732df4a8 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.36.1 +2.37.3 |