[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21084] branches/soc-2009-yukishiro: merge up to 21082
Jingyuan Huang
jingyuan.huang at gmail.com
Mon Jun 22 21:54:01 CEST 2009
Revision: 21084
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21084
Author: yukishiro
Date: 2009-06-22 21:54:00 +0200 (Mon, 22 Jun 2009)
Log Message:
-----------
merge up to 21082
Modified Paths:
--------------
branches/soc-2009-yukishiro/SConstruct
branches/soc-2009-yukishiro/config/darwin-config.py
branches/soc-2009-yukishiro/config/irix6-config.py
branches/soc-2009-yukishiro/config/linux2-config.py
branches/soc-2009-yukishiro/config/linuxcross-config.py
branches/soc-2009-yukishiro/config/openbsd3-config.py
branches/soc-2009-yukishiro/config/sunos5-config.py
branches/soc-2009-yukishiro/config/win32-mingw-config.py
branches/soc-2009-yukishiro/config/win32-vc-config.py
branches/soc-2009-yukishiro/config/win64-vc-config.py
branches/soc-2009-yukishiro/extern/CMakeLists.txt
branches/soc-2009-yukishiro/extern/Makefile
branches/soc-2009-yukishiro/extern/SConscript
branches/soc-2009-yukishiro/intern/bsp/test/Makefile
branches/soc-2009-yukishiro/intern/guardedalloc/intern/mallocn.c
branches/soc-2009-yukishiro/intern/iksolver/test/Makefile
branches/soc-2009-yukishiro/release/ui/buttons_data_bone.py
branches/soc-2009-yukishiro/release/ui/buttons_data_modifier.py
branches/soc-2009-yukishiro/release/ui/buttons_object_constraint.py
branches/soc-2009-yukishiro/release/ui/buttons_objects.py
branches/soc-2009-yukishiro/release/ui/buttons_particle.py
branches/soc-2009-yukishiro/source/Makefile
branches/soc-2009-yukishiro/source/blender/CMakeLists.txt
branches/soc-2009-yukishiro/source/blender/Makefile
branches/soc-2009-yukishiro/source/blender/SConscript
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_action.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_context.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_exotic.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_particle.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2009-yukishiro/source/blender/blenkernel/depsgraph_private.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/action.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/blender.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/constraint.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/context.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/effect.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/exotic.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/idprop.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/ipo.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/multires.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/particle.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/particle_system.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/pointcache.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/scene.c
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_storage.h
branches/soc-2009-yukishiro/source/blender/blenlib/intern/BLI_dynstr.c
branches/soc-2009-yukishiro/source/blender/blenlib/intern/psfont.c
branches/soc-2009-yukishiro/source/blender/blenlib/intern/storage.c
branches/soc-2009-yukishiro/source/blender/blenlib/intern/util.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/readblenentry.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/writefile.c
branches/soc-2009-yukishiro/source/blender/blenpluginapi/intern/Makefile
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_panel.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-yukishiro/source/blender/editors/screen/screen_context.c
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2009-yukishiro/source/blender/editors/space_api/spacetypes.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/SConscript
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_image/space_image.c
branches/soc-2009-yukishiro/source/blender/editors/space_info/SConscript
branches/soc-2009-yukishiro/source/blender/editors/space_logic/SConscript
branches/soc-2009-yukishiro/source/blender/editors/space_node/space_node.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/space_text.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/text_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_conversions.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_input.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_ndofinput.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_numinput.c
branches/soc-2009-yukishiro/source/blender/gpu/intern/Makefile
branches/soc-2009-yukishiro/source/blender/imbuf/intern/imbuf.h
branches/soc-2009-yukishiro/source/blender/imbuf/intern/readimage.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_brush_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_object_force.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_particle_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/intern/makesdna.c
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_access.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_define.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_enum_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ID.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_armature.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_particle.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_rna.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_wm.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_world.c
branches/soc-2009-yukishiro/source/blender/python/BPY_extern.h
branches/soc-2009-yukishiro/source/blender/python/generic/Geometry.c
branches/soc-2009-yukishiro/source/blender/python/generic/Mathutils.c
branches/soc-2009-yukishiro/source/blender/python/generic/Mathutils.h
branches/soc-2009-yukishiro/source/blender/python/generic/euler.c
branches/soc-2009-yukishiro/source/blender/python/generic/euler.h
branches/soc-2009-yukishiro/source/blender/python/generic/matrix.c
branches/soc-2009-yukishiro/source/blender/python/generic/matrix.h
branches/soc-2009-yukishiro/source/blender/python/generic/quat.c
branches/soc-2009-yukishiro/source/blender/python/generic/quat.h
branches/soc-2009-yukishiro/source/blender/python/generic/vector.c
branches/soc-2009-yukishiro/source/blender/python/generic/vector.h
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_ui.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_util.c
branches/soc-2009-yukishiro/source/blender/render/extern/include/RE_render_ext.h
branches/soc-2009-yukishiro/source/blender/render/intern/source/convertblender.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/pipeline.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/zbuf.c
branches/soc-2009-yukishiro/source/blender/sh/intern/compute.c
branches/soc-2009-yukishiro/source/blender/sh/intern/levmar/Axb.c
branches/soc-2009-yukishiro/source/blender/sh/intern/levmar/lm.c
branches/soc-2009-yukishiro/source/blender/sh/intern/levmar/lmbc.c
branches/soc-2009-yukishiro/source/blender/sh/intern/levmar/lmblec.c
branches/soc-2009-yukishiro/source/blender/sh/intern/levmar/lmlec.c
branches/soc-2009-yukishiro/source/blender/sh/intern/levmar/misc.c
branches/soc-2009-yukishiro/source/blender/sh/intern/solve.c
branches/soc-2009-yukishiro/source/blender/windowmanager/WM_types.h
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2009-yukishiro/source/creator/CMakeLists.txt
branches/soc-2009-yukishiro/source/creator/creator.c
branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/Makefile
branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/SConscript
branches/soc-2009-yukishiro/source/gameengine/CMakeLists.txt
branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2009-yukishiro/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
branches/soc-2009-yukishiro/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2009-yukishiro/source/gameengine/Converter/Makefile
branches/soc-2009-yukishiro/source/gameengine/Converter/SConscript
branches/soc-2009-yukishiro/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2009-yukishiro/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2009-yukishiro/source/gameengine/GamePlayer/common/Makefile
branches/soc-2009-yukishiro/source/gameengine/GamePlayer/common/SConscript
branches/soc-2009-yukishiro/source/gameengine/GamePlayer/common/unix/GPU_Engine.cpp
branches/soc-2009-yukishiro/source/gameengine/GamePlayer/common/unix/Makefile
branches/soc-2009-yukishiro/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2009-yukishiro/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2009-yukishiro/source/gameengine/GamePlayer/ghost/Makefile
branches/soc-2009-yukishiro/source/gameengine/GamePlayer/ghost/SConscript
branches/soc-2009-yukishiro/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ClientObjectInfo.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/Makefile
branches/soc-2009-yukishiro/source/gameengine/Ketsji/SConscript
branches/soc-2009-yukishiro/source/gameengine/Physics/Dummy/Makefile
branches/soc-2009-yukishiro/source/gameengine/Physics/Makefile
branches/soc-2009-yukishiro/source/gameengine/Physics/common/Makefile
branches/soc-2009-yukishiro/source/gameengine/SConscript
branches/soc-2009-yukishiro/source/nan_compile.mk
branches/soc-2009-yukishiro/source/nan_definitions.mk
branches/soc-2009-yukishiro/source/nan_link.mk
branches/soc-2009-yukishiro/tools/btools.py
Added Paths:
-----------
branches/soc-2009-yukishiro/release/io/
branches/soc-2009-yukishiro/release/io/export_ply.py
branches/soc-2009-yukishiro/source/blender/editors/include/ED_pointcache.h
branches/soc-2009-yukishiro/source/blender/editors/physics/ed_pointcache.c
Removed Paths:
-------------
branches/soc-2009-yukishiro/extern/qhull/
branches/soc-2009-yukishiro/extern/solid/
branches/soc-2009-yukishiro/release/io/export_ply.py
branches/soc-2009-yukishiro/release/scripts/ply_export.py
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_radio_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_radio.c
branches/soc-2009-yukishiro/source/blender/radiosity/
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_OdePhysicsController.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SumoPhysicsController.h
branches/soc-2009-yukishiro/source/gameengine/Physics/BlOde/
branches/soc-2009-yukishiro/source/gameengine/Physics/Sumo/
Modified: branches/soc-2009-yukishiro/SConstruct
===================================================================
--- branches/soc-2009-yukishiro/SConstruct 2009-06-22 19:35:52 UTC (rev 21083)
+++ branches/soc-2009-yukishiro/SConstruct 2009-06-22 19:54:00 UTC (rev 21084)
@@ -285,9 +285,7 @@
target_env_defs['WITH_BF_SDL'] = False
target_env_defs['WITH_BF_JPEG'] = False
target_env_defs['WITH_BF_PNG'] = False
- target_env_defs['WITH_BF_ODE'] = False
target_env_defs['WITH_BF_BULLET'] = False
- target_env_defs['WITH_BF_SOLID'] = False
target_env_defs['WITH_BF_BINRELOC'] = False
target_env_defs['BF_BUILDINFO'] = False
target_env_defs['BF_NO_ELBEEM'] = True
Modified: branches/soc-2009-yukishiro/config/darwin-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/darwin-config.py 2009-06-22 19:35:52 UTC (rev 21083)
+++ branches/soc-2009-yukishiro/config/darwin-config.py 2009-06-22 19:54:00 UTC (rev 21084)
@@ -141,20 +141,11 @@
WITH_BF_GAMEENGINE=True
WITH_BF_PLAYER=True
-WITH_BF_ODE = False
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = '${BF_ODE}/include'
-BF_ODE_LIB = '${BF_ODE}/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
#WITH_BF_NSPR = True
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
Modified: branches/soc-2009-yukishiro/config/irix6-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/irix6-config.py 2009-06-22 19:35:52 UTC (rev 21083)
+++ branches/soc-2009-yukishiro/config/irix6-config.py 2009-06-22 19:54:00 UTC (rev 21084)
@@ -74,20 +74,11 @@
WITH_BF_GAMEENGINE='false'
-WITH_BF_ODE = 'false'
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
WITH_BF_BULLET = 'true'
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
#WITH_BF_NSPR = 'true'
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
Modified: branches/soc-2009-yukishiro/config/linux2-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/linux2-config.py 2009-06-22 19:35:52 UTC (rev 21083)
+++ branches/soc-2009-yukishiro/config/linux2-config.py 2009-06-22 19:54:00 UTC (rev 21084)
@@ -77,20 +77,11 @@
WITH_BF_GAMEENGINE = False
WITH_BF_PLAYER = False
-WITH_BF_ODE = False
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
#WITH_BF_NSPR = True
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
Modified: branches/soc-2009-yukishiro/config/linuxcross-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/linuxcross-config.py 2009-06-22 19:35:52 UTC (rev 21083)
+++ branches/soc-2009-yukishiro/config/linuxcross-config.py 2009-06-22 19:54:00 UTC (rev 21084)
@@ -74,20 +74,11 @@
WITH_BF_GAMEENGINE = False
-WITH_BF_ODE = True
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
BF_WINTAB = LIBDIR + '/wintab'
BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
Modified: branches/soc-2009-yukishiro/config/openbsd3-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/openbsd3-config.py 2009-06-22 19:35:52 UTC (rev 21083)
+++ branches/soc-2009-yukishiro/config/openbsd3-config.py 2009-06-22 19:54:00 UTC (rev 21084)
@@ -61,20 +61,11 @@
WITH_BF_GAMEENGINE=False
-WITH_BF_ODE = False
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = '${BF_ODE}/include'
-BF_ODE_LIB = '${BF_ODE}/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
#WITH_BF_NSPR = True
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
Modified: branches/soc-2009-yukishiro/config/sunos5-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/sunos5-config.py 2009-06-22 19:35:52 UTC (rev 21083)
+++ branches/soc-2009-yukishiro/config/sunos5-config.py 2009-06-22 19:54:00 UTC (rev 21084)
@@ -69,20 +69,11 @@
WITH_BF_GAMEENGINE=False
-WITH_BF_ODE = False
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
#WITH_BF_NSPR = True
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
Modified: branches/soc-2009-yukishiro/config/win32-mingw-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/win32-mingw-config.py 2009-06-22 19:35:52 UTC (rev 21083)
+++ branches/soc-2009-yukishiro/config/win32-mingw-config.py 2009-06-22 19:54:00 UTC (rev 21084)
@@ -77,20 +77,11 @@
WITH_BF_GAMEENGINE = False
-WITH_BF_ODE = True
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
BF_WINTAB = LIBDIR + '/wintab'
BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
Modified: branches/soc-2009-yukishiro/config/win32-vc-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/win32-vc-config.py 2009-06-22 19:35:52 UTC (rev 21083)
+++ branches/soc-2009-yukishiro/config/win32-vc-config.py 2009-06-22 19:54:00 UTC (rev 21084)
@@ -90,20 +90,11 @@
WITH_BF_GAMEENGINE = True
WITH_BF_PLAYER = True
-WITH_BF_ODE = True
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
BF_WINTAB = LIBDIR + '/wintab'
BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
Modified: branches/soc-2009-yukishiro/config/win64-vc-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/win64-vc-config.py 2009-06-22 19:35:52 UTC (rev 21083)
+++ branches/soc-2009-yukishiro/config/win64-vc-config.py 2009-06-22 19:54:00 UTC (rev 21084)
@@ -93,20 +93,11 @@
WITH_BF_GAMEENGINE = True
WITH_BF_PLAYER = False
-WITH_BF_ODE = True
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
BF_WINTAB = LIBDIR + '/wintab'
BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
Modified: branches/soc-2009-yukishiro/extern/CMakeLists.txt
===================================================================
--- branches/soc-2009-yukishiro/extern/CMakeLists.txt 2009-06-22 19:35:52 UTC (rev 21083)
+++ branches/soc-2009-yukishiro/extern/CMakeLists.txt 2009-06-22 19:54:00 UTC (rev 21084)
@@ -24,11 +24,6 @@
#
# ***** END GPL LICENSE BLOCK *****
-IF(WITH_GAMEENGINE)
- ADD_SUBDIRECTORY(qhull)
- ADD_SUBDIRECTORY(solid)
-ENDIF(WITH_GAMEENGINE)
-
IF(WITH_BULLET)
ADD_SUBDIRECTORY(bullet2)
ENDIF(WITH_BULLET)
Modified: branches/soc-2009-yukishiro/extern/Makefile
===================================================================
--- branches/soc-2009-yukishiro/extern/Makefile 2009-06-22 19:35:52 UTC (rev 21083)
+++ branches/soc-2009-yukishiro/extern/Makefile 2009-06-22 19:54:00 UTC (rev 21084)
@@ -30,7 +30,7 @@
SOURCEDIR = extern
DIR = $(OCGDIR)/extern
-DIRS = qhull/src solid glew/src
+DIRS = glew/src
ifeq ($(WITH_FFMPEG), true)
ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg)
Modified: branches/soc-2009-yukishiro/extern/SConscript
===================================================================
--- branches/soc-2009-yukishiro/extern/SConscript 2009-06-22 19:35:52 UTC (rev 21083)
+++ branches/soc-2009-yukishiro/extern/SConscript 2009-06-22 19:54:00 UTC (rev 21084)
@@ -4,10 +4,6 @@
SConscript(['glew/SConscript'])
-if env['WITH_BF_GAMEENGINE']:
- if env['WITH_BF_SOLID']:
- SConscript(['qhull/SConscript', 'solid/SConscript'])
-
if env['WITH_BF_BULLET']:
SConscript(['bullet2/src/SConscript'])
Modified: branches/soc-2009-yukishiro/intern/bsp/test/Makefile
===================================================================
--- branches/soc-2009-yukishiro/intern/bsp/test/Makefile 2009-06-22 19:35:52 UTC (rev 21083)
+++ branches/soc-2009-yukishiro/intern/bsp/test/Makefile 2009-06-22 19:54:00 UTC (rev 21084)
@@ -47,7 +47,7 @@
SLIBS += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a
SLIBS += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a
-ifeq ($(OS),$(findstring $(OS), "beos darwin linux freebsd openbsd"))
+ifeq ($(OS),$(findstring $(OS), "darwin linux freebsd openbsd"))
LLIBS = -L/usr/X11R6/lib -lglut -pthread -lXi -lXmu
endif
Modified: branches/soc-2009-yukishiro/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2009-yukishiro/intern/guardedalloc/intern/mallocn.c 2009-06-22 19:35:52 UTC (rev 21083)
+++ branches/soc-2009-yukishiro/intern/guardedalloc/intern/mallocn.c 2009-06-22 19:54:00 UTC (rev 21084)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list