r300g: fix up buffer emission ordering.

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 8e063e280780baeb32f2009a40f6849a037efccb..5f6933eadff31ae193ab55899978c46c6984b859 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -46,7 +46,7 @@ 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', 'svga', 'i915', 'i965', 'cell', 'trace', 'r300', 'identity', 'llvmpipe']))
+                     ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe']))
 opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
                      ['xlib', 'vmware', 'intel', 'i965', 'gdi', 'radeon']))
 
@@ -97,6 +97,9 @@ env.Append(CPPPATH = [
        '#/src/gallium/drivers',
 ])
 
+if env['msvc']:
+    env.Append(CPPPATH = ['#include/c99'])
+
 
 # Posix
 if platform in ('posix', 'linux', 'freebsd', 'darwin'):
@@ -166,15 +169,18 @@ if env['platform'] != common.default_platform:
     host_env = Environment(
         # options are ignored
         # default tool is used
+        tools = ['default', 'custom'],
         toolpath = ['#scons'], 
         ENV = os.environ,
     )
 
     host_env['platform'] = common.default_platform
+    host_env['machine'] = common.default_machine
+    host_env['debug'] = env['debug']
 
     SConscript(
         'src/glsl/SConscript',
-        variant_dir = env['build'] + '/host',
+        variant_dir = os.path.join(env['build'], 'host'),
         duplicate = 0, # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
         exports={'env':host_env},
     )
@@ -184,3 +190,9 @@ SConscript(
        variant_dir = env['build'],
        duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )
+
+SConscript(
+       'progs/SConscript',
+       variant_dir = os.path.join('progs', env['build']),
+       duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
+)