diff --git a/build/premake4.lua b/build/premake4.lua
index 3bfc4f09d..4fa810fb3 100644
--- a/build/premake4.lua
+++ b/build/premake4.lua
@@ -62,7 +62,6 @@ solution "0BulletSolution"
 	if _ACTION == "xcode4" then
 		if _OPTIONS["ios"] then
 			postfix = "ios";
-			defines {"ARM_NEON_GCC_COMPATIBILITY"}
 			xcodebuildsettings
 			{
 				'INFOPLIST_FILE = "../../Test/Info.plist"',
@@ -83,16 +82,21 @@ solution "0BulletSolution"
 	
 	end
 
+    act = ""
+    
+    if _ACTION then
+        act = _ACTION
+    end
 	configuration {"x32"}
-		targetsuffix ("_" .. _ACTION)
+		targetsuffix ("_" .. act)
 	configuration "x64"		
-		targetsuffix ("_" .. _ACTION .. "_64" )
+		targetsuffix ("_" .. act .. "_64" )
 	configuration {"x64", "debug"}
-		targetsuffix ("_" .. _ACTION .. "_x64_debug")
+		targetsuffix ("_" .. act .. "_x64_debug")
 	configuration {"x64", "release"}
-		targetsuffix ("_" .. _ACTION .. "_x64_release" )
+		targetsuffix ("_" .. act .. "_x64_release" )
 	configuration {"x32", "debug"}
-		targetsuffix ("_" .. _ACTION .. "_debug" )
+		targetsuffix ("_" .. act .. "_debug" )
 	
 	configuration{}
 
@@ -125,7 +129,7 @@ end
 	
 	language "C++"
 	
-	location("./" .. _ACTION .. postfix)
+	location("./" .. act .. postfix)
 
 	
 	if _OPTIONS["with-dx11"] then
diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h
index ac5aac99b..f1b9be68e 100644
--- a/src/LinearMath/btScalar.h
+++ b/src/LinearMath/btScalar.h
@@ -172,15 +172,11 @@ inline int	btGetVersion()
         #endif //BT_USE_SSE
     #elif defined( __arm__ )
         #ifdef __clang__
-        #define BT_USE_NEON 1
-        #if defined BT_USE_NEON && defined (__clang__)
-            #if! defined( ARM_NEON_GCC_COMPATIBILITY )
-                // -DARM_NEON_GCC_COMPATIBILITY=1 changes neon vector types to raw vectors, syntactically similar to SSE and AltiVec
-                // instead of vectors wrapped up in structs. This code base assumes GCC style raw vectors are used.
-                #error The C preprocessor macro ARM_NEON_GCC_COMPATIBILITY must be defined. Pass -DARM_NEON_GCC_COMPATIBILITY=1 to the compiler.
-            #endif//!ARM_NEON_GCC_COMPATIBILITY
-            #include <arm_neon.h>
-        #endif//BT_USE_NEON
+            #define BT_USE_NEON 1
+
+            #if defined BT_USE_NEON && defined (__clang__)
+                #include <arm_neon.h>
+            #endif//BT_USE_NEON
        #endif //__clang__
     #endif//__arm__