From dfc672f8bbb8633f014f393fe3de2e39ed77c8dd Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 4 Aug 2015 18:04:45 +0200 Subject: SCons: Fix for really nasty bug with polluting configuration environment The issue was caused by the following construction: def = env['SOMETHING'] defs.append('SOMETHING_MORE') Since first assignment was actually referencing environment option it was totally polluted hawing weird and wonderful side effects on all other areas of Blender. --- extern/glew-es/SConscript | 4 +++- extern/glew/SConscript | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'extern') diff --git a/extern/glew-es/SConscript b/extern/glew-es/SConscript index b7c713c08c4..7552ce84067 100644 --- a/extern/glew-es/SConscript +++ b/extern/glew-es/SConscript @@ -6,7 +6,9 @@ Import('env') sources = ['src/glew.c'] -defs = env['BF_GL_DEFINITIONS'] +defs = [] +defs += env['BF_GL_DEFINITIONS'] + if env['WITH_BF_GLEW_MX']: defs += ['GLEW_MX'] incs = ['include'] diff --git a/extern/glew/SConscript b/extern/glew/SConscript index d825968806e..a9687383a0c 100644 --- a/extern/glew/SConscript +++ b/extern/glew/SConscript @@ -6,7 +6,9 @@ Import('env') sources = ['src/glew.c'] -defs = env['BF_GL_DEFINITIONS'] +defs = [] +defs += env['BF_GL_DEFINITIONS'] + if env['WITH_BF_GLEW_MX']: defs += ['GLEW_MX'] -- cgit v1.2.3