kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

SCons

Browse Source 
* some misc changes, mainly cleaning and style unification that were lying around
This commit is contained in:
Nathan Letwory 2009-04-18 17:16:08 +00:00
parent 53fd3847bc
commit faef9f0ac7
5 changed files with 79 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
source/blender/blenkernel/SConscript
View File

@ -15,56 +15,58 @@ incs += ' ../gpu #/extern/glew/include'
incs += ' ' + env['BF_OPENGL_INC'] incs += ' ' + env['BF_OPENGL_INC']
incs += ' ' + env['BF_ZLIB_INC'] incs += ' ' + env['BF_ZLIB_INC']
defs = '' defs = []
if not env['WITH_BF_PYTHON']: if not env['WITH_BF_PYTHON']:
defs += 'DISABLE_PYTHON' defs.append('DISABLE_PYTHON')
else: else:
incs += ' ../python' incs += ' ../python'
incs += ' ' + env['BF_PYTHON_INC'] incs += ' ' + env['BF_PYTHON_INC']
if env['BF_DEBUG']:
defs.append('_DEBUG')
if env['WITH_BF_QUICKTIME']: if env['WITH_BF_QUICKTIME']:
incs += ' ../quicktime' incs += ' ../quicktime'
if env['WITH_BF_SDL']: if env['WITH_BF_SDL']:
incs += ' ' + env['BF_SDL_INC'] incs += ' ' + env['BF_SDL_INC']
else: else:
defs += ' DISABLE_SDL' defs.append('DISABLE_SDL')
if env['WITH_BF_INTERNATIONAL']: if env['WITH_BF_INTERNATIONAL']:
defs += ' WITH_FREETYPE2' defs.append('WITH_FREETYPE2')
if env['WITH_BF_VERSE']: if env['WITH_BF_VERSE']:
defs += ' WITH_VERSE' defs.append('WITH_VERSE')
incs += ' ' + env['BF_VERSE_INCLUDE'] incs += ' ' + env['BF_VERSE_INCLUDE']
if env['WITH_BF_VERSE']: if env['WITH_BF_VERSE']:
defs += ' WITH_VERSE' defs.append('WITH_VERSE')
if env['WITH_BF_OPENEXR']: if env['WITH_BF_OPENEXR']:
defs += ' WITH_OPENEXR' defs.append('WITH_OPENEXR')
if env['WITH_BF_OPENJPEG']: if env['WITH_BF_OPENJPEG']:
defs += ' WITH_OPENJPEG' defs.append('WITH_OPENJPEG')
if env['WITH_BF_DDS']: if env['WITH_BF_DDS']:
defs += ' WITH_DDS' defs.append('WITH_DDS')
if env['WITH_BF_FFMPEG']: if env['WITH_BF_FFMPEG']:
defs += ' WITH_FFMPEG' defs.append('WITH_FFMPEG')
incs += ' ' + env['BF_FFMPEG_INC'] incs += ' ' + env['BF_FFMPEG_INC']
if env['WITH_BF_QUICKTIME']: if env['WITH_BF_QUICKTIME']:
defs += ' WITH_QUICKTIME' defs.append('WITH_QUICKTIME')
incs += ' ' + env['BF_QUICKTIME_INC'] incs += ' ' + env['BF_QUICKTIME_INC']
if env['WITH_BF_BULLET']: if env['WITH_BF_BULLET']:
defs += ' WITH_BULLET' defs.append('WITH_BULLET')
if env['BF_NO_ELBEEM']: if env['BF_NO_ELBEEM']:
defs += ' DISABLE_ELBEEM' defs.append('DISABLE_ELBEEM')
if env['WITH_BF_PLAYER']: 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] )

30
source/blender/nodes/SConscript
View File

@ -17,29 +17,31 @@ incs += ' ../gpu #/extern/glew/include '
incs += ' ' + env['BF_OPENGL_INC'] incs += ' ' + env['BF_OPENGL_INC']
incs += ' ' + env['BF_ZLIB_INC'] incs += ' ' + env['BF_ZLIB_INC']
defs = '' defs = []
if env['WITH_BF_PYTHON']: if env['WITH_BF_PYTHON']:
incs += ' ' + env['BF_PYTHON_INC'] incs += ' ' + env['BF_PYTHON_INC']
incs += ' ../python' incs += ' ../python'
if env['BF_DEBUG']:
defs.append('_DEBUG')
else: else:
defs += 'DISABLE_PYTHON' defs.append('DISABLE_PYTHON')
if env['WITH_BF_INTERNATIONAL']: if env['WITH_BF_INTERNATIONAL']:
defs += ' WITH_FREETYPE2' defs.append('WITH_FREETYPE2')
if env['WITH_BF_OPENEXR']: if env['WITH_BF_OPENEXR']:
defs += ' WITH_OPENEXR' defs.append('WITH_OPENEXR')
if env['WITH_BF_FFMPEG']: if env['WITH_BF_FFMPEG']:
defs += ' WITH_FFMPEG' defs.append('WITH_FFMPEG')
incs += ' ' + env['BF_FFMPEG_INC'] incs += ' ' + env['BF_FFMPEG_INC']
if env['WITH_BF_QUICKTIME']: if env['WITH_BF_QUICKTIME']:
defs += ' WITH_QUICKTIME' defs.append('WITH_QUICKTIME')
incs += ' ' + env['BF_QUICKTIME_INC'] 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_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 = Split(defs), libtype=['intern', 'core', 'player'], priority = [200, 175, 300] ) 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 = Split(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 = Split(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] )

9
source/blender/python/SConscript
View File

@ -14,17 +14,20 @@ defs = []
if env['OURPLATFORM'] in ('win32-mingw') and env['BF_DEBUG']: if env['OURPLATFORM'] in ('win32-mingw') and env['BF_DEBUG']:
defs.append('Py_TRACE_REFS') defs.append('Py_TRACE_REFS')
if env['BF_DEBUG']:
defs.append('_DEBUG')
if env['WITH_BF_QUICKTIME']: if env['WITH_BF_QUICKTIME']:
incs += ' ' + env['BF_QUICKTIME_INC'] incs += ' ' + env['BF_QUICKTIME_INC']
defs.append('WITH_QUICKTIME') defs.append('WITH_QUICKTIME')
if env['WITH_BF_OPENEXR']: if env['WITH_BF_OPENEXR']:
defs.append('WITH_OPENEXR') defs.append('WITH_OPENEXR')
if env['WITH_BF_FFMPEG']: if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG') defs.append('WITH_FFMPEG')
if env['BF_BUILDINFO']: 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] ) env.BlenderLib ( libname='blender_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype=['core','game2'], priority = [60,115] )

54
source/blender/src/SConscript
View File

@ -34,39 +34,41 @@ incs += ' ' + env['BF_OPENGL_INC']
defs = [] defs = []
if env['WITH_BF_PYTHON']: 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: else:
defs.append('DISABLE_PYTHON') defs.append('DISABLE_PYTHON')
if env['BF_TWEAK_MODE']: if env['BF_TWEAK_MODE']:
defs.append('TWEAK_MODE') defs.append('TWEAK_MODE')
if not env['WITH_BF_YAFRAY']: if not env['WITH_BF_YAFRAY']:
defs.append('DISABLE_YAFRAY') defs.append('DISABLE_YAFRAY')
if env['WITH_BF_INTERNATIONAL']: if env['WITH_BF_INTERNATIONAL']:
incs += ' ../ftfont' incs += ' ../ftfont'
defs.append('INTERNATIONAL') defs.append('INTERNATIONAL')
defs.append('FTGL_STATIC_LIBRARY') defs.append('FTGL_STATIC_LIBRARY')
if env['WITH_BF_OPENEXR']: if env['WITH_BF_OPENEXR']:
defs.append('WITH_OPENEXR') defs.append('WITH_OPENEXR')
if env['WITH_BF_OPENJPEG']: if env['WITH_BF_OPENJPEG']:
defs.append('WITH_OPENJPEG') defs.append('WITH_OPENJPEG')
if env['WITH_BF_DDS']: if env['WITH_BF_DDS']:
defs.append('WITH_DDS') defs.append('WITH_DDS')
if env['WITH_BF_QUICKTIME']: if env['WITH_BF_QUICKTIME']:
incs += ' ' + env['BF_QUICKTIME_INC'] incs += ' ' + env['BF_QUICKTIME_INC']
defs.append('WITH_QUICKTIME') defs.append('WITH_QUICKTIME')
if env['WITH_BF_ICONV']: if env['WITH_BF_ICONV']:
incs += ' ../quicktime' incs += ' ../quicktime'
incs += ' ' + env['BF_ICONV_INC'] incs += ' ' + env['BF_ICONV_INC']
defs.append('WITH_ICONV') defs.append('WITH_ICONV')
if env['WITH_BF_GAMEENGINE']: if env['WITH_BF_GAMEENGINE']:
defs.append('GAMEBLENDER=1') defs.append('GAMEBLENDER=1')
@ -74,33 +76,33 @@ if env['WITH_BF_GAMEENGINE']:
defs.append('USE_SUMO_SOLID') defs.append('USE_SUMO_SOLID')
if env['WITH_BF_FFMPEG']: if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG') defs.append('WITH_FFMPEG')
incs += ' ' + env['BF_FFMPEG_INC'] incs += ' ' + env['BF_FFMPEG_INC']
if env['WITH_BF_OGG']: if env['WITH_BF_OGG']:
defs.append('WITH_OGG') defs.append('WITH_OGG')
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross'): if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross'):
incs += ' ' + env['BF_PTHREADS_INC'] incs += ' ' + env['BF_PTHREADS_INC']
if env['WITH_BF_VERSE']: if env['WITH_BF_VERSE']:
defs.append('WITH_VERSE') defs.append('WITH_VERSE')
incs += ' ' + env['BF_VERSE_INCLUDE'] incs += ' ' + env['BF_VERSE_INCLUDE']
# TODO buildinfo # TODO buildinfo
if env['BF_BUILDINFO']: if env['BF_BUILDINFO']:
defs.append('NAN_BUILDINFO') defs.append('NAN_BUILDINFO')
if env['BF_NO_ELBEEM']: if env['BF_NO_ELBEEM']:
defs.append('DISABLE_ELBEEM') defs.append('DISABLE_ELBEEM')
if env['WITH_BF_SDL']: if env['WITH_BF_SDL']:
incs += ' ' + env['BF_SDL_INC'] incs += ' ' + env['BF_SDL_INC']
else: else:
defs.append('DISABLE_SDL') defs.append('DISABLE_SDL')
if env['WITH_BF_BULLET']: if env['WITH_BF_BULLET']:
defs.append('WITH_BULLET') defs.append('WITH_BULLET')
if env['BF_SPLIT_SRC'] and (env['OURPLATFORM'] == 'win32-mingw'): if env['BF_SPLIT_SRC'] and (env['OURPLATFORM'] == 'win32-mingw'):
for i in range(numlibs): for i in range(numlibs):

16
source/creator/SConscript
View File

@ -12,22 +12,24 @@ incs += ' ' + env['BF_OPENGL_INC']
defs = [] defs = []
if env['WITH_BF_QUICKTIME']: if env['WITH_BF_QUICKTIME']:
incs += ' ' + env['BF_QUICKTIME_INC'] incs += ' ' + env['BF_QUICKTIME_INC']
defs.append('WITH_QUICKTIME') defs.append('WITH_QUICKTIME')
if env['WITH_BF_BINRELOC']: if env['WITH_BF_BINRELOC']:
incs += ' ../../extern/binreloc/include' incs += ' ../../extern/binreloc/include'
defs.append('WITH_BINRELOC') defs.append('WITH_BINRELOC')
if env['WITH_BF_OPENEXR']: if env['WITH_BF_OPENEXR']:
defs.append('WITH_OPENEXR') defs.append('WITH_OPENEXR')
if not env['WITH_BF_SDL']: if not env['WITH_BF_SDL']:
defs.append('DISABLE_SDL') defs.append('DISABLE_SDL')
if env['WITH_BF_PYTHON']: if env['WITH_BF_PYTHON']:
incs += ' ../blender/python' incs += ' ../blender/python'
if env['BF_DEBUG']:
defs.append('_DEBUG')
else: 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 ) env.BlenderLib ( libname = 'blender_creator', sources = Split(sources), includes = Split(incs), defines = defs, libtype='core', priority = 1 )