From 66ab2a20224c5230dbaaab5398432b2708aaafd8 Mon Sep 17 00:00:00 2001
From: Erwin Coumans
 <erwincoumans@erwincoumans-macbookpro.roam.corp.google.com>
Date: Sat, 3 May 2014 08:48:46 -0700
Subject: [PATCH] fix OSX build

---
 .../btSequentialImpulseConstraintSolver.cpp                 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
index 58a35a289..ddc65f79b 100644
--- a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
+++ b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
@@ -40,7 +40,9 @@ int		gNumSplitImpulseRecoveries = 0;
 
 
 #ifdef USE_SIMD
-#include <intrin.h>//is it safe to include this header?
+#include <emmintrin.h>
+
+//#include <intrin.h>//is it safe to include this header?
 
 #define btVecSplat(x, e) _mm_shuffle_ps(x, x, _MM_SHUFFLE(e,e,e,e))
 static inline __m128 btSimdDot3( __m128 vec0, __m128 vec1 )
@@ -50,6 +52,8 @@ static inline __m128 btSimdDot3( __m128 vec0, __m128 vec1 )
 }
 
 #if defined (BT_USE_SSE4)
+#include <intrin.h>
+
 #define USE_FMA					1
 #define USE_FMA3_INSTEAD_FMA4	1
 #define USE_SSE4_DOT			0