summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gallium/state_trackers/dri/drm/SConscript1
-rw-r--r--src/gallium/state_trackers/dri/sw/SConscript1
-rw-r--r--src/gallium/targets/SConscript.dri1
-rw-r--r--src/mesa/drivers/SConscript3
-rw-r--r--src/mesa/drivers/dri/common/xmlpool/SConscript14
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 c63918a0e18..a996f50bf2d 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 d0c3efc6faa..287733eea62 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 7032373a6ab..04c8ec789f8 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 f1c4da6b86c..6dcc5065501 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 00000000000..fa42554d3a5
--- /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')