diff options
| author | Martchus | 2018-09-25 15:26:21 +0200 |
|---|---|---|
| committer | Martchus | 2018-09-25 15:26:21 +0200 |
| commit | c1312e3ce7592b30f5454345d5ae8a61302b8ef3 (patch) | |
| tree | 6d543ec39c6ae16aa08e726a348887e44caaabc5 /0020-Use-.dll.a-as-import-lib-extension.patch | |
| parent | a9a3809bbbaab4f9db7fdc97314268df3641902c (diff) | |
| download | aur-c1312e3ce7592b30f5454345d5ae8a61302b8ef3.tar.gz | |
Update to 5.11.2
Diffstat (limited to '0020-Use-.dll.a-as-import-lib-extension.patch')
| -rw-r--r-- | 0020-Use-.dll.a-as-import-lib-extension.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0020-Use-.dll.a-as-import-lib-extension.patch b/0020-Use-.dll.a-as-import-lib-extension.patch index e55598e55a29..6649f9a6655f 100644 --- a/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/0020-Use-.dll.a-as-import-lib-extension.patch @@ -1,7 +1,7 @@ -From d3a0f355335aa086e2663d634f2f41766f1bcdd6 Mon Sep 17 00:00:00 2001 +From 75c9cbfab1967e472ced8730e561b062a30c4d9d 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 +Subject: [PATCH 20/33] Use *.dll.a as import lib extension The variables used here are provided by mingw-w64 specific mkspec @@ -27,7 +27,7 @@ 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 737f3abc3a..2e6d5d94a9 100644 +index dec0931bd4..cd64cb0c4f 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -80,10 +80,14 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg) @@ -64,5 +64,5 @@ index 737f3abc3a..2e6d5d94a9 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.18.0 +2.19.0 |