scons: Define PACKAGE_VERSION/BUGREPORT globally.

Fixes the scons build.

diff --git a/SConstruct b/SConstruct
index 4a3fef0..1807ff8 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -69,6 +69,11 @@ if env['gles']:
 #######################################################################
 # Environment setup
 
+env.Append(CPPDEFINES = [
+    ('PACKAGE_VERSION', '\\"9.2-devel\\"'),
+    ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'),
+])
+
 # Includes
 env.Prepend(CPPPATH = [
        '#/include',

diff --git a/src/gallium/state_trackers/vega/SConscript b/src/gallium/state_trackers/vega/SConscript
index 0a42231..394eaff 100644 (file)
--- a/src/gallium/state_trackers/vega/SConscript
+++ b/src/gallium/state_trackers/vega/SConscript
@@ -12,7 +12,6 @@ env.Append(CPPPATH = [
     Dir('.'),
 ])
 env.Append(CPPDEFINES = [
-    'PACKAGE_VERSION=',
     'KHRONOS_DLL_EXPORTS',
 ])
 

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 3502e30..ca9b70b 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -21,11 +21,6 @@ env.Append(CPPPATH = [
 enabled_apis = []
 enabled_apis += ['GL']
 
-env.Append(CPPDEFINES = [
-    ('PACKAGE_VERSION', '\\"9.2-devel\\"'),
-    ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'),
-])
-
 if env['platform'] == 'windows':
     env.Append(CPPDEFINES = [
         '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers