diff --git a/build3/premake4.lua b/build3/premake4.lua index cba296b34..a3f020cba 100644 --- a/build3/premake4.lua +++ b/build3/premake4.lua @@ -128,6 +128,7 @@ { 'ARCHS = "$(ARCHS_STANDARD_32_BIT) $(ARCHS_STANDARD_64_BIT)"', 'VALID_ARCHS = "x86_64 i386"', +-- 'SDKROOT = "macosx10.9"', } end end diff --git a/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp b/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp index b96844c7c..811f6a11f 100644 --- a/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp +++ b/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp @@ -27,7 +27,7 @@ GJK-EPA collision solver by Nathanael Presson, 2008 #include "b3SupportMappings.h" -namespace gjkepa2_impl +namespace gjkepa2_impl2 { // Config @@ -832,7 +832,7 @@ namespace gjkepa2_impl // Api // -using namespace gjkepa2_impl; +using namespace gjkepa2_impl2; // int b3GjkEpaSolver2::StackSizeRequirement()