Mesa (master): scons: Restore x11 tool behavior for backwards compatability .
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Mon Nov 1 14:38:31 UTC 2010
Module: Mesa
Branch: master
Commit: 0fd41d236fc3e9411180aa4978c021037ba5bbd9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0fd41d236fc3e9411180aa4978c021037ba5bbd9
Author: José Fonseca <jfonseca at vmware.com>
Date: Mon Nov 1 14:37:18 2010 +0000
scons: Restore x11 tool behavior for backwards compatability.
---
scons/x11.py | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/scons/x11.py b/scons/x11.py
index 7368618..99bf079 100644
--- a/scons/x11.py
+++ b/scons/x11.py
@@ -29,12 +29,24 @@ Tool-specific initialization for X11
def generate(env):
- # XXX: backwards compatability only
- pass
+ env.Append(CPPPATH = ['/usr/X11R6/include'])
+ env.Append(LIBPATH = ['/usr/X11R6/lib'])
+
+ env.Append(LIBS = [
+ 'X11',
+ 'Xext',
+ 'Xxf86vm',
+ 'Xdamage',
+ 'Xfixes',
+ ])
def exists(env):
- return True
+ # TODO: actually detect the presence of the headers
+ if env['platform'] in ('linux', 'freebsd', 'darwin'):
+ return True
+ else:
+ return False
# vim:set ts=4 sw=4 et:
More information about the mesa-commit
mailing list