forked from bartvdbraak/blender
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.
52 lines
2.2 KiB
Python
52 lines
2.2 KiB
Python
#!/usr/bin/python
|
|
import sys
|
|
|
|
Import ('env')
|
|
|
|
sources = env.Glob('*.cpp')
|
|
|
|
#XXX
|
|
# Mathutils C files.
|
|
#sources.extend([\
|
|
# '#source/blender/python/api2_2x/Mathutils.c',\
|
|
# '#source/blender/python/api2_2x/constant.c',\
|
|
# '#source/blender/python/api2_2x/euler.c',\
|
|
# '#source/blender/python/api2_2x/gen_utils.c',\
|
|
# '#source/blender/python/api2_2x/matrix.c',\
|
|
# '#source/blender/python/api2_2x/point.c',\
|
|
# '#source/blender/python/api2_2x/quat.c',\
|
|
# '#source/blender/python/api2_2x/vector.c',\
|
|
#])
|
|
|
|
incs = '. #source/blender/python/api2_2x' # Only for Mathutils! - no other deps
|
|
|
|
incs += ' #source/kernel/gen_system #intern/string #intern/guardedalloc'
|
|
incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont'
|
|
incs += ' #intern/SoundSystem #intern/SoundSystem/include #intern/SoundSystem/openal'
|
|
incs += ' #intern/SoundSystem/dummy #intern/SoundSystem/intern #source/gameengine/Converter'
|
|
incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf #intern/moto/include'
|
|
incs += ' #source/gameengine/Ketsji #source/gameengine/Ketsji/KXNetwork #source/blender/blenlib'
|
|
incs += ' #source/blender/blenkernel #source/blender #source/blender/editors/include'
|
|
incs += ' #source/blender/makesdna #source/blender/python #source/gameengine/Rasterizer'
|
|
incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions #source/gameengine/Network'
|
|
incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common #source/gameengine/Physics/Bullet'
|
|
incs += ' #source/gameengine/Physics/BlOde #source/gameengine/Physics/Dummy'
|
|
incs += ' #source/gameengine/Physics/Sumo #source/gameengine/Physics/Sumo/include'
|
|
incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork'
|
|
incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include #source/blender/gpu'
|
|
|
|
cflags = []
|
|
if env['OURPLATFORM'] == 'win32-vc':
|
|
cflags.append('/GR')
|
|
cflags.append('/Ox')
|
|
|
|
incs += ' ' + env['BF_SOLID_INC']
|
|
incs += ' ' + env['BF_PYTHON_INC']
|
|
incs += ' ' + env['BF_BULLET_INC']
|
|
incs += ' ' + env['BF_OPENGL_INC']
|
|
|
|
if env['WITH_BF_SDL']:
|
|
incs += ' ' + env['BF_SDL_INC']
|
|
|
|
env.BlenderLib ( 'bf_ketsji', sources, Split(incs), [], libtype=['game','player'], priority=[25, 60], compileflags = cflags )
|