qtwinextras: replace patch with qmake argument

This commit is contained in:
Mark Brand 2018-05-23 12:40:23 +02:00
parent 80f8a77232
commit 1ca73a8a11
2 changed files with 3 additions and 28 deletions

View File

@ -1,27 +0,0 @@
This file is part of MXE. See LICENSE.md for licensing information.
From 9aad92fdf482f1a38360559586db9ee2df5d9fc4 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 29 Jan 2017 20:27:29 +0100
Subject: [PATCH] build fix for MXE
Needed for the shared build. In the static build, gdi32 is probably brought in as a transitive dependency.
Change-Id: Ic0b1ab49cfb04559823c7446bda197b34ea15f54
diff --git a/src/winextras/winextras.pro b/src/winextras/winextras.pro
index 5d93c6b..4c423b0 100644
--- a/src/winextras/winextras.pro
+++ b/src/winextras/winextras.pro
@@ -45,7 +45,7 @@ HEADERS += \
QMAKE_DOCS = $$PWD/doc/qtwinextras.qdocconf
-LIBS_PRIVATE += -lole32 -lshlwapi -lshell32 -ldwmapi
+LIBS_PRIVATE += -lole32 -lshlwapi -lshell32 -ldwmapi -lgdi32
win32:!qtHaveModule(opengl)|qtConfig(dynamicgl):LIBS_PRIVATE += -lgdi32
OTHER_FILES += \
--
2.9.3

View File

@ -16,7 +16,9 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' \
-after \
'LIBS_PRIVATE += -lgdi32'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
endef