archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

SCons: Fix for really nasty bug with polluting configuration environment

Browse Source 
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.
This commit is contained in:
Sergey Sharybin
2015-08-04 18:04:45 +02:00
parent 1fc32249f5
commit dfc672f8bb
51 changed files with 108 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extern/glew-es/SConscript
Vendored
+3 -1
View File
@@ -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']
extern/glew/SConscript
Vendored
+3 -1
View File
@@ -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']
intern/ghost/SConscript
+2 -1
View File
@@ -48,7 +48,8 @@ sources.remove('intern' + os.sep + 'GHOST_ContextWGL.cpp')
pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_SystemPaths', 'GHOST_Window', 'GHOST_DropTarget', 'GHOST_NDOFManager', 'GHOST_Context']
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_GL_EGL']:
defs.append('WITH_EGL')
intern/glew-mx/SConscript
+2 -3
View File
@@ -5,9 +5,8 @@ import os
Import('env')
sources = ['intern/glew-mx.c']
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
incs = [
'.',
env['BF_GLEW_INC'],
intern/opencolorio/SConscript
+3 -1
View File
@@ -30,7 +30,9 @@ Import('env')
sources = env.Glob('*.cc')
incs = '. ../guardedalloc ../../source/blender/blenlib'
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_OCIO']:
defs.append('WITH_OCIO')
source/blender/blenfont/SConscript
+2 -1
View File
@@ -48,7 +48,8 @@ incs = [
incs.extend(Split(env['BF_FREETYPE_INC']))
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if sys.platform == 'win32' or env['OURPLATFORM'] == 'linuxcross':
defs.append('_WIN32')
source/blender/blenkernel/SConscript
+2 -1
View File
@@ -72,7 +72,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_SMOKE']:
defs.append('WITH_SMOKE')
source/blender/editors/animation/SConscript
+2 -1
View File
@@ -43,7 +43,8 @@ incs = [
'../../windowmanager',
]
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
source/blender/editors/armature/SConscript
+2 -1
View File
@@ -45,7 +45,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs += ' ' + env['BF_PTHREADS_INC']
source/blender/editors/gpencil/SConscript
+2 -1
View File
@@ -47,7 +47,8 @@ incs = [
'../../windowmanager',
]
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
source/blender/editors/interface/SConscript
+2 -1
View File
@@ -46,7 +46,8 @@ incs = [
'../../windowmanager',
]
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'):
if env['WITH_BF_IME']:
source/blender/editors/mask/SConscript
+2 -1
View File
@@ -29,7 +29,8 @@ Import ('env')
sources = env.Glob('*.c')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
incs = [
'#/intern/guardedalloc',
source/blender/editors/mesh/SConscript
+2 -1
View File
@@ -29,7 +29,8 @@ Import ('env')
sources = env.Glob('*.c')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
incs = [
'#/intern/guardedalloc',
source/blender/editors/physics/SConscript
+2 -1
View File
@@ -46,7 +46,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs += ' ' + env['BF_PTHREADS_INC']
source/blender/editors/render/SConscript
+2 -1
View File
@@ -49,7 +49,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs += ' ' + env['BF_PTHREADS_INC']
source/blender/editors/screen/SConscript
+2 -1
View File
@@ -46,7 +46,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs += ' ' + env['BF_PTHREADS_INC']
source/blender/editors/sculpt_paint/SConscript
+2 -1
View File
@@ -29,7 +29,8 @@ Import ('env')
sources = env.Glob('*.c')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
incs = [
'#/intern/guardedalloc',
source/blender/editors/space_action/SConscript
+2 -1
View File
@@ -29,7 +29,8 @@ Import ('env')
sources = env.Glob('*.c')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
incs = [
'#/intern/guardedalloc',
source/blender/editors/space_buttons/SConscript
+2 -1
View File
@@ -47,7 +47,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
source/blender/editors/space_clip/SConscript
+2 -1
View File
@@ -29,7 +29,8 @@ Import ('env')
sources = env.Glob('*.c')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
incs = [
'#/intern/guardedalloc',
source/blender/editors/space_console/SConscript
+2 -1
View File
@@ -29,7 +29,8 @@ Import ('env')
sources = env.Glob('*.c')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
incs = [
'../include',
source/blender/editors/space_file/SConscript
+2 -1
View File
@@ -46,7 +46,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_OPENJPEG']:
defs.append('WITH_OPENJPEG')
source/blender/editors/space_graph/SConscript
+2 -1
View File
@@ -44,7 +44,8 @@ incs = [
'../../windowmanager',
]
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_AUDASPACE']:
defs += env['BF_AUDASPACE_DEF']
source/blender/editors/space_image/SConscript
+2 -1
View File
@@ -48,7 +48,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
source/blender/editors/space_info/SConscript
+2 -1
View File
@@ -47,7 +47,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
source/blender/editors/space_logic/SConscript
+2 -1
View File
@@ -46,7 +46,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_GAMEENGINE']:
defs.append('WITH_GAMEENGINE')
source/blender/editors/space_nla/SConscript
+2 -1
View File
@@ -44,7 +44,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
source/blender/editors/space_node/SConscript
+3 -1
View File
@@ -1,3 +1,4 @@
#!/usr/bin/env python
#
# ***** BEGIN GPL LICENSE BLOCK *****
@@ -48,7 +49,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
cf = []
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
source/blender/editors/space_outliner/SConscript
+2 -1
View File
@@ -29,7 +29,8 @@ Import ('env')
sources = env.Glob('*.c')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs == env['BF_GL_DEFINITIONS']
incs = [
'#/intern/guardedalloc',
source/blender/editors/space_script/SConscript
+2 -1
View File
@@ -44,7 +44,8 @@ incs = [
'../../windowmanager',
]
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_PYTHON']:
defs.append('WITH_PYTHON')
source/blender/editors/space_sequencer/SConscript
+2 -1
View File
@@ -44,7 +44,8 @@ incs = [
'../../windowmanager',
]
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_AUDASPACE']:
defs += env['BF_AUDASPACE_DEF']
source/blender/editors/space_text/SConscript
+2 -1
View File
@@ -29,7 +29,8 @@ Import ('env')
sources = env.Glob('*.c')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
incs = [
'#/intern/guardedalloc',
source/blender/editors/space_time/SConscript
+2 -1
View File
@@ -42,6 +42,7 @@ incs = [
'../../windowmanager',
]
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
env.BlenderLib('bf_editors_space_time', sources, incs, defs, libtype=['core'], priority=[65])
source/blender/editors/space_view3d/SConscript
+2 -1
View File
@@ -29,7 +29,8 @@ Import ('env')
sources = env.Glob('*.c')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
incs = [
'#/intern/guardedalloc',
source/blender/editors/transform/SConscript
+2 -1
View File
@@ -45,7 +45,8 @@ incs = [
'../../windowmanager',
]
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
source/blender/editors/util/SConscript
+2 -1
View File
@@ -29,7 +29,8 @@ Import ('env')
sources = env.Glob('*.c')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
incs = [
'#/intern/guardedalloc',
source/blender/editors/uvedit/SConscript
+2 -1
View File
@@ -27,7 +27,8 @@
Import ('env')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
sources = env.Glob('*.c')
source/blender/gpu/SConscript
+2 -1
View File
@@ -30,7 +30,8 @@ Import ('env')
sources = env.Glob('intern/*.c')
sources += env.Glob('shaders/*.c')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
incs = [
'.',
source/blender/makesrna/SConscript
+2 -1
View File
@@ -59,7 +59,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_SMOKE']:
defs.append('WITH_SMOKE')
source/blender/makesrna/intern/SConscript
+2 -1
View File
@@ -53,7 +53,8 @@ makesrna_tool = env.Clone()
rna = env.Clone()
makesrna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesrna/\\"" ')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
incs = [
'#/intern/guardedalloc',
source/blender/nodes/SConscript
+2 -1
View File
@@ -53,7 +53,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_PYTHON']:
incs += ' ' + env['BF_PYTHON_INC']
source/blender/python/SConscript
+4 -2
View File
@@ -62,7 +62,8 @@ sources = env.Glob('bmesh/*.c')
env.BlenderLib( libname = 'bf_python_bmesh', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [362,165])
# generic
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if is_debug:
defs.append('_DEBUG')
@@ -79,7 +80,8 @@ env.BlenderLib( libname = 'bf_python_mathutils', sources = Split(sources), inclu
# bpy
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if is_debug:
defs.append('_DEBUG')
source/blender/windowmanager/SConscript
+2 -1
View File
@@ -55,7 +55,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_PYTHON']:
defs.append('WITH_PYTHON')
source/gameengine/BlenderRoutines/SConscript
+2 -1
View File
@@ -29,7 +29,8 @@ Import ('env')
sources = env.Glob('*.cpp')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
incs = [
'.',
source/gameengine/GamePlayer/common/SConscript
+2 -1
View File
@@ -68,7 +68,8 @@ incs = [
'#/intern/glew-mx',
]
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_PYTHON']:
incs.extend(Split(env['BF_PYTHON_INC']))
source/gameengine/GamePlayer/ghost/SConscript
+2 -1
View File
@@ -74,7 +74,8 @@ incs = [
incs.append(env['BF_PTHREADS_INC'])
incs.append(env['BF_BOOST_INC'])
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_PYTHON']:
incs += Split(env['BF_PYTHON_INC'])
source/gameengine/Ketsji/SConscript
+2 -1
View File
@@ -30,7 +30,8 @@ import sys
Import ('env')
sources = env.Glob('*.cpp')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
incs = [
'.',
source/gameengine/Physics/Bullet/SConscript
+2 -1
View File
@@ -52,7 +52,8 @@ incs = ' '.join(incs)
incs += ' ' + env['BF_BULLET_INC']
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_PYTHON']:
incs += ' ' + env['BF_PYTHON_INC']
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
+2 -1
View File
@@ -3,7 +3,8 @@ Import ('env')
sources = env.Glob('*.cpp')
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
incs = [
'.',
source/gameengine/Rasterizer/SConscript
+2 -1
View File
@@ -46,7 +46,8 @@ incs = [
'#source/blender/makesdna',
]
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['WITH_BF_PYTHON']:
incs.extend(Split(env['BF_PYTHON_INC']))
source/gameengine/VideoTexture/SConscript
+2 -1
View File
@@ -58,7 +58,8 @@ incs = [
]
incs = ' '.join(incs)
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc','win32-mingw', 'win64-mingw'):
if env['BF_DEBUG']: