Merge remote-tracking branch 'mesa-public/master' into vulkan

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index de735e94c34f18713d5aaa42535ea35153317663..ef71ab69c3844cd0a3837f76f34d639ea460cd79 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -59,13 +59,6 @@ else:
 
 Help(opts.GenerateHelpText(env))
 
-# fail early for a common error on windows
-if env['gles']:
-    try:
-        import libxml2
-    except ImportError:
-        raise SCons.Errors.UserError, "GLES requires libxml2-python to build"
-
 #######################################################################
 # Environment setup
 
@@ -87,9 +80,6 @@ env.Append(CPPPATH = [
        '#/src/gallium/winsys',
 ])
 
-if env['msvc']:
-    env.Append(CPPPATH = ['#include/c99'])
-
 # for debugging
 #print env.Dump()
 
@@ -122,9 +112,6 @@ if env['crosscompile'] and not env['embedded']:
     host_env['hostonly'] = True
     assert host_env['crosscompile'] == False
 
-    if host_env['msvc']:
-        host_env.Append(CPPPATH = ['#include/c99'])
-
     target_env = env
     env = host_env
     Export('env')