X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=ef71ab69c3844cd0a3837f76f34d639ea460cd79;hb=e3420396124c75ec9679c4d1cf3a42c185207e5a;hp=1807ff8353984f38396516634daeb0fdacaafb14;hpb=cff70dcfb2c6d2ad220b1d8f1fd781c1e39ad995;p=mesa.git

diff --git a/SConstruct b/SConstruct
index 1807ff83539..ef71ab69c38 100644
--- a/SConstruct
+++ b/SConstruct
@@ -59,18 +59,13 @@ 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
 
+with open("VERSION") as f:
+  mesa_version = f.read().strip()
 env.Append(CPPDEFINES = [
-    ('PACKAGE_VERSION', '\\"9.2-devel\\"'),
+    ('PACKAGE_VERSION', '\\"%s\\"' % mesa_version),
     ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'),
 ])
 
@@ -85,9 +80,6 @@ env.Append(CPPPATH = [
 	'#/src/gallium/winsys',
 ])
 
-if env['msvc']:
-    env.Append(CPPPATH = ['#include/c99'])
-
 # for debugging
 #print env.Dump()
 
@@ -120,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')