From 5eb2c8c79eb7fe28e99aa0a5065ae65c13b69fed Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 18 Jan 2017 14:03:41 +0100 Subject: [PATCH] never use pkg-config to find opengl on darwin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Jake Petroules --- src/gui/configure.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json index 6f87eb5aed..35741abc86 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -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" } ] },