[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19781] trunk/blender/source: SCons
Nathan Letwory
jesterking at letwory.net
Sat Apr 18 19:16:09 CEST 2009
Revision: 19781
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19781
Author: jesterking
Date: 2009-04-18 19:16:08 +0200 (Sat, 18 Apr 2009)
Log Message:
-----------
SCons
* some misc changes, mainly cleaning and style unification that were lying around
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/nodes/SConscript
trunk/blender/source/blender/python/SConscript
trunk/blender/source/blender/src/SConscript
trunk/blender/source/creator/SConscript
Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript 2009-04-18 10:08:19 UTC (rev 19780)
+++ trunk/blender/source/blender/blenkernel/SConscript 2009-04-18 17:16:08 UTC (rev 19781)
@@ -15,56 +15,58 @@
incs += ' ' + env['BF_OPENGL_INC']
incs += ' ' + env['BF_ZLIB_INC']
-defs = ''
+defs = []
if not env['WITH_BF_PYTHON']:
- defs += 'DISABLE_PYTHON'
+ defs.append('DISABLE_PYTHON')
else:
incs += ' ../python'
incs += ' ' + env['BF_PYTHON_INC']
+ if env['BF_DEBUG']:
+ defs.append('_DEBUG')
if env['WITH_BF_QUICKTIME']:
- incs += ' ../quicktime'
+ incs += ' ../quicktime'
if env['WITH_BF_SDL']:
incs += ' ' + env['BF_SDL_INC']
else:
- defs += ' DISABLE_SDL'
+ defs.append('DISABLE_SDL')
if env['WITH_BF_INTERNATIONAL']:
- defs += ' WITH_FREETYPE2'
+ defs.append('WITH_FREETYPE2')
if env['WITH_BF_VERSE']:
- defs += ' WITH_VERSE'
+ defs.append('WITH_VERSE')
incs += ' ' + env['BF_VERSE_INCLUDE']
if env['WITH_BF_VERSE']:
- defs += ' WITH_VERSE'
+ defs.append('WITH_VERSE')
if env['WITH_BF_OPENEXR']:
- defs += ' WITH_OPENEXR'
+ defs.append('WITH_OPENEXR')
if env['WITH_BF_OPENJPEG']:
- defs += ' WITH_OPENJPEG'
+ defs.append('WITH_OPENJPEG')
if env['WITH_BF_DDS']:
- defs += ' WITH_DDS'
+ defs.append('WITH_DDS')
if env['WITH_BF_FFMPEG']:
- defs += ' WITH_FFMPEG'
- incs += ' ' + env['BF_FFMPEG_INC']
+ defs.append('WITH_FFMPEG')
+ incs += ' ' + env['BF_FFMPEG_INC']
if env['WITH_BF_QUICKTIME']:
- defs += ' WITH_QUICKTIME'
- incs += ' ' + env['BF_QUICKTIME_INC']
+ defs.append('WITH_QUICKTIME')
+ incs += ' ' + env['BF_QUICKTIME_INC']
if env['WITH_BF_BULLET']:
- defs += ' WITH_BULLET'
+ defs.append('WITH_BULLET')
if env['BF_NO_ELBEEM']:
- defs += ' DISABLE_ELBEEM'
+ defs.append('DISABLE_ELBEEM')
if env['WITH_BF_PLAYER']:
- SConscript(['bad_level_call_stubs/SConscript'])
+ SConscript(['bad_level_call_stubs/SConscript'])
-env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] )
+env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [65, 20] )
Modified: trunk/blender/source/blender/nodes/SConscript
===================================================================
--- trunk/blender/source/blender/nodes/SConscript 2009-04-18 10:08:19 UTC (rev 19780)
+++ trunk/blender/source/blender/nodes/SConscript 2009-04-18 17:16:08 UTC (rev 19781)
@@ -17,29 +17,31 @@
incs += ' ' + env['BF_OPENGL_INC']
incs += ' ' + env['BF_ZLIB_INC']
-defs = ''
+defs = []
if env['WITH_BF_PYTHON']:
- incs += ' ' + env['BF_PYTHON_INC']
- incs += ' ../python'
+ incs += ' ' + env['BF_PYTHON_INC']
+ incs += ' ../python'
+ if env['BF_DEBUG']:
+ defs.append('_DEBUG')
else:
- defs += 'DISABLE_PYTHON'
+ defs.append('DISABLE_PYTHON')
if env['WITH_BF_INTERNATIONAL']:
- defs += ' WITH_FREETYPE2'
+ defs.append('WITH_FREETYPE2')
if env['WITH_BF_OPENEXR']:
- defs += ' WITH_OPENEXR'
+ defs.append('WITH_OPENEXR')
if env['WITH_BF_FFMPEG']:
- defs += ' WITH_FFMPEG'
- incs += ' ' + env['BF_FFMPEG_INC']
+ defs.append('WITH_FFMPEG')
+ incs += ' ' + env['BF_FFMPEG_INC']
if env['WITH_BF_QUICKTIME']:
- defs += ' WITH_QUICKTIME'
- incs += ' ' + env['BF_QUICKTIME_INC']
+ defs.append('WITH_QUICKTIME')
+ incs += ' ' + env['BF_QUICKTIME_INC']
-env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['intern', 'core', 'player'], priority = [200, 200, 400] )
-env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = Split(defs), libtype=['intern', 'core', 'player'], priority = [200, 175, 300] )
-env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = Split(defs), libtype=['intern', 'core', 'player'], priority = [200, 175, 300] )
-env.BlenderLib ( libname = 'bf_texnodes', sources = texsources, includes = Split(incs), defines = Split(defs), libtype=['intern', 'core', 'player'], priority = [200, 175, 300] )
+env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = defs, libtype=['intern', 'core', 'player'], priority = [200, 200, 400] )
+env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['intern', 'core', 'player'], priority = [200, 175, 300] )
+env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = defs, libtype=['intern', 'core', 'player'], priority = [200, 175, 300] )
+env.BlenderLib ( libname = 'bf_texnodes', sources = texsources, includes = Split(incs), defines = defs, libtype=['intern', 'core', 'player'], priority = [200, 175, 300] )
Modified: trunk/blender/source/blender/python/SConscript
===================================================================
--- trunk/blender/source/blender/python/SConscript 2009-04-18 10:08:19 UTC (rev 19780)
+++ trunk/blender/source/blender/python/SConscript 2009-04-18 17:16:08 UTC (rev 19781)
@@ -14,17 +14,20 @@
if env['OURPLATFORM'] in ('win32-mingw') and env['BF_DEBUG']:
defs.append('Py_TRACE_REFS')
+if env['BF_DEBUG']:
+ defs.append('_DEBUG')
+
if env['WITH_BF_QUICKTIME']:
incs += ' ' + env['BF_QUICKTIME_INC']
defs.append('WITH_QUICKTIME')
if env['WITH_BF_OPENEXR']:
- defs.append('WITH_OPENEXR')
+ defs.append('WITH_OPENEXR')
if env['WITH_BF_FFMPEG']:
- defs.append('WITH_FFMPEG')
+ defs.append('WITH_FFMPEG')
if env['BF_BUILDINFO']:
- defs.append('NAN_BUILDINFO')
+ defs.append('NAN_BUILDINFO')
env.BlenderLib ( libname='blender_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype=['core','game2'], priority = [60,115] )
Modified: trunk/blender/source/blender/src/SConscript
===================================================================
--- trunk/blender/source/blender/src/SConscript 2009-04-18 10:08:19 UTC (rev 19780)
+++ trunk/blender/source/blender/src/SConscript 2009-04-18 17:16:08 UTC (rev 19781)
@@ -34,39 +34,41 @@
defs = []
if env['WITH_BF_PYTHON']:
- incs += ' ../python ' + env['BF_PYTHON_INC']
+ incs += ' ../python ' + env['BF_PYTHON_INC']
+ if env['BF_DEBUG']:
+ defs.append('_DEBUG')
else:
- defs.append('DISABLE_PYTHON')
+ defs.append('DISABLE_PYTHON')
if env['BF_TWEAK_MODE']:
- defs.append('TWEAK_MODE')
+ defs.append('TWEAK_MODE')
if not env['WITH_BF_YAFRAY']:
- defs.append('DISABLE_YAFRAY')
+ defs.append('DISABLE_YAFRAY')
if env['WITH_BF_INTERNATIONAL']:
- incs += ' ../ftfont'
- defs.append('INTERNATIONAL')
- defs.append('FTGL_STATIC_LIBRARY')
+ incs += ' ../ftfont'
+ defs.append('INTERNATIONAL')
+ defs.append('FTGL_STATIC_LIBRARY')
if env['WITH_BF_OPENEXR']:
- defs.append('WITH_OPENEXR')
+ defs.append('WITH_OPENEXR')
if env['WITH_BF_OPENJPEG']:
- defs.append('WITH_OPENJPEG')
+ defs.append('WITH_OPENJPEG')
if env['WITH_BF_DDS']:
- defs.append('WITH_DDS')
+ defs.append('WITH_DDS')
if env['WITH_BF_QUICKTIME']:
- incs += ' ' + env['BF_QUICKTIME_INC']
- defs.append('WITH_QUICKTIME')
+ incs += ' ' + env['BF_QUICKTIME_INC']
+ defs.append('WITH_QUICKTIME')
if env['WITH_BF_ICONV']:
- incs += ' ../quicktime'
- incs += ' ' + env['BF_ICONV_INC']
- defs.append('WITH_ICONV')
+ incs += ' ../quicktime'
+ incs += ' ' + env['BF_ICONV_INC']
+ defs.append('WITH_ICONV')
if env['WITH_BF_GAMEENGINE']:
defs.append('GAMEBLENDER=1')
@@ -74,33 +76,33 @@
defs.append('USE_SUMO_SOLID')
if env['WITH_BF_FFMPEG']:
- defs.append('WITH_FFMPEG')
- incs += ' ' + env['BF_FFMPEG_INC']
+ defs.append('WITH_FFMPEG')
+ incs += ' ' + env['BF_FFMPEG_INC']
if env['WITH_BF_OGG']:
- defs.append('WITH_OGG')
+ defs.append('WITH_OGG')
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross'):
- incs += ' ' + env['BF_PTHREADS_INC']
+ incs += ' ' + env['BF_PTHREADS_INC']
if env['WITH_BF_VERSE']:
- defs.append('WITH_VERSE')
- incs += ' ' + env['BF_VERSE_INCLUDE']
+ defs.append('WITH_VERSE')
+ incs += ' ' + env['BF_VERSE_INCLUDE']
# TODO buildinfo
if env['BF_BUILDINFO']:
- defs.append('NAN_BUILDINFO')
+ defs.append('NAN_BUILDINFO')
if env['BF_NO_ELBEEM']:
- defs.append('DISABLE_ELBEEM')
+ defs.append('DISABLE_ELBEEM')
if env['WITH_BF_SDL']:
- incs += ' ' + env['BF_SDL_INC']
+ incs += ' ' + env['BF_SDL_INC']
else:
- defs.append('DISABLE_SDL')
+ defs.append('DISABLE_SDL')
if env['WITH_BF_BULLET']:
- defs.append('WITH_BULLET')
+ defs.append('WITH_BULLET')
if env['BF_SPLIT_SRC'] and (env['OURPLATFORM'] == 'win32-mingw'):
for i in range(numlibs):
Modified: trunk/blender/source/creator/SConscript
===================================================================
--- trunk/blender/source/creator/SConscript 2009-04-18 10:08:19 UTC (rev 19780)
+++ trunk/blender/source/creator/SConscript 2009-04-18 17:16:08 UTC (rev 19781)
@@ -12,22 +12,24 @@
defs = []
if env['WITH_BF_QUICKTIME']:
- incs += ' ' + env['BF_QUICKTIME_INC']
- defs.append('WITH_QUICKTIME')
+ incs += ' ' + env['BF_QUICKTIME_INC']
+ defs.append('WITH_QUICKTIME')
if env['WITH_BF_BINRELOC']:
- incs += ' ../../extern/binreloc/include'
- defs.append('WITH_BINRELOC')
+ incs += ' ../../extern/binreloc/include'
+ defs.append('WITH_BINRELOC')
if env['WITH_BF_OPENEXR']:
- defs.append('WITH_OPENEXR')
+ defs.append('WITH_OPENEXR')
if not env['WITH_BF_SDL']:
defs.append('DISABLE_SDL')
if env['WITH_BF_PYTHON']:
- incs += ' ../blender/python'
+ incs += ' ../blender/python'
+ if env['BF_DEBUG']:
+ defs.append('_DEBUG')
else:
- defs.append('DISABLE_PYTHON')
+ defs.append('DISABLE_PYTHON')
env.BlenderLib ( libname = 'blender_creator', sources = Split(sources), includes = Split(incs), defines = defs, libtype='core', priority = 1 )
More information about the Bf-blender-cvs
mailing list