blob: f2923c864e292d486e345ad3a82eb744e12bdbfe (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From c139872c275f2bb62558b113048f0f3e54997d94 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 5 Nov 2016 12:46:27 +0100
Subject: [PATCH 8/9] Link against ANGLE even if Qt is configured not to
---
Source/WebCore/WebCore.pri | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
index ddad897be..f69e22492 100644
--- a/Source/WebCore/WebCore.pri
+++ b/Source/WebCore/WebCore.pri
@@ -215,15 +215,11 @@ enable?(WEB_AUDIO) {
use?(3D_GRAPHICS) {
win32: {
mingw: {
- # Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols
- contains(QT_CONFIG, opengles2) {
- CONFIG(debug, debug|release):contains(QT_CONFIG, angle) {
- LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG
- } else {
- LIBS += $$QMAKE_LIBS_OPENGL_ES2
- }
+ # Always link against ANGLE
+ CONFIG(debug, debug|release):contains(QT_CONFIG, angle) {
+ LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG
} else {
- LIBS += $$QMAKE_LIBS_OPENGL
+ LIBS += $$QMAKE_LIBS_OPENGL_ES2
}
}
} else {
--
2.11.0
|