scons: Update for xmlpool/options.h generation.

diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript
index c63918a0e187ed60a90f8d6b8c16a84366043dcf..a996f50bf2d4e54669df3845bdaedb9ac925e5c1 100644 (file)
--- 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 d0c3efc6faa39d613578abf146c24e07443dcc9c..287733eea62ad4e3583e282663bf764ca675616c 100644 (file)
--- 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 7032373a6abb6aa69efa565e7c46e0dea20c9a41..04c8ec789f83b762b2c93bf469785b0f5f0d780f 100644 (file)
--- 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 f1c4da6b86c9e471fbf6c9da9551b6546e824c96..6dcc50655016439e6cbe27724d340c15511a1adb 100644 (file)
--- 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 (file)
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')