Add support for building the Xorg state tracker with scons.

scons ... statetrackers=xorg

diff --git a/SConstruct b/SConstruct
index 4a0fb94debc9fbbf2e5a99263355cf398e32f381..59d05bc54fed3c47d4296b6db99633eca00710cc 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -44,7 +44,7 @@ else:
 opts = Variables('config.py')
 common.AddOptions(opts)
 opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
-                     ['mesa', 'python']))
+                     ['mesa', 'python', 'xorg']))
 opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
                      ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace', 'r300', 'identity']))
 opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 32b7c2980ab7bd433a89c6b5554fb439164e6ef8..89c69d7205e533fd4440e131974c8cf22cf11388 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -31,6 +31,7 @@ for driver in env['drivers']:
 SConscript('state_trackers/python/SConscript')
 SConscript('state_trackers/glx/xlib/SConscript')
 SConscript('state_trackers/dri/SConscript')
+SConscript('state_trackers/xorg/SConscript')
 
 if platform == 'windows':
        SConscript('state_trackers/wgl/SConscript')

diff --git a/src/gallium/state_trackers/xorg/SConscript b/src/gallium/state_trackers/xorg/SConscript
new file mode 100644 (file)
index 0000000..15ebcf8
--- /dev/null
+++ b/src/gallium/state_trackers/xorg/SConscript
@@ -0,0 +1,26 @@
+#######################################################################
+# SConscript for xorg state_tracker
+
+Import('*')
+
+if 'xorg' in env['statetrackers']:
+
+    env = env.Clone()
+
+    env.Append(CPPPATH = [
+       '#/src/mesa',
+    ])
+
+    env.ParseConfig('pkg-config --cflags --libs xorg-server')
+
+    st_xorg = env.ConvenienceLibrary(
+       target = 'st_xorg',
+       source = [ 'xorg_composite.c',
+               'xorg_crtc.c',
+               'xorg_dri2.c',
+               'xorg_driver.c',
+               'xorg_exa.c',
+               'xorg_output.c',
+               ]
+    )
+    Export('st_xorg')