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

soc-2008-mxcurioni: merged changes to revision 17246

Browse Source
This commit is contained in:
Maxime Curioni
2008-10-31 20:05:24 +00:00
parent 911926110b 027d86b9ff
commit 1db8ac58a3
456 changed files with 30443 additions and 9943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/blender/src/SConscript
View File

@@ -5,7 +5,7 @@ Import ('env')
sources = env.Glob('*.c')
if env['BF_SPLIT_SRC'] == 1:
if env['BF_SPLIT_SRC']:
numobj = len(sources)
maxobj = 30
@@ -36,35 +36,41 @@ incs += ' ' + env['BF_OPENGL_INC']
defs = []
if env['BF_TWEAK_MODE'] == 1:
if not env['WITH_BF_PYTHON']:
defs.append('DISABLE_PYTHON')
if env['BF_TWEAK_MODE']:
defs.append('TWEAK_MODE')
if env['WITH_BF_YAFRAY'] == 0:
if not env['WITH_BF_YAFRAY']:
defs.append('DISABLE_YAFRAY')
if env['WITH_BF_INTERNATIONAL'] == 1:
if env['WITH_BF_INTERNATIONAL']:
incs += ' ../ftfont'
defs.append('INTERNATIONAL')
defs.append('FTGL_STATIC_LIBRARY')
if env['WITH_BF_OPENEXR'] == 1:
if env['WITH_BF_OPENEXR']:
defs.append('WITH_OPENEXR')
if env['WITH_BF_DDS'] == 1:
if env['WITH_BF_DDS']:
defs.append('WITH_DDS')
if env['WITH_BF_QUICKTIME']==1:
if env['WITH_BF_QUICKTIME']:
incs += ' ' + env['BF_QUICKTIME_INC']
defs.append('WITH_QUICKTIME')
if env['WITH_BF_ICONV'] == 1:
if env['WITH_BF_ICONV']:
incs += ' ' + env['BF_ICONV_INC']
defs.append('WITH_ICONV')
if env['WITH_BF_FFMPEG'] == 1:
if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG')
incs += ' ' + env['BF_FFMPEG_INC']
if env['WITH_BF_OGG']:
defs.append('WITH_OGG')
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
incs += ' ' + env['BF_PTHREADS_INC']
@@ -73,16 +79,16 @@ if env['WITH_BF_VERSE']:
incs += ' ' + env['BF_VERSE_INCLUDE']
# TODO buildinfo
if env['BF_BUILDINFO'] == 1:
if env['BF_BUILDINFO']:
defs.append('NAN_BUILDINFO')
if env['BF_NO_ELBEEM'] == 1:
if env['BF_NO_ELBEEM']:
defs.append('DISABLE_ELBEEM')
if env['WITH_BF_SDL'] == 0:
if not env['WITH_BF_SDL']:
defs.append('DISABLE_SDL')
if (env['BF_SPLIT_SRC'] == 1) and (env['OURPLATFORM'] == 'win32-mingw'):
if env['BF_SPLIT_SRC'] and (env['OURPLATFORM'] == 'win32-mingw'):
for i in range(numlibs):
env.BlenderLib ( libname = 'src%d' % (i), sources = subsources[i], includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [5, 25] )
else: