whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

never use pkg-config to find opengl on darwin 

with homebrew, etc., this would find the opengl packaged with x11, which
is not suitable for use with cocoa.

Change-Id: I8390e1ac32c58f6644d6ef3978bdc6da9d111e79
Reviewed-by: René J.V. Bertin <rjvbertin@gmail.com>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
bb10
Oswald Buddenhagen 2017-01-18 14:03:41 +01:00
parent 015b53e9b4
commit 5eb2c8c79e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/configure.json
View File

@ -181,7 +181,7 @@
"label": "Desktop OpenGL",
"test": "unix/opengldesktop",
"sources": [
{ "type": "pkgConfig", "args": "gl" },
{ "type": "pkgConfig", "args": "gl", "condition": "!config.darwin" },
{ "type": "makeSpec", "spec": "OPENGL" }
]
},
@ -189,7 +189,7 @@
"label": "OpenGL ES 2.0",
"test": "unix/opengles2",
"sources": [
{ "type": "pkgConfig", "args": "glesv2" },
{ "type": "pkgConfig", "args": "glesv2", "condition": "!config.darwin" },
{ "type": "makeSpec", "spec": "OPENGL_ES2" }
]
},