== SoC Bullet - Bullet Upgrade to 2.76 ==

Updated Blender's Bullet to 2.76 in this branch only.

This update was done by:
1) deleting the contents of the existing extern/bullet2/src directory (leaving the .svn folder in place),
2) copy/pasting the contents of the bullet/src directory (from unzipped Bullet archive) into this newly cleared folder. 

Hopefully there aren't any patches that are still needed from the Bullet we had in source.

---

Note: I didn't use Moguri's patch, since that was giving me compile errors with headers not being able to be found.

[[Split portion of a mixed commit.]]

1 files changed, 29 insertions, 22 deletions

diff --git a/extern/bullet2/Makefile b/extern/bullet2/Makefile
index d974569e63d..554179558d9 100644
--- a/extern/bullet2/Makefile
+++ b/extern/bullet2/Makefile
@@ -1,5 +1,3 @@
-# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
-# vim: tabstop=8
 #
 # $Id$
 #
@@ -19,47 +17,56 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-# The Original Code is Copyright (C) 2002 by Hans Lambermont
+# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
 # All rights reserved.
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s):
+# Contributor(s): none yet.
 #
 # ***** END GPL LICENSE BLOCK *****
+#
+
 LIBNAME = bullet2
-include nan_definitions.mk
-SOURCEDIR = extern/$(LIBNAME)
 DIR = $(OCGDIR)/extern/$(LIBNAME)
-DIRS = src
-DISTDIR = src
 
 BULLETDIRS = \
 LinearMath \
 BulletCollision/BroadphaseCollision \
 BulletCollision/CollisionShapes \
 BulletCollision/NarrowPhaseCollision \
+BulletCollision/CollisionDispatch \
 BulletCollision/Gimpact \
-BulletCollision//CollisionDispatch \
 BulletDynamics/ConstraintSolver \
 BulletDynamics/Vehicle \
 BulletDynamics/Dynamics \
 BulletSoftBody
 
-include nan_subdirs.mk
+CCSRCS = $(wildcard \
+LinearMath/*.cpp \
+BulletCollision/BroadphaseCollision/*.cpp \
+BulletCollision/CollisionShapes/*.cpp \
+BulletCollision/NarrowPhaseCollision/*.cpp \
+BulletCollision/CollisionDispatch/*.cpp \
+BulletCollision/Gimpact/*.cpp \
+BulletDynamics/ConstraintSolver/*.cpp \
+BulletDynamics/Vehicle/*.cpp \
+BulletDynamics/Dynamics/*.cpp \
+BulletSoftBody/*.cpp)
+
+CPPFLAGS += -D_LIB -I. -IBulletCollision -IBulletDynamics -ILinearMath
 
-CP = $(NANBLENDERHOME)/intern/tools/cpifdiff.sh
+all debug:: objdirs
 
-install: $(ALL_OR_DEBUG)
-	@[ -d $(NAN_BULLET2) ] || mkdir -p $(NAN_BULLET2)
-	@[ -d $(NAN_BULLET2)/include ] || mkdir -p $(NAN_BULLET2)/include
+include nan_compile.mk
+
+.PHONY: objdirs clean
+objdirs:
 	@for i in $(BULLETDIRS); do \
-	[ -d $(NAN_BULLET2)/include/$$i ] || mkdir -p $(NAN_BULLET2)/include/$$i; \
-	$(CP) $(DISTDIR)/$$i/*.h $(NAN_BULLET2)/include/$$i; \
+	[ -d $(DIR)/$(DEBUG_DIR)$$i ] || mkdir -p $(DIR)/$(DEBUG_DIR)$$i; \
 	done
-	@[ -d $(NAN_BULLET2)/lib ] || mkdir -p $(NAN_BULLET2)/lib
-	@$(CP) $(DISTDIR)/*.h $(NAN_BULLET2)/include
-	@$(CP) $(OCGDIR)/extern/bullet2/libbullet2.a $(NAN_BULLET2)/lib
-ifeq ($(OS),darwin)
-	ranlib $(NAN_BULLET2)/lib/libbullet2.a
-endif
+
+clean::
+	rm -rf $(DIR)
+	rm -rf $(NAN_BULLET2)/lib/libbullet2.a
+	rm -rf $(NAN_BULLET2)/include