diff options
| author | José Fonseca <jfonseca@vmware.com> | 2013-03-13 13:13:08 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2013-03-13 13:13:37 +0000 |
| commit | cff70dcfb2c6d2ad220b1d8f1fd781c1e39ad995 (patch) | |
| tree | 02bad4eab79a1bf7c0bff4b286d80622c1399709 | |
| parent | a6bb7a94957468453c436e3860ee2dd47575c461 (diff) | |
scons: Define PACKAGE_VERSION/BUGREPORT globally.
Fixes the scons build.
| -rw-r--r-- | SConstruct | 5 | ||||
| -rw-r--r-- | src/gallium/state_trackers/vega/SConscript | 1 | ||||
| -rw-r--r-- | src/mesa/SConscript | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct index 4a3fef08059..1807ff83539 100644 --- 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 0a422316bf4..394eaffe7bd 100644 --- 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 3502e3067ce..ca9b70bad93 100644 --- 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 |