Module: Mesa Branch: master Commit: cff70dcfb2c6d2ad220b1d8f1fd781c1e39ad995 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cff70dcfb2c6d2ad220b1d8f1fd781c1e39ad995
Author: José Fonseca <[email protected]> Date: Wed Mar 13 13:13:08 2013 +0000 scons: Define PACKAGE_VERSION/BUGREPORT globally. Fixes the scons build. --- SConstruct | 5 +++++ src/gallium/state_trackers/vega/SConscript | 1 - src/mesa/SConscript | 5 ----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/SConstruct b/SConstruct index 4a3fef0..1807ff8 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 0a42231..394eaff 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 3502e30..ca9b70b 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 _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
