From deef9412084d7e9f2a8c2691ae9a2b326541a142 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 2 Feb 2016 00:38:14 +0100 Subject: [PATCH] Fix build error on OS X in previous commit, this define should stay. --- extern/bullet2/patches/blender.patch | 13 ------------- extern/bullet2/src/LinearMath/btScalar.h | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/extern/bullet2/patches/blender.patch b/extern/bullet2/patches/blender.patch index 6bbb683a740..f67d6910422 100644 --- a/extern/bullet2/patches/blender.patch +++ b/extern/bullet2/patches/blender.patch @@ -216,19 +216,6 @@ index 4854f37..9095c59 100644 #include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h" #include "btConvexPolyhedron.h" -diff --git a/extern/bullet2/src/LinearMath/btScalar.h b/extern/bullet2/src/LinearMath/btScalar.h -index 0bfd255..2e24676 100644 ---- a/extern/bullet2/src/LinearMath/btScalar.h -+++ b/extern/bullet2/src/LinearMath/btScalar.h -@@ -179,7 +179,7 @@ inline int btGetVersion() - #define BT_USE_SSE - //BT_USE_SSE_IN_API is enabled on Mac OSX by default, because memory is automatically aligned on 16-byte boundaries - //if apps run into issues, we will disable the next line -- #define BT_USE_SSE_IN_API -+ //#define BT_USE_SSE_IN_API - #ifdef BT_USE_SSE - // include appropriate SSE level - #if defined (__SSE4_1__) diff --git a/extern/bullet2/src/LinearMath/btVector3.cpp b/extern/bullet2/src/LinearMath/btVector3.cpp index e05bdcc..dbcf2b6 100644 --- a/extern/bullet2/src/LinearMath/btVector3.cpp diff --git a/extern/bullet2/src/LinearMath/btScalar.h b/extern/bullet2/src/LinearMath/btScalar.h index 2e246760b82..0bfd255bdb4 100644 --- a/extern/bullet2/src/LinearMath/btScalar.h +++ b/extern/bullet2/src/LinearMath/btScalar.h @@ -179,7 +179,7 @@ inline int btGetVersion() #define BT_USE_SSE //BT_USE_SSE_IN_API is enabled on Mac OSX by default, because memory is automatically aligned on 16-byte boundaries //if apps run into issues, we will disable the next line - //#define BT_USE_SSE_IN_API + #define BT_USE_SSE_IN_API #ifdef BT_USE_SSE // include appropriate SSE level #if defined (__SSE4_1__)