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.
45 lines
1.5 KiB
CMake
45 lines
1.5 KiB
CMake
|
|
FILE(GLOB SRC *.cpp)
|
|
|
|
SET(INC
|
|
.
|
|
../../../source/kernel/gen_system
|
|
../../../intern/string
|
|
../../../intern/guardedalloc
|
|
../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
|
|
../../../intern/bmfont
|
|
../../../source/gameengine/Converter
|
|
../../../source/blender/imbuf
|
|
../../../intern/ghost/include
|
|
../../../intern/moto/include
|
|
../../../source/gameengine/Ketsji
|
|
../../../source/blender/blenlib
|
|
../../../source/blender/blenkernel
|
|
../../../source/blender/editors/include
|
|
../../../source/blender/windowmanager
|
|
../../../source/blender
|
|
../../../source/blender/include
|
|
../../../source/blender/makesdna
|
|
../../../source/gameengine/Rasterizer
|
|
../../../source/gameengine/GameLogic
|
|
../../../source/gameengine/Expressions
|
|
../../../source/gameengine/Network
|
|
../../../source/gameengine/SceneGraph
|
|
../../../source/gameengine/Physics/common
|
|
../../../source/gameengine/Physics/Bullet
|
|
../../../source/gameengine/Physics/Sumo
|
|
../../../source/gameengine/Physics/Sumo/Fuzzics/include
|
|
../../../source/gameengine/Network/LoopBackNetwork
|
|
../../../intern/SoundSystem
|
|
../../../source/blender/misc
|
|
../../../source/blender/blenloader
|
|
../../../source/blender/gpu
|
|
../../../extern/bullet2/src
|
|
../../../extern/solid
|
|
../../../extern/glew/include
|
|
${PYTHON_INC}
|
|
)
|
|
|
|
BLENDERLIB(bf_blroutines "${SRC}" "${INC}")
|
|
#env.BlenderLib ( 'bf_bloutines', sources, Split(incs), [], libtype=['game', 'game2', 'player'], priority=[0, 0, 55] , compileflags=cxxflags)
|