From 735d071778b0a245c81f123159d505e6834482a7 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Wed, 4 Jul 2012 22:08:28 +0000 Subject: [PATCH] core: fix Bullet compilation with the Native Client toolchain. --- src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h | 2 +- src/bullet/LinearMath/btSerializer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h b/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h index 409da80a..d46a9ec9 100644 --- a/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h +++ b/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h @@ -92,7 +92,7 @@ subject to the following restrictions: #endif #if DBVT_USE_MEMMOVE -#if !defined( __CELLOS_LV2__) && !defined(__MWERKS__) +#if !defined( __CELLOS_LV2__) && !defined(__MWERKS__) && !defined(__native_client__) #include #endif #include diff --git a/src/bullet/LinearMath/btSerializer.h b/src/bullet/LinearMath/btSerializer.h index 7d90ad20..5e3575e6 100644 --- a/src/bullet/LinearMath/btSerializer.h +++ b/src/bullet/LinearMath/btSerializer.h @@ -20,7 +20,7 @@ subject to the following restrictions: #include "btStackAlloc.h" #include "btHashMap.h" -#if !defined( __CELLOS_LV2__) && !defined(__MWERKS__) +#if !defined( __CELLOS_LV2__) && !defined(__MWERKS__) && !defined(__native_client__) #include #endif #include