Mesa (master): scons: Fix libGL.so build.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Tue Jan 10 17:42:50 UTC 2012
Module: Mesa
Branch: master
Commit: f9b2d2fea586f772551abbb675970b71b2fdf8c9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9b2d2fea586f772551abbb675970b71b2fdf8c9
Author: José Fonseca <jfonseca at vmware.com>
Date: Tue Jan 10 17:42:02 2012 +0000
scons: Fix libGL.so build.
---
scons/gallium.py | 1 +
src/glx/SConscript | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/scons/gallium.py b/scons/gallium.py
index 3cebaf5..221d184 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -507,6 +507,7 @@ def generate(env):
createInstallMethods(env)
env.PkgCheckModules('X11', ['x11', 'xext', 'xdamage', 'xfixes'])
+ env.PkgCheckModules('XCB', ['x11-xcb', 'xcb-glx'])
env.PkgCheckModules('XF86VIDMODE', ['xxf86vm'])
env.PkgCheckModules('DRM', ['libdrm'])
env.PkgCheckModules('DRM_INTEL', ['libdrm_intel'])
diff --git a/src/glx/SConscript b/src/glx/SConscript
index fc8ad77..5e9d1ca 100644
--- a/src/glx/SConscript
+++ b/src/glx/SConscript
@@ -24,6 +24,7 @@ env.Prepend(LIBS = [
])
env.PkgUseModules('X11')
+env.PkgUseModules('XCB')
env.PkgUseModules('DRM')
if env['HAVE_XF86VIDMODE']:
@@ -35,8 +36,10 @@ if False: # XXX: SHARED_GLAPI
sources = [
'clientattrib.c',
+ 'create_context.c',
'compsize.c',
'eval.c',
+ 'glx_error.c',
'glxconfig.c',
'glxcmds.c',
'glxcurrent.c',
More information about the mesa-commit
mailing list