Mesa (master): scons: Update for xmlpool/options.h generation.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Sat Jan 12 19:13:08 UTC 2013
Module: Mesa
Branch: master
Commit: a3dd1ff45fe73d6edaf6f9ba3ff21476d9be9ba6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3dd1ff45fe73d6edaf6f9ba3ff21476d9be9ba6
Author: José Fonseca <jfonseca at vmware.com>
Date: Sat Jan 12 10:58:31 2013 -0800
scons: Update for xmlpool/options.h generation.
---
src/gallium/state_trackers/dri/drm/SConscript | 1 +
src/gallium/state_trackers/dri/sw/SConscript | 1 +
src/gallium/targets/SConscript.dri | 1 +
src/mesa/drivers/SConscript | 3 +++
src/mesa/drivers/dri/common/xmlpool/SConscript | 14 ++++++++++++++
5 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript
index c63918a..a996f50 100644
--- a/src/gallium/state_trackers/dri/drm/SConscript
+++ b/src/gallium/state_trackers/dri/drm/SConscript
@@ -12,6 +12,7 @@ env.Append(CPPPATH = [
'#/src/mesa',
'#/src/gallium/state_trackers/dri/common',
'#/src/mesa/drivers/dri/common',
+ xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
])
sources = [
diff --git a/src/gallium/state_trackers/dri/sw/SConscript b/src/gallium/state_trackers/dri/sw/SConscript
index d0c3efc..287733e 100644
--- a/src/gallium/state_trackers/dri/sw/SConscript
+++ b/src/gallium/state_trackers/dri/sw/SConscript
@@ -10,6 +10,7 @@ env.Append(CPPPATH = [
'#/src/mesa',
'#/src/gallium/state_trackers/dri/common',
'#/src/mesa/drivers/dri/common',
+ xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
])
env.Append(CPPDEFINES = [('__NOT_HAVE_DRM_H', '1')])
diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri
index 7032373..04c8ec7 100644
--- a/src/gallium/targets/SConscript.dri
+++ b/src/gallium/targets/SConscript.dri
@@ -10,6 +10,7 @@ drienv = env.Clone()
drienv.Replace(CPPPATH = [
'#src/mesa/drivers/dri/common',
+ xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
'#include',
'#include/GL/internal',
'#src/mapi',
diff --git a/src/mesa/drivers/SConscript b/src/mesa/drivers/SConscript
index f1c4da6..6dcc506 100644
--- a/src/mesa/drivers/SConscript
+++ b/src/mesa/drivers/SConscript
@@ -5,5 +5,8 @@ SConscript('osmesa/SConscript')
if env['x11']:
SConscript('x11/SConscript')
+if env['drm']:
+ SConscript('dri/common/xmlpool/SConscript')
+
if env['platform'] == 'windows':
SConscript('windows/gdi/SConscript')
diff --git a/src/mesa/drivers/dri/common/xmlpool/SConscript b/src/mesa/drivers/dri/common/xmlpool/SConscript
new file mode 100644
index 0000000..fa42554
--- /dev/null
+++ b/src/mesa/drivers/dri/common/xmlpool/SConscript
@@ -0,0 +1,14 @@
+Import('*')
+
+from sys import executable as python_cmd
+
+LOCALEDIR = env.Dir('.').srcnode().abspath
+
+xmlpool_options, = env.CodeGenerate(
+ target = 'options.h',
+ script = 'gen_xmlpool.py',
+ source = ['t_options.h'],
+ command = python_cmd + ' $SCRIPT $SOURCE ' + LOCALEDIR + ' > $TARGET'
+)
+
+Export('xmlpool_options')
More information about the mesa-commit
mailing list