X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=ef71ab69c3844cd0a3837f76f34d639ea460cd79;hb=6a7ca4ef2cd3f39d3b5e77051cb3f3175e9e60df;hp=4a3fef0805942f904618ebcff889dcc41b408d0f;hpb=b11566260778bb35f4f6e9dc9bc3470ee99b3557;p=mesa.git

diff --git a/SConstruct b/SConstruct
index 4a3fef08059..ef71ab69c38 100644
--- a/SConstruct
+++ b/SConstruct
@@ -59,16 +59,16 @@ 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', '\\"%s\\"' % mesa_version),
+    ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'),
+])
+
 # Includes
 env.Prepend(CPPPATH = [
 	'#/include',
@@ -80,9 +80,6 @@ env.Append(CPPPATH = [
 	'#/src/gallium/winsys',
 ])
 
-if env['msvc']:
-    env.Append(CPPPATH = ['#include/c99'])
-
 # for debugging
 #print env.Dump()
 
@@ -115,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')