From 53b04bb203173ff9ea778ecf8f8b851ad184e03e Mon Sep 17 00:00:00 2001 From: Colin Ballast Date: Sat, 4 Oct 2014 12:12:22 -0900 Subject: [PATCH 1/3] Added btStaticGroundShape interface. --- ammo.idl | 5 +++++ bullet/config.h.in | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ammo.idl b/ammo.idl index 704df1ba4..4fff7a862 100644 --- a/ammo.idl +++ b/ammo.idl @@ -263,6 +263,11 @@ interface btConcaveShape { }; btConcaveShape implements btCollisionShape; +interface btStaticPlaneShape { + void btStaticPlaneShape([Const, Ref] btVector3 planeNormal, float planeConstant); +}; +btStaticPlaneShape implements btConcaveShape; + interface btTriangleMeshShape { }; btTriangleMeshShape implements btConcaveShape; diff --git a/bullet/config.h.in b/bullet/config.h.in index 11b564d03..2feb0a3ed 100644 --- a/bullet/config.h.in +++ b/bullet/config.h.in @@ -61,9 +61,6 @@ */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE From 998ee94290bdd9760cff3049aef810cf41ae1be3 Mon Sep 17 00:00:00 2001 From: Colin Ballast Date: Sat, 4 Oct 2014 12:17:35 -0900 Subject: [PATCH 2/3] Removed accidental change to config.h.in. --- bullet/config.h.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bullet/config.h.in b/bullet/config.h.in index 2feb0a3ed..11b564d03 100644 --- a/bullet/config.h.in +++ b/bullet/config.h.in @@ -61,6 +61,9 @@ */ #undef LT_OBJDIR +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + /* Name of package */ #undef PACKAGE From 98b3f3767389a7213296fce519fbd9db313914d8 Mon Sep 17 00:00:00 2001 From: Colin Ballast Date: Wed, 8 Oct 2014 06:32:09 -0900 Subject: [PATCH 3/3] Added little fix to test.py build. --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index 405536699..f272d279b 100644 --- a/test.py +++ b/test.py @@ -21,7 +21,7 @@ print def run(filename): - if JS_ENGINE == SPIDERMONKEY_ENGINE: + if JS_ENGINE == [SPIDERMONKEY_ENGINE]: return Popen(JS_ENGINE + ['-e', 'gcparam("maxBytes", 1024*1024*1024); load("' + build + '"); load("' + os.path.join('tests', 'testutils.js') + '")', filename], stdout=PIPE).communicate()[0] else: return Popen(JS_ENGINE + [build, os.path.join('tests', 'testutils.js'), filename], stdout=PIPE).communicate()[0]