vmware/xorg: Do buffer round-robin logic differently

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index e9baab0947b1fe056fdf3e8aedfe7d32a887f71e..455b4719db91d8a839eb872468c9269149638b13 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -32,10 +32,10 @@ import common
 default_statetrackers = 'mesa'
 
 if common.default_platform in ('linux', 'freebsd', 'darwin'):
-       default_drivers = 'softpipe,failover,i915simple,trace,identity,llvmpipe'
+       default_drivers = 'softpipe,failover,svga,i915,trace,identity,llvmpipe'
        default_winsys = 'xlib'
 elif common.default_platform in ('winddk',):
-       default_drivers = 'softpipe,i915simple,trace,identity'
+       default_drivers = 'softpipe,svga,i915,trace,identity'
        default_winsys = 'all'
 else:
        default_drivers = 'all'
@@ -46,9 +46,9 @@ common.AddOptions(opts)
 opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
                      ['mesa', 'python', 'xorg']))
 opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
-                     ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace', 'r300', 'identity', 'llvmpipe']))
+                     ['softpipe', 'failover', 'svga', 'i915', 'cell', 'trace', 'r300', 'identity', 'llvmpipe']))
 opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
-                     ['xlib', 'intel', 'gdi', 'radeon']))
+                     ['xlib', 'vmware', 'intel', 'gdi', 'radeon']))
 
 opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
 
@@ -110,6 +110,8 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin'):
                'PTHREADS',
                'HAVE_POSIX_MEMALIGN',
        ])
+       if platform == 'darwin':
+               env.Append(CPPDEFINES = ['_DARWIN_C_SOURCE'])
        env.Append(CPPPATH = ['/usr/X11R6/include'])
        env.Append(LIBPATH = ['/usr/X11R6/lib'])
        env.Append(LIBS = [