diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-08-25 15:39:05 +0200 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2009-08-25 15:39:05 +0200 |
| commit | d22bd1421cdfa1900df5b76e6f862596bdd11074 (patch) | |
| tree | 708a0907eafe1cbe0cb5989149a89aa38878e2ed | |
| parent | 418cdc66ec10c1f3005320ab46404b907c30e37d (diff) | |
Add support for building the Xorg state tracker with scons.
scons ... statetrackers=xorg
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | src/gallium/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xorg/SConscript | 26 |
3 files changed, 28 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 4a0fb94deb..59d05bc54f 100644 --- 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 32b7c2980a..89c69d7205 100644 --- 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 index 0000000000..15ebcf8673 --- /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') |