[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56931] trunk/blender: code cleanup: split scons includes onto multiple lines, reduce chance of include conflicts later on.
Campbell Barton
ideasman42 at gmail.com
Mon May 20 20:42:29 CEST 2013
Revision: 56931
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56931
Author: campbellbarton
Date: 2013-05-20 18:42:28 +0000 (Mon, 20 May 2013)
Log Message:
-----------
code cleanup: split scons includes onto multiple lines, reduce chance of include conflicts later on.
Modified Paths:
--------------
trunk/blender/intern/ghost/SConscript
trunk/blender/source/blender/avi/SConscript
trunk/blender/source/blender/blenfont/SConscript
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/blenlib/SConscript
trunk/blender/source/blender/blenloader/SConscript
trunk/blender/source/blender/compositor/SConscript
trunk/blender/source/blender/editors/animation/SConscript
trunk/blender/source/blender/editors/armature/SConscript
trunk/blender/source/blender/editors/curve/SConscript
trunk/blender/source/blender/editors/datafiles/SConscript
trunk/blender/source/blender/editors/gpencil/SConscript
trunk/blender/source/blender/editors/interface/SConscript
trunk/blender/source/blender/editors/io/SConscript
trunk/blender/source/blender/editors/mask/SConscript
trunk/blender/source/blender/editors/mesh/SConscript
trunk/blender/source/blender/editors/metaball/SConscript
trunk/blender/source/blender/editors/object/SConscript
trunk/blender/source/blender/editors/physics/SConscript
trunk/blender/source/blender/editors/render/SConscript
trunk/blender/source/blender/editors/screen/SConscript
trunk/blender/source/blender/editors/sculpt_paint/SConscript
trunk/blender/source/blender/editors/sound/SConscript
trunk/blender/source/blender/editors/space_action/SConscript
trunk/blender/source/blender/editors/space_api/SConscript
trunk/blender/source/blender/editors/space_buttons/SConscript
trunk/blender/source/blender/editors/space_clip/SConscript
trunk/blender/source/blender/editors/space_console/SConscript
trunk/blender/source/blender/editors/space_file/SConscript
trunk/blender/source/blender/editors/space_graph/SConscript
trunk/blender/source/blender/editors/space_image/SConscript
trunk/blender/source/blender/editors/space_info/SConscript
trunk/blender/source/blender/editors/space_logic/SConscript
trunk/blender/source/blender/editors/space_nla/SConscript
trunk/blender/source/blender/editors/space_node/SConscript
trunk/blender/source/blender/editors/space_outliner/SConscript
trunk/blender/source/blender/editors/space_script/SConscript
trunk/blender/source/blender/editors/space_sequencer/SConscript
trunk/blender/source/blender/editors/space_text/SConscript
trunk/blender/source/blender/editors/space_time/SConscript
trunk/blender/source/blender/editors/space_userpref/SConscript
trunk/blender/source/blender/editors/space_view3d/SConscript
trunk/blender/source/blender/editors/transform/SConscript
trunk/blender/source/blender/editors/util/SConscript
trunk/blender/source/blender/editors/uvedit/SConscript
trunk/blender/source/blender/freestyle/SConscript
trunk/blender/source/blender/gpu/SConscript
trunk/blender/source/blender/ikplugin/SConscript
trunk/blender/source/blender/imbuf/SConscript
trunk/blender/source/blender/makesdna/SConscript
trunk/blender/source/blender/makesrna/SConscript
trunk/blender/source/blender/makesrna/intern/SConscript
trunk/blender/source/blender/nodes/SConscript
trunk/blender/source/blender/python/SConscript
trunk/blender/source/blender/render/SConscript
trunk/blender/source/blender/windowmanager/SConscript
trunk/blender/source/gameengine/Rasterizer/SConscript
Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript 2013-05-20 17:48:16 UTC (rev 56930)
+++ trunk/blender/intern/ghost/SConscript 2013-05-20 18:42:28 UTC (rev 56931)
@@ -40,8 +40,17 @@
pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_SystemPaths', 'GHOST_Window', 'GHOST_DropTarget', 'GHOST_NDOFManager', 'GHOST_Sizer']
defs=['_USE_MATH_DEFINES']
-incs = '. ../string #extern/glew/include #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC']
+incs = [
+ '.',
+ '#extern/glew/include',
+ '#source/blender/imbuf',
+ '#source/blender/makesdna',
+ '../string',
+ ]
+incs = ' '.join(incs)
+incs += ' ' + env['BF_OPENGL_INC']
+
if env['WITH_GHOST_SDL']:
for f in pf:
try:
Modified: trunk/blender/source/blender/avi/SConscript
===================================================================
--- trunk/blender/source/blender/avi/SConscript 2013-05-20 17:48:16 UTC (rev 56930)
+++ trunk/blender/source/blender/avi/SConscript 2013-05-20 18:42:28 UTC (rev 56931)
@@ -29,7 +29,13 @@
sources = env.Glob('intern/*.c')
-incs = '. #/intern/guardedalloc ../blenlib'
-incs += ' ' + env['BF_JPEG_INC']
+incs = [
+ '.',
+ '#/intern/guardedalloc',
+ '../blenlib',
+ env['BF_JPEG_INC'],
+ ]
-env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core','player'], priority = [190,120] )
+defs = []
+
+env.BlenderLib ('bf_avi', sources, incs, defs, libtype=['core','player'], priority = [190,120] )
Modified: trunk/blender/source/blender/blenfont/SConscript
===================================================================
--- trunk/blender/source/blender/blenfont/SConscript 2013-05-20 17:48:16 UTC (rev 56930)
+++ trunk/blender/source/blender/blenfont/SConscript 2013-05-20 18:42:28 UTC (rev 56931)
@@ -30,11 +30,24 @@
sources = env.Glob('intern/*.c')
-incs = '. intern #/intern/guardedalloc #/intern/locale ../blenkernel ../blenlib ../blenloader'
-incs += ' ../makesdna ../makesrna ../python ../imbuf ../editors/include'
-incs += ' #/extern/glew/include'
-incs += ' ' + env['BF_FREETYPE_INC']
+incs = [
+ '.',
+ 'intern',
+ '#/intern/guardedalloc',
+ '#/intern/locale',
+ '#/extern/glew/include',
+ '../blenkernel',
+ '../blenlib',
+ '../blenloader',
+ '../editors/include',
+ '../imbuf',
+ '../makesdna',
+ '../makesrna',
+ '../python',
+ ]
+incs.extend(Split(env['BF_FREETYPE_INC']))
+
defs = ['GLEW_STATIC']
if sys.platform == 'win32' or env['OURPLATFORM'] == 'linuxcross':
@@ -43,4 +56,4 @@
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
-env.BlenderLib ( 'bf_blenfont', sources, Split(incs), defines=defs, libtype=['core','player'], priority=[210,210] )
+env.BlenderLib('bf_blenfont', sources, incs, defines=defs, libtype=['core', 'player'], priority=[210, 210])
Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript 2013-05-20 17:48:16 UTC (rev 56930)
+++ trunk/blender/source/blender/blenkernel/SConscript 2013-05-20 18:42:28 UTC (rev 56931)
@@ -35,28 +35,46 @@
sources_mask = env.Glob('intern/mask*.c')
-incs = '. #/intern/guardedalloc #/intern/memutil'
-incs += ' ../blenlib ../blenfont ../makesdna ../windowmanager'
-incs += ' ../render/extern/include ../makesrna'
-incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes ../modifiers'
-incs += ' #/intern/iksolver/extern ../blenloader'
-incs += ' #/extern/bullet2/src'
-incs += ' #/intern/rigidbody'
-incs += ' #/intern/opennl/extern #/intern/bsp/extern'
-incs += ' ../gpu #/extern/glew/include'
-incs += ' ../bmesh'
-incs += ' #/intern/smoke/extern'
-incs += ' #/intern/mikktspace'
-incs += ' #/intern/audaspace/intern'
-incs += ' #/intern/ffmpeg'
-incs += ' #/intern/raskter'
-incs += ' #/extern/libmv'
+incs = [
+ '.',
+ '#/extern/libmv',
+ '#/intern/ffmpeg',
+ '#/intern/guardedalloc',
+ '#/intern/memutil',
+ '#/intern/mikktspace',
+ '#/intern/raskter',
+ '#/intern/rigidbody',
+ '#/extern/bullet2/src',
+ '#/extern/glew/include',
+ '#/intern/audaspace/intern',
+ '#/intern/bsp/extern',
+ '#/intern/elbeem/extern',
+ '#/intern/iksolver/extern',
+ '#/intern/opennl/extern',
+ '#/intern/smoke/extern',
+ '../avi',
+ '../blenfont',
+ '../blenlib',
+ '../blenloader',
+ '../bmesh',
+ '../gpu',
+ '../ikplugin',
+ '../imbuf',
+ '../makesdna',
+ '../makesrna',
+ '../modifiers',
+ '../nodes',
+ '../render/extern/include',
+ '../windowmanager',
+ env['BF_OPENGL_INC'],
+ env['BF_ZLIB_INC'],
+ ]
+incs = ' '.join(incs)
-incs += ' ' + env['BF_OPENGL_INC']
-incs += ' ' + env['BF_ZLIB_INC']
+defs = [
+ 'GLEW_STATIC',
+ ]
-defs = [ 'GLEW_STATIC' ]
-
if env['WITH_BF_SMOKE']:
defs.append('WITH_SMOKE')
Modified: trunk/blender/source/blender/blenlib/SConscript
===================================================================
--- trunk/blender/source/blender/blenlib/SConscript 2013-05-20 17:48:16 UTC (rev 56930)
+++ trunk/blender/source/blender/blenlib/SConscript 2013-05-20 18:42:28 UTC (rev 56931)
@@ -31,10 +31,17 @@
cflags=''
# don't add ../blenkernel back!
-incs = '. ../makesdna #/intern/guardedalloc #/intern/ghost #/extern/wcwidth'
+incs = [
+ '.',
+ '#/extern/wcwidth',
+ '#/intern/ghost',
+ '#/intern/guardedalloc',
+ '../makesdna',
+ env['BF_FREETYPE_INC'],
+ env['BF_ZLIB_INC'],
+ ]
+incs = ' '.join(incs)
-incs += ' ' + env['BF_FREETYPE_INC']
-incs += ' ' + env['BF_ZLIB_INC']
defs = []
if env['WITH_BF_BINRELOC']:
Modified: trunk/blender/source/blender/blenloader/SConscript
===================================================================
--- trunk/blender/source/blender/blenloader/SConscript 2013-05-20 17:48:16 UTC (rev 56930)
+++ trunk/blender/source/blender/blenloader/SConscript 2013-05-20 18:42:28 UTC (rev 56931)
@@ -29,14 +29,24 @@
sources = env.Glob('intern/*.c')
-incs = '. #/intern/guardedalloc ../blenfont ../blenlib ../blenkernel'
-incs += ' ../makesdna ../editors/include'
-incs += ' ../render/extern/include ../makesrna ../nodes ../bmesh ../imbuf'
+incs = [
+ '.',
+ '#/intern/guardedalloc',
+ '../blenfont',
+ '../blenkernel',
+ '../blenlib',
+ '../bmesh',
+ '../editors/include',
+ '../imbuf',
+ '../makesdna',
+ '../makesrna',
+ '../nodes',
+ '../render/extern/include',
+ env['BF_ZLIB_INC'],
+ ]
-incs += ' ' + env['BF_ZLIB_INC']
-
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
- incs += ' ' + env['BF_PTHREADS_INC']
+ incs.append(env['BF_PTHREADS_INC'])
defs = []
@@ -44,6 +54,6 @@
defs.append('WITH_INTERNATIONAL')
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
- env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player'], priority = [167,30]) #, cc_compileflags=['/WX'] )
+ env.BlenderLib('bf_blenloader', sources, incs, defs, libtype=['core', 'player'], priority = [167, 30]) #, cc_compileflags=['/WX'])
else:
- env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player','player2'], priority = [167,30,5] )
+ env.BlenderLib('bf_blenloader', sources, incs, defs, libtype=['core', 'player', 'player2'], priority=[167, 30, 5])
Modified: trunk/blender/source/blender/compositor/SConscript
===================================================================
--- trunk/blender/source/blender/compositor/SConscript 2013-05-20 17:48:16 UTC (rev 56930)
+++ trunk/blender/source/blender/compositor/SConscript 2013-05-20 18:42:28 UTC (rev 56931)
@@ -30,14 +30,31 @@
sources = env.Glob('intern/*.cpp') + env.Glob('nodes/*.cpp') + env.Glob('operations/*.cpp')
-incs = '. nodes intern operations ../blenlib ../blenkernel ../makesdna ../render/extern/include ../render/intern/include'
-incs += ' ../makesrna ../blenloader ../../../intern/guardedalloc ../imbuf ../windowmanager '
-incs += '#intern/opencl ../nodes ../nodes/intern ../nodes/composite '
+incs = [
+ '.',
+ 'intern',
+ 'nodes',
+ 'operations',
+ '#/intern/opencl',
+ '../blenkernel',
+ '../blenlib',
+ '../blenloader',
+ '../imbuf',
+ '../makesdna',
+ '../makesrna',
+ '../nodes',
+ '../nodes/composite',
+ '../nodes/intern',
+ '../render/extern/include',
+ '../render/intern/include',
+ '../windowmanager',
+ '../../../intern/guardedalloc',
+ # data files
+ env['DATA_HEADERS'],
+ ]
+
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
- incs += ' ' + env['BF_PTHREADS_INC']
+ incs.append(env['BF_PTHREADS_INC'])
-# data files
-incs += ' ' + env['DATA_HEADERS']
-
-env.BlenderLib ( 'bf_composite', sources, Split(incs), defines=defs, libtype=['core'], priority = [164] )
+env.BlenderLib('bf_composite', sources, incs, defines=defs, libtype=['core'], priority=[164])
Modified: trunk/blender/source/blender/editors/animation/SConscript
===================================================================
--- trunk/blender/source/blender/editors/animation/SConscript 2013-05-20 17:48:16 UTC (rev 56930)
+++ trunk/blender/source/blender/editors/animation/SConscript 2013-05-20 18:42:28 UTC (rev 56931)
@@ -29,12 +29,24 @@
sources = env.Glob('*.c')
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf ../../blenfont'
-incs += ' ../../bmesh ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
+incs = [
+ '#/intern/guardedalloc',
+ '#/extern/glew/include',
+ '../include',
+ '../../blenfont',
+ '../../blenkernel',
+ '../../blenlib',
+ '../../blenloader',
+ '../../bmesh',
+ '../../imbuf',
+ '../../makesdna',
+ '../../makesrna',
+ '../../windowmanager',
+ ]
defs = []
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
-env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), defs, libtype=['core'], priority=[125] )
+env.BlenderLib('bf_editors_animation', sources, incs, defs, libtype=['core'], priority=[125])
Modified: trunk/blender/source/blender/editors/armature/SConscript
===================================================================
--- trunk/blender/source/blender/editors/armature/SConscript 2013-05-20 17:48:16 UTC (rev 56930)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list