From 9db7b12cb283b915865d99d2fd3356af0662a18e Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 19 Jan 2015 12:54:44 -0800 Subject: scons: Add X11 include path if X11 is available. Mac OS X XQuartz places X11 headers at /opt/X11/include. This patch fixes this Mac OS X SCons build error. Compiling src/gallium/state_trackers/glx/xlib/glx_api.c ... In file included from src/gallium/state_trackers/glx/xlib/glx_api.c:34: include/GL/glx.h:30:10: fatal error: 'X11/Xlib.h' file not found ^ Signed-off-by: Vinson Lee Reviewed-by: Emil Velikov --- scons/gallium.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scons') diff --git a/scons/gallium.py b/scons/gallium.py index 8e2090bc678..51955087125 100755 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -624,6 +624,9 @@ def generate(env): env.PkgCheckModules('DRM', ['libdrm >= 2.4.38']) env.PkgCheckModules('UDEV', ['libudev >= 151']) + if env['x11']: + env.Append(CPPPATH = env['X11_CPPPATH']) + env['dri'] = env['x11'] and env['drm'] # for debugging -- cgit v1.2.3