Merge branch 'master' of https://bitbucket.org/erwincoumans/bullet3_experiments

2013-04-19 18:30:24 -07:00
parent d086090c77 fd1b00965a
commit dd315d164d
20 changed files with 3228 additions and 24 deletions
--- a/build/premake4.lua
+++ b/build/premake4.lua
@@ -109,6 +109,10 @@
 		include "../btgui/OpenGLTrueTypeFont"
 --		include "../btgui/OpenGLWindow"
 --		include "../demo/ObjLoader"
-		
+		include "../src/Bullet3Dynamics"
+		include "../src/Bullet3Common"
+		include "../src/Bullet3Geometry"
+		include "../src/Bullet3Collision"
+			
 		
 	end