2004-05-16 13:07:20 +00:00
|
|
|
#!/usr/bin/python
|
2004-03-22 22:02:18 +00:00
|
|
|
import sys
|
|
|
|
|
|
2006-02-04 14:15:10 +00:00
|
|
|
Import ('env')
|
|
|
|
|
|
|
|
|
|
sources = env.Glob('*.cpp')
|
2009-02-24 17:34:41 +00:00
|
|
|
defs = ''
|
2006-02-04 14:15:10 +00:00
|
|
|
|
Merge of trunk into blender 2.5:
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.
2008-11-12 21:16:53 +00:00
|
|
|
#XXX
|
2008-08-05 09:35:46 +00:00
|
|
|
# Mathutils C files.
|
Merge of trunk into blender 2.5:
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.
2008-11-12 21:16:53 +00:00
|
|
|
#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',\
|
|
|
|
|
#])
|
2008-08-05 09:35:46 +00:00
|
|
|
|
|
|
|
|
incs = '. #source/blender/python/api2_2x' # Only for Mathutils! - no other deps
|
|
|
|
|
|
|
|
|
|
incs += ' #source/kernel/gen_system #intern/string #intern/guardedalloc'
|
2006-02-04 14:15:10 +00:00
|
|
|
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'
|
2007-12-29 19:04:45 +00:00
|
|
|
incs += ' #source/blender/blenkernel #source/blender #source/blender/editors/include'
|
2006-02-04 14:15:10 +00:00
|
|
|
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'
|
Merge of first part of changes from the apricot branch, especially
the features that are needed to run the game. Compile tested with
scons, make, but not cmake, that seems to have an issue not related
to these changes. The changes include:
* GLSL support in the viewport and game engine, enable in the game
menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.
* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
An extra texture slot shows up once the last slot is used.
* Memory limit for undo, not enabled by default yet because it
needs the .B.blend to be changed.
* Multiple undo for image painting.
* An offset for dupligroups, so not all objects in a group have to
be at the origin.
2008-09-04 20:51:28 +00:00
|
|
|
incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include #source/blender/gpu'
|
2006-02-04 14:15:10 +00:00
|
|
|
|
2009-02-25 12:07:51 +00:00
|
|
|
if env['WITH_BF_SOLID']:
|
|
|
|
|
incs += ' #source/gameengine/Physics/Sumo #source/gameengine/Physics/Sumo/include'
|
|
|
|
|
incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork'
|
|
|
|
|
incs += ' ' + env['BF_SOLID_INC']
|
|
|
|
|
defs += ' USE_SUMO_SOLID'
|
|
|
|
|
|
2006-02-04 14:15:10 +00:00
|
|
|
|
|
|
|
|
incs += ' ' + env['BF_PYTHON_INC']
|
|
|
|
|
incs += ' ' + env['BF_BULLET_INC']
|
2006-06-05 15:52:26 +00:00
|
|
|
incs += ' ' + env['BF_OPENGL_INC']
|
2006-02-04 14:15:10 +00:00
|
|
|
|
2008-11-11 14:14:22 +00:00
|
|
|
if env['WITH_BF_SDL']:
|
|
|
|
|
incs += ' ' + env['BF_SDL_INC']
|
2009-02-24 17:34:41 +00:00
|
|
|
else:
|
|
|
|
|
defs += ' DISABLE_SDL'
|
|
|
|
|
|
2009-02-15 23:26:00 +00:00
|
|
|
cxxflags = []
|
|
|
|
|
if env['OURPLATFORM']=='win32-vc':
|
|
|
|
|
cxxflags.append ('/GR')
|
|
|
|
|
cxxflags.append ('/O2')
|
|
|
|
|
|
2009-03-17 21:44:58 +00:00
|
|
|
env.BlenderLib ( 'bf_ketsji', sources, Split(incs), Split(defs), libtype=['core','player'], priority=[320, 60], cxx_compileflags = cxxflags )
|
