Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove the need for ARM_NEON_GCC_COMPATIBILITY definition (arm/Apple/iOS)

Browse Source
This commit is contained in:
erwin.coumans
2012-08-31 22:41:05 +00:00
parent 84b1774dda
commit 48966ec247
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build/premake4.lua
View File

@@ -62,7 +62,6 @@ solution "0BulletSolution"
if _ACTION == "xcode4" then if _ACTION == "xcode4" then
if _OPTIONS["ios"] then if _OPTIONS["ios"] then
postfix = "ios"; postfix = "ios";
defines {"ARM_NEON_GCC_COMPATIBILITY"}
xcodebuildsettings xcodebuildsettings
{ {
'INFOPLIST_FILE = "../../Test/Info.plist"', 'INFOPLIST_FILE = "../../Test/Info.plist"',
@@ -83,16 +82,21 @@ solution "0BulletSolution"
end end
act = ""
if _ACTION then
act = _ACTION
end
configuration {"x32"} configuration {"x32"}
targetsuffix ("_" .. _ACTION) targetsuffix ("_" .. act)
configuration "x64" configuration "x64"
targetsuffix ("_" .. _ACTION .. "_64" ) targetsuffix ("_" .. act .. "_64" )
configuration {"x64", "debug"} configuration {"x64", "debug"}
targetsuffix ("_" .. _ACTION .. "_x64_debug") targetsuffix ("_" .. act .. "_x64_debug")
configuration {"x64", "release"} configuration {"x64", "release"}
targetsuffix ("_" .. _ACTION .. "_x64_release" ) targetsuffix ("_" .. act .. "_x64_release" )
configuration {"x32", "debug"} configuration {"x32", "debug"}
targetsuffix ("_" .. _ACTION .. "_debug" ) targetsuffix ("_" .. act .. "_debug" )
configuration{} configuration{}
@@ -125,7 +129,7 @@ end
language "C++" language "C++"
location("./" .. _ACTION .. postfix) location("./" .. act .. postfix)
if _OPTIONS["with-dx11"] then if _OPTIONS["with-dx11"] then

14
src/LinearMath/btScalar.h
View File

@@ -172,15 +172,11 @@ inline int btGetVersion()
#endif //BT_USE_SSE #endif //BT_USE_SSE
#elif defined( __arm__ ) #elif defined( __arm__ )
#ifdef __clang__ #ifdef __clang__
#define BT_USE_NEON 1 #define BT_USE_NEON 1
#if defined BT_USE_NEON && defined (__clang__)
#if! defined( ARM_NEON_GCC_COMPATIBILITY ) #if defined BT_USE_NEON && defined (__clang__)
// -DARM_NEON_GCC_COMPATIBILITY=1 changes neon vector types to raw vectors, syntactically similar to SSE and AltiVec #include <arm_neon.h>
// instead of vectors wrapped up in structs. This code base assumes GCC style raw vectors are used. #endif//BT_USE_NEON
#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
#endif //__clang__ #endif //__clang__
#endif//__arm__ #endif//__arm__