diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-04 19:04:45 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-04 19:06:28 +0300 |
| commit | dfc672f8bbb8633f014f393fe3de2e39ed77c8dd (patch) | |
| tree | beabdee122abee131811cb0872fa4fc2a5a73cfd /extern | |
| parent | 1fc32249f5d8bf33634461f9d1421104e5cf0323 (diff) | |
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.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/glew-es/SConscript | 4 | ||||
| -rw-r--r-- | extern/glew/SConscript | 4 |
2 files changed, 6 insertions, 2 deletions
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'] |