Merge remote-tracking branch 'origin/master' into pipe-video

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 19d8b13ccc939195d0252e81156d633a598784cd..8607d2cd8e0ab726039d02202e067c158ae75ff4 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -150,7 +150,12 @@ if env['crosscompile'] and env['platform'] != 'embedded':
     host_env['hostonly'] = True
     assert host_env['crosscompile'] == False
 
-    Export(env = host_env)
+    if host_env['msvc']:
+        host_env.Append(CPPPATH = ['#include/c99'])
+
+    target_env = env
+    env = host_env
+    Export('env')
 
     SConscript(
         'src/SConscript',
@@ -158,6 +163,8 @@ if env['crosscompile'] and env['platform'] != 'embedded':
         duplicate = 0, # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
     )
 
+    env = target_env
+
 Export('env')
 
 #######################################################################