summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2012-05-12 17:08:30 +0100
committerJosé Fonseca <[email protected]>2012-05-12 17:10:32 +0100
commit7b49d4f05d8224448835c8e36724241f7d087a90 (patch)
tree13a700e93bca89cc22cd587b9efd134b02a01805 /src/gallium
parent96e73cc4ae1c1f36e05855e6b02cc9c281f921e8 (diff)
scons: Fix missing gbm symbols in st/egl.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/state_trackers/egl/SConscript8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/egl/SConscript b/src/gallium/state_trackers/egl/SConscript
index c04fec637c1..68c77250f90 100644
--- a/src/gallium/state_trackers/egl/SConscript
+++ b/src/gallium/state_trackers/egl/SConscript
@@ -24,6 +24,8 @@ if env['platform'] == 'windows':
env.Append(CPPDEFINES = ['HAVE_GDI_BACKEND'])
sources.append('gdi/native_gdi.c')
else:
+ if env['drm']:
+ env.PkgUseModules('DRM')
if env['x11']:
env.Append(CPPDEFINES = ['HAVE_X11_BACKEND'])
env.Prepend(CPPPATH = [
@@ -36,11 +38,11 @@ else:
'x11/native_ximage.c',
'x11/x11_screen.c',
'x11/glxinit.c'])
- if env['dri']:
+ if env['drm']:
env.Append(CPPDEFINES = ['GLX_DIRECT_RENDERING'])
sources.append(['#/src/glx/dri2.c'])
- if env['drm']:
- env.PkgUseModules('DRM')
+ if env['drm'] and False:
+ # XXX: Disabled as it depends on gbm, which is not yet built with scons
env.Append(CPPDEFINES = ['HAVE_DRM_BACKEND'])
env.Append(CPPPATH = [
'#/src/gbm/main',