diff options
| author | Vinson Lee <vlee@freedesktop.org> | 2015-01-19 12:54:44 -0800 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-01-22 21:29:43 +0000 |
| commit | 9db7b12cb283b915865d99d2fd3356af0662a18e (patch) | |
| tree | 1444aaa572df9828a1480d752e56e7bc8e73b93d /scons | |
| parent | fea35bbf6de48c3995032ee40f1e82094111eef5 (diff) | |
| download | external_mesa3d-9db7b12cb283b915865d99d2fd3356af0662a18e.zip external_mesa3d-9db7b12cb283b915865d99d2fd3356af0662a18e.tar.gz external_mesa3d-9db7b12cb283b915865d99d2fd3356af0662a18e.tar.bz2 | |
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 <vlee@freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'scons')
| -rwxr-xr-x | scons/gallium.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scons/gallium.py b/scons/gallium.py index 8e2090b..5195508 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 |