From 4aac32998c2b173b84aec0b020aa086fef4b1423 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 16 Aug 2012 14:48:54 +0200
Subject: libxcb xserver mesa git update 16 Aug 2012
---
mesalib/scons/custom.py | 4 ++++
mesalib/scons/gallium.py | 4 ++++
mesalib/scons/source_list.py | 5 ++++-
3 files changed, 12 insertions(+), 1 deletion(-)
(limited to 'mesalib/scons')
diff --git a/mesalib/scons/custom.py b/mesalib/scons/custom.py
index cc953bd99..43e7727aa 100644
--- a/mesalib/scons/custom.py
+++ b/mesalib/scons/custom.py
@@ -235,6 +235,10 @@ def parse_source_list(env, filename, names=None):
# parse the source list file
parser = source_list.SourceListParser()
src = env.File(filename).srcnode()
+
+ parser.add_symbol('top_srcdir', env.Dir('#').abspath)
+ parser.add_symbol('top_builddir', env['build_dir'])
+
sym_table = parser.parse(src.abspath)
if names:
diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py
index f4776d83d..8fc17b3fa 100644
--- a/mesalib/scons/gallium.py
+++ b/mesalib/scons/gallium.py
@@ -298,6 +298,10 @@ def generate(env):
cppdefines += ['BEOS_THREADS']
if env['embedded']:
cppdefines += ['PIPE_SUBSYSTEM_EMBEDDED']
+ if env['texture_float']:
+ print 'warning: Floating-point textures enabled.'
+ print 'warning: Please consult docs/patents.txt with your lawyer before building Mesa.'
+ cppdefines += ['TEXTURE_FLOAT_ENABLED']
env.Append(CPPDEFINES = cppdefines)
# C compiler options
diff --git a/mesalib/scons/source_list.py b/mesalib/scons/source_list.py
index 8111f4318..e16d1f9b6 100644
--- a/mesalib/scons/source_list.py
+++ b/mesalib/scons/source_list.py
@@ -13,6 +13,7 @@ The goal is to allow Makefile's and SConscript's to share source listing.
class SourceListParser(object):
def __init__(self):
+ self.symbol_table = {}
self._reset()
def _reset(self, filename=None):
@@ -20,7 +21,6 @@ class SourceListParser(object):
self.line_no = 1
self.line_cont = ''
- self.symbol_table = {}
def _error(self, msg):
raise RuntimeError('%s:%d: %s' % (self.filename, self.line_no, msg))
@@ -125,3 +125,6 @@ class SourceListParser(object):
raise
return self.symbol_table
+
+ def add_symbol(self, name, value):
+ self.symbol_table[name] = value
--
cgit v1.2.3