diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-08-30 00:52:05 +0400 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-08-30 00:52:05 +0400 |
commit | 6c113b54b3566966b5ab2b731a59fa39b79aacd2 (patch) | |
tree | e5ee349b1b54548dde67ba248b2d9e2564b96766 /source/blender/editors | |
parent | 999bb69c703f02644feb58a726cb2470c6b9ba0e (diff) |
Finally change SConscript tabs to spaces.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/SConscript | 70 | ||||
-rw-r--r-- | source/blender/editors/interface/SConscript | 6 | ||||
-rw-r--r-- | source/blender/editors/object/SConscript | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/SConscript | 6 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/SConscript | 4 | ||||
-rw-r--r-- | source/blender/editors/space_console/SConscript | 22 | ||||
-rw-r--r-- | source/blender/editors/space_file/SConscript | 4 | ||||
-rw-r--r-- | source/blender/editors/space_image/SConscript | 8 | ||||
-rw-r--r-- | source/blender/editors/space_logic/SConscript | 2 | ||||
-rw-r--r-- | source/blender/editors/space_node/SConscript | 14 | ||||
-rw-r--r-- | source/blender/editors/space_script/SConscript | 2 | ||||
-rw-r--r-- | source/blender/editors/space_text/SConscript | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/SConscript | 4 |
13 files changed, 73 insertions, 73 deletions
diff --git a/source/blender/editors/SConscript b/source/blender/editors/SConscript index 226e9247f91..e8159bdf03f 100644 --- a/source/blender/editors/SConscript +++ b/source/blender/editors/SConscript @@ -3,38 +3,38 @@ Import ('env') SConscript(['datafiles/SConscript', - 'space_api/SConscript', - 'util/SConscript', - 'interface/SConscript', - 'animation/SConscript', - 'armature/SConscript', - 'mesh/SConscript', - 'metaball/SConscript', - 'object/SConscript', - 'curve/SConscript', - 'gpencil/SConscript', - 'physics/SConscript', - 'render/SConscript', - 'sound/SConscript', - 'space_buttons/SConscript', - 'space_file/SConscript', - 'space_image/SConscript', - 'space_info/SConscript', - 'space_graph/SConscript', - 'space_node/SConscript', - 'space_outliner/SConscript', - 'space_time/SConscript', - 'space_view3d/SConscript', - 'space_sound/SConscript', - 'space_action/SConscript', - 'space_nla/SConscript', - 'space_script/SConscript', - 'space_text/SConscript', - 'space_sequencer/SConscript', - 'space_logic/SConscript', - 'space_console/SConscript', - 'space_userpref/SConscript', - 'transform/SConscript', - 'screen/SConscript', - 'sculpt_paint/SConscript', - 'uvedit/SConscript']) + 'space_api/SConscript', + 'util/SConscript', + 'interface/SConscript', + 'animation/SConscript', + 'armature/SConscript', + 'mesh/SConscript', + 'metaball/SConscript', + 'object/SConscript', + 'curve/SConscript', + 'gpencil/SConscript', + 'physics/SConscript', + 'render/SConscript', + 'sound/SConscript', + 'space_buttons/SConscript', + 'space_file/SConscript', + 'space_image/SConscript', + 'space_info/SConscript', + 'space_graph/SConscript', + 'space_node/SConscript', + 'space_outliner/SConscript', + 'space_time/SConscript', + 'space_view3d/SConscript', + 'space_sound/SConscript', + 'space_action/SConscript', + 'space_nla/SConscript', + 'space_script/SConscript', + 'space_text/SConscript', + 'space_sequencer/SConscript', + 'space_logic/SConscript', + 'space_console/SConscript', + 'space_userpref/SConscript', + 'transform/SConscript', + 'screen/SConscript', + 'sculpt_paint/SConscript', + 'uvedit/SConscript']) diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript index 09868345fc4..81964a661a4 100644 --- a/source/blender/editors/interface/SConscript +++ b/source/blender/editors/interface/SConscript @@ -4,7 +4,7 @@ Import ('env') sources = env.Glob('*.c') for source in env.Glob('*_api.c'): - sources.remove(source) + sources.remove(source) incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc ../../gpu' @@ -17,6 +17,6 @@ if env['WITH_BF_INTERNATIONAL']: defs.append('INTERNATIONAL') if not env['WITH_BF_PYTHON']: - defs.append('DISABLE_PYTHON') - + defs.append('DISABLE_PYTHON') + env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), defs, libtype=['core'], priority=[110] ) diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript index 0a94de255cb..98085dd2fe5 100644 --- a/source/blender/editors/object/SConscript +++ b/source/blender/editors/object/SConscript @@ -18,6 +18,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] if not env['WITH_BF_PYTHON']: - defs.append('DISABLE_PYTHON') + defs.append('DISABLE_PYTHON') env.BlenderLib ( 'bf_editors_object', sources, Split(incs), defs, libtype=['core'], priority=[35] ) diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript index 6efb2617a18..9049ac876df 100644 --- a/source/blender/editors/screen/SConscript +++ b/source/blender/editors/screen/SConscript @@ -11,10 +11,10 @@ incs += ' #/intern/guardedalloc #/extern/glew/include' defs = '' if env['OURPLATFORM'] == 'linux2': - cflags='-pthread' - incs += ' ../../../extern/binreloc/include' + cflags='-pthread' + incs += ' ../../../extern/binreloc/include' if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): - incs += ' ' + env['BF_PTHREADS_INC'] + incs += ' ' + env['BF_PTHREADS_INC'] env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), Split(defs), libtype=['core'], priority=[105] ) diff --git a/source/blender/editors/sculpt_paint/SConscript b/source/blender/editors/sculpt_paint/SConscript index 3d9a5144c93..c694e826817 100644 --- a/source/blender/editors/sculpt_paint/SConscript +++ b/source/blender/editors/sculpt_paint/SConscript @@ -11,8 +11,8 @@ incs += ' ../../render/extern/include' incs += ' ../../gpu ../../makesrna' if env['OURPLATFORM'] == 'linux2': - cflags='-pthread' - incs += ' ../../../extern/binreloc/include' + cflags='-pthread' + incs += ' ../../../extern/binreloc/include' if env['OURPLATFORM'] == 'linuxcross': if env['WITH_BF_OPENMP']: diff --git a/source/blender/editors/space_console/SConscript b/source/blender/editors/space_console/SConscript index d50902446ba..087090a7740 100644 --- a/source/blender/editors/space_console/SConscript +++ b/source/blender/editors/space_console/SConscript @@ -5,19 +5,19 @@ sources = env.Glob('*.c') defs = [] incs = [ - '../include', - '#extern/glew/include', - '#/intern/guardedalloc', - '../../makesdna', - '../../makesrna', - '../../blenkernel', - '../../blenlib', - '../../windowmanager', - '../../blenfont', - '../../blenloader', + '../include', + '#extern/glew/include', + '#/intern/guardedalloc', + '../../makesdna', + '../../makesrna', + '../../blenkernel', + '../../blenlib', + '../../windowmanager', + '../../blenfont', + '../../blenloader', ] if not env['WITH_BF_PYTHON']: - defs.append('DISABLE_PYTHON') + defs.append('DISABLE_PYTHON') env.BlenderLib ( 'bf_editors_space_console', sources, incs, defs, libtype=['core'], priority=[95] ) diff --git a/source/blender/editors/space_file/SConscript b/source/blender/editors/space_file/SConscript index 9de705e99d3..7c55b40e816 100644 --- a/source/blender/editors/space_file/SConscript +++ b/source/blender/editors/space_file/SConscript @@ -14,10 +14,10 @@ if env['WITH_BF_OPENJPEG']: defs.append('WITH_OPENJPEG') if env['WITH_BF_OPENEXR']: - defs.append('WITH_OPENEXR') + defs.append('WITH_OPENEXR') if env['WITH_BF_TIFF']: - defs.append('WITH_TIFF') + defs.append('WITH_TIFF') if env['OURPLATFORM'] == 'linux2': cflags='-pthread' diff --git a/source/blender/editors/space_image/SConscript b/source/blender/editors/space_image/SConscript index 4e1918bc327..c7c31352185 100644 --- a/source/blender/editors/space_image/SConscript +++ b/source/blender/editors/space_image/SConscript @@ -10,12 +10,12 @@ incs += ' ../../render/extern/include ../../makesrna' defs = [] if env['WITH_BF_LCMS']: - defs.append('WITH_LCMS') - incs += ' ' + env['BF_LCMS_INC'] + defs.append('WITH_LCMS') + incs += ' ' + env['BF_LCMS_INC'] if env['WITH_BF_OPENEXR']: - defs.append('WITH_OPENEXR') + defs.append('WITH_OPENEXR') if env['WITH_BF_TIFF']: - defs.append('WITH_TIFF') + defs.append('WITH_TIFF') if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] diff --git a/source/blender/editors/space_logic/SConscript b/source/blender/editors/space_logic/SConscript index 307d229fb3f..0ce2eee575e 100644 --- a/source/blender/editors/space_logic/SConscript +++ b/source/blender/editors/space_logic/SConscript @@ -10,6 +10,6 @@ incs += ' ../../makesrna ../interface' defs = [] if env['WITH_BF_GAMEENGINE']: - defs.append('GAMEBLENDER=1') + defs.append('GAMEBLENDER=1') env.BlenderLib ( 'bf_editors_space_game', sources, Split(incs), defs, libtype=['core'], priority=[120] ) diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript index fd0dfe83852..636b247d44c 100644 --- a/source/blender/editors/space_node/SConscript +++ b/source/blender/editors/space_node/SConscript @@ -9,17 +9,17 @@ incs += ' ../../windowmanager #intern/guardedalloc #extern/glew/include' defs = [] cf = [] if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): - #cf.append('/WX') - pass + #cf.append('/WX') + pass if env['CC'] == 'gcc': - #cf.append('-Werror') - pass + #cf.append('-Werror') + pass if env['OURPLATFORM'] == 'linux2': - cflags='-pthread' - incs += ' ../../../extern/binreloc/include' + cflags='-pthread' + incs += ' ../../../extern/binreloc/include' if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): - incs += ' ' + env['BF_PTHREADS_INC'] + incs += ' ' + env['BF_PTHREADS_INC'] env.BlenderLib ( 'bf_editors_space_node', sources, Split(incs), defs, libtype=['core'], priority=[55], compileflags=cf ) diff --git a/source/blender/editors/space_script/SConscript b/source/blender/editors/space_script/SConscript index a78f1a66762..f187df19117 100644 --- a/source/blender/editors/space_script/SConscript +++ b/source/blender/editors/space_script/SConscript @@ -11,6 +11,6 @@ incs += ' ../../python' defs = [] if not env['WITH_BF_PYTHON']: - defs.append('DISABLE_PYTHON') + defs.append('DISABLE_PYTHON') env.BlenderLib ( 'bf_editors_space_script', sources, Split(incs), defs, libtype=['core'], priority=[90] ) diff --git a/source/blender/editors/space_text/SConscript b/source/blender/editors/space_text/SConscript index 09ba961bfce..bd87a799756 100644 --- a/source/blender/editors/space_text/SConscript +++ b/source/blender/editors/space_text/SConscript @@ -8,6 +8,6 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../python ../../makesrna ../../blenfont' if not env['WITH_BF_PYTHON']: - defs.append('DISABLE_PYTHON') + defs.append('DISABLE_PYTHON') env.BlenderLib ( 'bf_editors_space_text', sources, Split(incs), defs, libtype=['core'], priority=[95] ) diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript index 1d8e01f2b1b..d9074113ba9 100644 --- a/source/blender/editors/space_view3d/SConscript +++ b/source/blender/editors/space_view3d/SConscript @@ -12,8 +12,8 @@ incs += ' #/intern/smoke/extern' incs += ' #source/kernel/gen_system' if env['WITH_BF_GAMEENGINE']: - defs.append('GAMEBLENDER=1') + defs.append('GAMEBLENDER=1') if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): - incs += ' ' + env['BF_PTHREADS_INC'] + incs += ' ' + env['BF_PTHREADS_INC'] env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), defines = defs, libtype=['core'], priority=[40] ) |