bdfe7d89e2
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416 Issues: * GHOST/X11 had conflicting changes. Some code was added in 2.5, which was later added in trunk also, but reverted partially, specifically revision 16683. I have left out this reversion in the 2.5 branch since I think it is needed there. http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683 * Scons had various conflicting changes, I decided to go with trunk version for everything except priorities and some library renaming. * In creator.c, there were various fixes and fixes for fixes related to the -w -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done differently. Since this is changed so much, and I don't think those fixes would be needed in 2.5, I've left them out. * Also in creator.c: there was code for a python bugfix where the screen was not initialized when running with -P. The code that initializes the screen there I had to disable, that can't work in 2.5 anymore but left it commented as a reminder. Further I had to disable some new function calls. using src/ and python/, as was done already in this branch, disabled function calls: * bpath.c: error reporting * BME_conversions.c: editmesh conversion functions. * SHD_dynamic: disabled almost completely, there is no python/. * KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled. * text.c: clipboard copy call. * object.c: OB_SUPPORT_MATERIAL. * DerivedMesh.c and subsurf_ccg, stipple_quarttone. Still to be done: * Go over files and functions that were moved to a different location but could still use changes that were done in trunk.
43 lines
1.1 KiB
Python
43 lines
1.1 KiB
Python
#!/usr/bin/python
|
|
Import ('env')
|
|
|
|
sources = env.Glob('intern/*.c')
|
|
|
|
incs = '. ../makesdna #/intern/guardedalloc #/intern/memutil ../blenlib'
|
|
incs += ' ../avi ../blenkernel'
|
|
|
|
incs += ' ' + env['BF_JPEG_INC']
|
|
incs += ' ' + env['BF_PNG_INC']
|
|
incs += ' ' + env['BF_TIFF_INC']
|
|
incs += ' ' + env['BF_ZLIB_INC']
|
|
|
|
defs = []
|
|
|
|
if env['WITH_BF_VERSE']:
|
|
defs.append('WITH_VERSE')
|
|
incs += ' ' + env['BF_VERSE_INCLUDE']
|
|
|
|
if env['WITH_BF_OPENEXR']:
|
|
defs.append('WITH_OPENEXR')
|
|
|
|
if env['WITH_BF_DDS']:
|
|
defs.append('WITH_DDS')
|
|
|
|
if env['WITH_BF_FFMPEG']:
|
|
defs.append('WITH_FFMPEG')
|
|
incs += ' ' + env['BF_FFMPEG_INC']
|
|
|
|
if env['WITH_BF_OPENJPEG']:
|
|
defs.append('WITH_OPENJPEG')
|
|
incs += ' ' + env['BF_OPENJPEG_INC']
|
|
|
|
if env['WITH_BF_REDCODE']:
|
|
defs.append('WITH_REDCODE')
|
|
incs += ' ' + env['BF_REDCODE_INC']
|
|
|
|
if env['WITH_BF_QUICKTIME']:
|
|
incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
|
|
defs.append('WITH_QUICKTIME')
|
|
|
|
env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [95, 35] )
|