PhysX 3.4, APEX 1.4 patch release @25256367

17 files changed, 324 insertions, 256 deletions

diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevel.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevel.mk
index 1cc3c588..7c902d5b 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevel.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevel.mk
@@ -95,16 +95,16 @@ LowLevel_debug_common_cflags    += $(addprefix -D, $(LowLevel_debug_defines))
 LowLevel_debug_common_cflags    += $(addprefix -I, $(LowLevel_debug_hpaths))
 LowLevel_debug_cflags	:= $(LowLevel_debug_common_cflags)
 LowLevel_debug_cflags  += -arch x86_64
-LowLevel_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevel_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevel_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevel_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevel_debug_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevel_debug_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevel_debug_cflags  += -Wno-c++11-extensions
 LowLevel_debug_cflags  += -g3 -gdwarf-2 -O0
 LowLevel_debug_cppflags	:= $(LowLevel_debug_common_cflags)
 LowLevel_debug_cppflags  += -arch x86_64
-LowLevel_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevel_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevel_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevel_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevel_debug_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevel_debug_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevel_debug_cppflags  += -Wno-c++11-extensions
@@ -113,6 +113,7 @@ LowLevel_debug_lflags    := $(LowLevel_custom_lflags)
 LowLevel_debug_lflags    += $(addprefix -L, $(LowLevel_debug_lpaths))
 LowLevel_debug_lflags  += $(addprefix -l, $(LowLevel_debug_libraries))
 LowLevel_debug_lflags  += -arch x86_64
+LowLevel_debug_lflags  += -stdlib=libc++
 LowLevel_debug_objsdir  = $(OBJS_DIR)/LowLevel_debug
 LowLevel_debug_cpp_o    = $(addprefix $(LowLevel_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevel_cppfiles)))))
 LowLevel_debug_cc_o    = $(addprefix $(LowLevel_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevel_ccfiles)))))
@@ -216,16 +217,16 @@ LowLevel_checked_common_cflags    += $(addprefix -D, $(LowLevel_checked_defines)
 LowLevel_checked_common_cflags    += $(addprefix -I, $(LowLevel_checked_hpaths))
 LowLevel_checked_cflags	:= $(LowLevel_checked_common_cflags)
 LowLevel_checked_cflags  += -arch x86_64
-LowLevel_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevel_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevel_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevel_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevel_checked_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevel_checked_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevel_checked_cflags  += -Wno-c++11-extensions
 LowLevel_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 LowLevel_checked_cppflags	:= $(LowLevel_checked_common_cflags)
 LowLevel_checked_cppflags  += -arch x86_64
-LowLevel_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevel_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevel_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevel_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevel_checked_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevel_checked_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevel_checked_cppflags  += -Wno-c++11-extensions
@@ -234,6 +235,7 @@ LowLevel_checked_lflags    := $(LowLevel_custom_lflags)
 LowLevel_checked_lflags    += $(addprefix -L, $(LowLevel_checked_lpaths))
 LowLevel_checked_lflags  += $(addprefix -l, $(LowLevel_checked_libraries))
 LowLevel_checked_lflags  += -arch x86_64
+LowLevel_checked_lflags  += -stdlib=libc++
 LowLevel_checked_objsdir  = $(OBJS_DIR)/LowLevel_checked
 LowLevel_checked_cpp_o    = $(addprefix $(LowLevel_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevel_cppfiles)))))
 LowLevel_checked_cc_o    = $(addprefix $(LowLevel_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevel_ccfiles)))))
@@ -337,16 +339,16 @@ LowLevel_profile_common_cflags    += $(addprefix -D, $(LowLevel_profile_defines)
 LowLevel_profile_common_cflags    += $(addprefix -I, $(LowLevel_profile_hpaths))
 LowLevel_profile_cflags	:= $(LowLevel_profile_common_cflags)
 LowLevel_profile_cflags  += -arch x86_64
-LowLevel_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevel_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevel_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevel_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevel_profile_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevel_profile_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevel_profile_cflags  += -Wno-c++11-extensions
 LowLevel_profile_cflags  += -O3 -fno-strict-aliasing
 LowLevel_profile_cppflags	:= $(LowLevel_profile_common_cflags)
 LowLevel_profile_cppflags  += -arch x86_64
-LowLevel_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevel_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevel_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevel_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevel_profile_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevel_profile_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevel_profile_cppflags  += -Wno-c++11-extensions
@@ -355,6 +357,7 @@ LowLevel_profile_lflags    := $(LowLevel_custom_lflags)
 LowLevel_profile_lflags    += $(addprefix -L, $(LowLevel_profile_lpaths))
 LowLevel_profile_lflags  += $(addprefix -l, $(LowLevel_profile_libraries))
 LowLevel_profile_lflags  += -arch x86_64
+LowLevel_profile_lflags  += -stdlib=libc++
 LowLevel_profile_objsdir  = $(OBJS_DIR)/LowLevel_profile
 LowLevel_profile_cpp_o    = $(addprefix $(LowLevel_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevel_cppfiles)))))
 LowLevel_profile_cc_o    = $(addprefix $(LowLevel_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevel_ccfiles)))))
@@ -457,16 +460,16 @@ LowLevel_release_common_cflags    += $(addprefix -D, $(LowLevel_release_defines)
 LowLevel_release_common_cflags    += $(addprefix -I, $(LowLevel_release_hpaths))
 LowLevel_release_cflags	:= $(LowLevel_release_common_cflags)
 LowLevel_release_cflags  += -arch x86_64
-LowLevel_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevel_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevel_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevel_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevel_release_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevel_release_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevel_release_cflags  += -Wno-c++11-extensions
 LowLevel_release_cflags  += -O3 -fno-strict-aliasing
 LowLevel_release_cppflags	:= $(LowLevel_release_common_cflags)
 LowLevel_release_cppflags  += -arch x86_64
-LowLevel_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevel_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevel_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevel_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevel_release_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevel_release_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevel_release_cppflags  += -Wno-c++11-extensions
@@ -475,6 +478,7 @@ LowLevel_release_lflags    := $(LowLevel_custom_lflags)
 LowLevel_release_lflags    += $(addprefix -L, $(LowLevel_release_lpaths))
 LowLevel_release_lflags  += $(addprefix -l, $(LowLevel_release_libraries))
 LowLevel_release_lflags  += -arch x86_64
+LowLevel_release_lflags  += -stdlib=libc++
 LowLevel_release_objsdir  = $(OBJS_DIR)/LowLevel_release
 LowLevel_release_cpp_o    = $(addprefix $(LowLevel_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevel_cppfiles)))))
 LowLevel_release_cc_o    = $(addprefix $(LowLevel_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevel_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelAABB.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelAABB.mk
index fe57d638..eaa71a2c 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelAABB.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelAABB.mk
@@ -67,16 +67,16 @@ LowLevelAABB_debug_common_cflags    += $(addprefix -D, $(LowLevelAABB_debug_defi
 LowLevelAABB_debug_common_cflags    += $(addprefix -I, $(LowLevelAABB_debug_hpaths))
 LowLevelAABB_debug_cflags	:= $(LowLevelAABB_debug_common_cflags)
 LowLevelAABB_debug_cflags  += -arch x86_64
-LowLevelAABB_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelAABB_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelAABB_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelAABB_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelAABB_debug_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelAABB_debug_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelAABB_debug_cflags  += -Wno-c++11-extensions
 LowLevelAABB_debug_cflags  += -g3 -gdwarf-2 -O0
 LowLevelAABB_debug_cppflags	:= $(LowLevelAABB_debug_common_cflags)
 LowLevelAABB_debug_cppflags  += -arch x86_64
-LowLevelAABB_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelAABB_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelAABB_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelAABB_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelAABB_debug_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelAABB_debug_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelAABB_debug_cppflags  += -Wno-c++11-extensions
@@ -85,6 +85,7 @@ LowLevelAABB_debug_lflags    := $(LowLevelAABB_custom_lflags)
 LowLevelAABB_debug_lflags    += $(addprefix -L, $(LowLevelAABB_debug_lpaths))
 LowLevelAABB_debug_lflags  += $(addprefix -l, $(LowLevelAABB_debug_libraries))
 LowLevelAABB_debug_lflags  += -arch x86_64
+LowLevelAABB_debug_lflags  += -stdlib=libc++
 LowLevelAABB_debug_objsdir  = $(OBJS_DIR)/LowLevelAABB_debug
 LowLevelAABB_debug_cpp_o    = $(addprefix $(LowLevelAABB_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelAABB_cppfiles)))))
 LowLevelAABB_debug_cc_o    = $(addprefix $(LowLevelAABB_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelAABB_ccfiles)))))
@@ -174,16 +175,16 @@ LowLevelAABB_checked_common_cflags    += $(addprefix -D, $(LowLevelAABB_checked_
 LowLevelAABB_checked_common_cflags    += $(addprefix -I, $(LowLevelAABB_checked_hpaths))
 LowLevelAABB_checked_cflags	:= $(LowLevelAABB_checked_common_cflags)
 LowLevelAABB_checked_cflags  += -arch x86_64
-LowLevelAABB_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelAABB_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelAABB_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelAABB_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelAABB_checked_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelAABB_checked_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelAABB_checked_cflags  += -Wno-c++11-extensions
 LowLevelAABB_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 LowLevelAABB_checked_cppflags	:= $(LowLevelAABB_checked_common_cflags)
 LowLevelAABB_checked_cppflags  += -arch x86_64
-LowLevelAABB_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelAABB_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelAABB_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelAABB_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelAABB_checked_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelAABB_checked_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelAABB_checked_cppflags  += -Wno-c++11-extensions
@@ -192,6 +193,7 @@ LowLevelAABB_checked_lflags    := $(LowLevelAABB_custom_lflags)
 LowLevelAABB_checked_lflags    += $(addprefix -L, $(LowLevelAABB_checked_lpaths))
 LowLevelAABB_checked_lflags  += $(addprefix -l, $(LowLevelAABB_checked_libraries))
 LowLevelAABB_checked_lflags  += -arch x86_64
+LowLevelAABB_checked_lflags  += -stdlib=libc++
 LowLevelAABB_checked_objsdir  = $(OBJS_DIR)/LowLevelAABB_checked
 LowLevelAABB_checked_cpp_o    = $(addprefix $(LowLevelAABB_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelAABB_cppfiles)))))
 LowLevelAABB_checked_cc_o    = $(addprefix $(LowLevelAABB_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelAABB_ccfiles)))))
@@ -281,16 +283,16 @@ LowLevelAABB_profile_common_cflags    += $(addprefix -D, $(LowLevelAABB_profile_
 LowLevelAABB_profile_common_cflags    += $(addprefix -I, $(LowLevelAABB_profile_hpaths))
 LowLevelAABB_profile_cflags	:= $(LowLevelAABB_profile_common_cflags)
 LowLevelAABB_profile_cflags  += -arch x86_64
-LowLevelAABB_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelAABB_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelAABB_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelAABB_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelAABB_profile_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelAABB_profile_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelAABB_profile_cflags  += -Wno-c++11-extensions
 LowLevelAABB_profile_cflags  += -O3 -fno-strict-aliasing
 LowLevelAABB_profile_cppflags	:= $(LowLevelAABB_profile_common_cflags)
 LowLevelAABB_profile_cppflags  += -arch x86_64
-LowLevelAABB_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelAABB_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelAABB_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelAABB_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelAABB_profile_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelAABB_profile_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelAABB_profile_cppflags  += -Wno-c++11-extensions
@@ -299,6 +301,7 @@ LowLevelAABB_profile_lflags    := $(LowLevelAABB_custom_lflags)
 LowLevelAABB_profile_lflags    += $(addprefix -L, $(LowLevelAABB_profile_lpaths))
 LowLevelAABB_profile_lflags  += $(addprefix -l, $(LowLevelAABB_profile_libraries))
 LowLevelAABB_profile_lflags  += -arch x86_64
+LowLevelAABB_profile_lflags  += -stdlib=libc++
 LowLevelAABB_profile_objsdir  = $(OBJS_DIR)/LowLevelAABB_profile
 LowLevelAABB_profile_cpp_o    = $(addprefix $(LowLevelAABB_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelAABB_cppfiles)))))
 LowLevelAABB_profile_cc_o    = $(addprefix $(LowLevelAABB_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelAABB_ccfiles)))))
@@ -387,16 +390,16 @@ LowLevelAABB_release_common_cflags    += $(addprefix -D, $(LowLevelAABB_release_
 LowLevelAABB_release_common_cflags    += $(addprefix -I, $(LowLevelAABB_release_hpaths))
 LowLevelAABB_release_cflags	:= $(LowLevelAABB_release_common_cflags)
 LowLevelAABB_release_cflags  += -arch x86_64
-LowLevelAABB_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelAABB_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelAABB_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelAABB_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelAABB_release_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelAABB_release_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelAABB_release_cflags  += -Wno-c++11-extensions
 LowLevelAABB_release_cflags  += -O3 -fno-strict-aliasing
 LowLevelAABB_release_cppflags	:= $(LowLevelAABB_release_common_cflags)
 LowLevelAABB_release_cppflags  += -arch x86_64
-LowLevelAABB_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelAABB_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelAABB_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelAABB_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelAABB_release_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelAABB_release_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelAABB_release_cppflags  += -Wno-c++11-extensions
@@ -405,6 +408,7 @@ LowLevelAABB_release_lflags    := $(LowLevelAABB_custom_lflags)
 LowLevelAABB_release_lflags    += $(addprefix -L, $(LowLevelAABB_release_lpaths))
 LowLevelAABB_release_lflags  += $(addprefix -l, $(LowLevelAABB_release_libraries))
 LowLevelAABB_release_lflags  += -arch x86_64
+LowLevelAABB_release_lflags  += -stdlib=libc++
 LowLevelAABB_release_objsdir  = $(OBJS_DIR)/LowLevelAABB_release
 LowLevelAABB_release_cpp_o    = $(addprefix $(LowLevelAABB_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelAABB_cppfiles)))))
 LowLevelAABB_release_cc_o    = $(addprefix $(LowLevelAABB_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelAABB_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelCloth.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelCloth.mk
index 3bf9561f..fc44bb82 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelCloth.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelCloth.mk
@@ -62,16 +62,16 @@ LowLevelCloth_debug_common_cflags    += $(addprefix -D, $(LowLevelCloth_debug_de
 LowLevelCloth_debug_common_cflags    += $(addprefix -I, $(LowLevelCloth_debug_hpaths))
 LowLevelCloth_debug_cflags	:= $(LowLevelCloth_debug_common_cflags)
 LowLevelCloth_debug_cflags  += -arch x86_64
-LowLevelCloth_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelCloth_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelCloth_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelCloth_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelCloth_debug_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelCloth_debug_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelCloth_debug_cflags  += -Wno-c++11-extensions
 LowLevelCloth_debug_cflags  += -g3 -gdwarf-2 -O0
 LowLevelCloth_debug_cppflags	:= $(LowLevelCloth_debug_common_cflags)
 LowLevelCloth_debug_cppflags  += -arch x86_64
-LowLevelCloth_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelCloth_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelCloth_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelCloth_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelCloth_debug_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelCloth_debug_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelCloth_debug_cppflags  += -Wno-c++11-extensions
@@ -80,6 +80,7 @@ LowLevelCloth_debug_lflags    := $(LowLevelCloth_custom_lflags)
 LowLevelCloth_debug_lflags    += $(addprefix -L, $(LowLevelCloth_debug_lpaths))
 LowLevelCloth_debug_lflags  += $(addprefix -l, $(LowLevelCloth_debug_libraries))
 LowLevelCloth_debug_lflags  += -arch x86_64
+LowLevelCloth_debug_lflags  += -stdlib=libc++
 LowLevelCloth_debug_objsdir  = $(OBJS_DIR)/LowLevelCloth_debug
 LowLevelCloth_debug_cpp_o    = $(addprefix $(LowLevelCloth_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelCloth_cppfiles)))))
 LowLevelCloth_debug_cc_o    = $(addprefix $(LowLevelCloth_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelCloth_ccfiles)))))
@@ -158,16 +159,16 @@ LowLevelCloth_checked_common_cflags    += $(addprefix -D, $(LowLevelCloth_checke
 LowLevelCloth_checked_common_cflags    += $(addprefix -I, $(LowLevelCloth_checked_hpaths))
 LowLevelCloth_checked_cflags	:= $(LowLevelCloth_checked_common_cflags)
 LowLevelCloth_checked_cflags  += -arch x86_64
-LowLevelCloth_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelCloth_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelCloth_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelCloth_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelCloth_checked_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelCloth_checked_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelCloth_checked_cflags  += -Wno-c++11-extensions
 LowLevelCloth_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 LowLevelCloth_checked_cppflags	:= $(LowLevelCloth_checked_common_cflags)
 LowLevelCloth_checked_cppflags  += -arch x86_64
-LowLevelCloth_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelCloth_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelCloth_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelCloth_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelCloth_checked_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelCloth_checked_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelCloth_checked_cppflags  += -Wno-c++11-extensions
@@ -176,6 +177,7 @@ LowLevelCloth_checked_lflags    := $(LowLevelCloth_custom_lflags)
 LowLevelCloth_checked_lflags    += $(addprefix -L, $(LowLevelCloth_checked_lpaths))
 LowLevelCloth_checked_lflags  += $(addprefix -l, $(LowLevelCloth_checked_libraries))
 LowLevelCloth_checked_lflags  += -arch x86_64
+LowLevelCloth_checked_lflags  += -stdlib=libc++
 LowLevelCloth_checked_objsdir  = $(OBJS_DIR)/LowLevelCloth_checked
 LowLevelCloth_checked_cpp_o    = $(addprefix $(LowLevelCloth_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelCloth_cppfiles)))))
 LowLevelCloth_checked_cc_o    = $(addprefix $(LowLevelCloth_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelCloth_ccfiles)))))
@@ -254,16 +256,16 @@ LowLevelCloth_profile_common_cflags    += $(addprefix -D, $(LowLevelCloth_profil
 LowLevelCloth_profile_common_cflags    += $(addprefix -I, $(LowLevelCloth_profile_hpaths))
 LowLevelCloth_profile_cflags	:= $(LowLevelCloth_profile_common_cflags)
 LowLevelCloth_profile_cflags  += -arch x86_64
-LowLevelCloth_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelCloth_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelCloth_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelCloth_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelCloth_profile_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelCloth_profile_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelCloth_profile_cflags  += -Wno-c++11-extensions
 LowLevelCloth_profile_cflags  += -O3 -fno-strict-aliasing
 LowLevelCloth_profile_cppflags	:= $(LowLevelCloth_profile_common_cflags)
 LowLevelCloth_profile_cppflags  += -arch x86_64
-LowLevelCloth_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelCloth_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelCloth_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelCloth_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelCloth_profile_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelCloth_profile_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelCloth_profile_cppflags  += -Wno-c++11-extensions
@@ -272,6 +274,7 @@ LowLevelCloth_profile_lflags    := $(LowLevelCloth_custom_lflags)
 LowLevelCloth_profile_lflags    += $(addprefix -L, $(LowLevelCloth_profile_lpaths))
 LowLevelCloth_profile_lflags  += $(addprefix -l, $(LowLevelCloth_profile_libraries))
 LowLevelCloth_profile_lflags  += -arch x86_64
+LowLevelCloth_profile_lflags  += -stdlib=libc++
 LowLevelCloth_profile_objsdir  = $(OBJS_DIR)/LowLevelCloth_profile
 LowLevelCloth_profile_cpp_o    = $(addprefix $(LowLevelCloth_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelCloth_cppfiles)))))
 LowLevelCloth_profile_cc_o    = $(addprefix $(LowLevelCloth_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelCloth_ccfiles)))))
@@ -349,16 +352,16 @@ LowLevelCloth_release_common_cflags    += $(addprefix -D, $(LowLevelCloth_releas
 LowLevelCloth_release_common_cflags    += $(addprefix -I, $(LowLevelCloth_release_hpaths))
 LowLevelCloth_release_cflags	:= $(LowLevelCloth_release_common_cflags)
 LowLevelCloth_release_cflags  += -arch x86_64
-LowLevelCloth_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelCloth_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelCloth_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelCloth_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelCloth_release_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelCloth_release_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelCloth_release_cflags  += -Wno-c++11-extensions
 LowLevelCloth_release_cflags  += -O3 -fno-strict-aliasing
 LowLevelCloth_release_cppflags	:= $(LowLevelCloth_release_common_cflags)
 LowLevelCloth_release_cppflags  += -arch x86_64
-LowLevelCloth_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelCloth_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelCloth_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelCloth_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelCloth_release_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelCloth_release_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelCloth_release_cppflags  += -Wno-c++11-extensions
@@ -367,6 +370,7 @@ LowLevelCloth_release_lflags    := $(LowLevelCloth_custom_lflags)
 LowLevelCloth_release_lflags    += $(addprefix -L, $(LowLevelCloth_release_lpaths))
 LowLevelCloth_release_lflags  += $(addprefix -l, $(LowLevelCloth_release_libraries))
 LowLevelCloth_release_lflags  += -arch x86_64
+LowLevelCloth_release_lflags  += -stdlib=libc++
 LowLevelCloth_release_objsdir  = $(OBJS_DIR)/LowLevelCloth_release
 LowLevelCloth_release_cpp_o    = $(addprefix $(LowLevelCloth_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelCloth_cppfiles)))))
 LowLevelCloth_release_cc_o    = $(addprefix $(LowLevelCloth_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelCloth_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelDynamics.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelDynamics.mk
index 98b71a9c..566f3245 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelDynamics.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelDynamics.mk
@@ -88,16 +88,16 @@ LowLevelDynamics_debug_common_cflags    += $(addprefix -D, $(LowLevelDynamics_de
 LowLevelDynamics_debug_common_cflags    += $(addprefix -I, $(LowLevelDynamics_debug_hpaths))
 LowLevelDynamics_debug_cflags	:= $(LowLevelDynamics_debug_common_cflags)
 LowLevelDynamics_debug_cflags  += -arch x86_64
-LowLevelDynamics_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelDynamics_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelDynamics_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelDynamics_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelDynamics_debug_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelDynamics_debug_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelDynamics_debug_cflags  += -Wno-c++11-extensions
 LowLevelDynamics_debug_cflags  += -g3 -gdwarf-2 -O0
 LowLevelDynamics_debug_cppflags	:= $(LowLevelDynamics_debug_common_cflags)
 LowLevelDynamics_debug_cppflags  += -arch x86_64
-LowLevelDynamics_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelDynamics_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelDynamics_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelDynamics_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelDynamics_debug_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelDynamics_debug_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelDynamics_debug_cppflags  += -Wno-c++11-extensions
@@ -106,6 +106,7 @@ LowLevelDynamics_debug_lflags    := $(LowLevelDynamics_custom_lflags)
 LowLevelDynamics_debug_lflags    += $(addprefix -L, $(LowLevelDynamics_debug_lpaths))
 LowLevelDynamics_debug_lflags  += $(addprefix -l, $(LowLevelDynamics_debug_libraries))
 LowLevelDynamics_debug_lflags  += -arch x86_64
+LowLevelDynamics_debug_lflags  += -stdlib=libc++
 LowLevelDynamics_debug_objsdir  = $(OBJS_DIR)/LowLevelDynamics_debug
 LowLevelDynamics_debug_cpp_o    = $(addprefix $(LowLevelDynamics_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelDynamics_cppfiles)))))
 LowLevelDynamics_debug_cc_o    = $(addprefix $(LowLevelDynamics_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelDynamics_ccfiles)))))
@@ -199,16 +200,16 @@ LowLevelDynamics_checked_common_cflags    += $(addprefix -D, $(LowLevelDynamics_
 LowLevelDynamics_checked_common_cflags    += $(addprefix -I, $(LowLevelDynamics_checked_hpaths))
 LowLevelDynamics_checked_cflags	:= $(LowLevelDynamics_checked_common_cflags)
 LowLevelDynamics_checked_cflags  += -arch x86_64
-LowLevelDynamics_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelDynamics_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelDynamics_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelDynamics_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelDynamics_checked_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelDynamics_checked_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelDynamics_checked_cflags  += -Wno-c++11-extensions
 LowLevelDynamics_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 LowLevelDynamics_checked_cppflags	:= $(LowLevelDynamics_checked_common_cflags)
 LowLevelDynamics_checked_cppflags  += -arch x86_64
-LowLevelDynamics_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelDynamics_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelDynamics_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelDynamics_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelDynamics_checked_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelDynamics_checked_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelDynamics_checked_cppflags  += -Wno-c++11-extensions
@@ -217,6 +218,7 @@ LowLevelDynamics_checked_lflags    := $(LowLevelDynamics_custom_lflags)
 LowLevelDynamics_checked_lflags    += $(addprefix -L, $(LowLevelDynamics_checked_lpaths))
 LowLevelDynamics_checked_lflags  += $(addprefix -l, $(LowLevelDynamics_checked_libraries))
 LowLevelDynamics_checked_lflags  += -arch x86_64
+LowLevelDynamics_checked_lflags  += -stdlib=libc++
 LowLevelDynamics_checked_objsdir  = $(OBJS_DIR)/LowLevelDynamics_checked
 LowLevelDynamics_checked_cpp_o    = $(addprefix $(LowLevelDynamics_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelDynamics_cppfiles)))))
 LowLevelDynamics_checked_cc_o    = $(addprefix $(LowLevelDynamics_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelDynamics_ccfiles)))))
@@ -310,16 +312,16 @@ LowLevelDynamics_profile_common_cflags    += $(addprefix -D, $(LowLevelDynamics_
 LowLevelDynamics_profile_common_cflags    += $(addprefix -I, $(LowLevelDynamics_profile_hpaths))
 LowLevelDynamics_profile_cflags	:= $(LowLevelDynamics_profile_common_cflags)
 LowLevelDynamics_profile_cflags  += -arch x86_64
-LowLevelDynamics_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelDynamics_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelDynamics_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelDynamics_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelDynamics_profile_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelDynamics_profile_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelDynamics_profile_cflags  += -Wno-c++11-extensions
 LowLevelDynamics_profile_cflags  += -O3 -fno-strict-aliasing
 LowLevelDynamics_profile_cppflags	:= $(LowLevelDynamics_profile_common_cflags)
 LowLevelDynamics_profile_cppflags  += -arch x86_64
-LowLevelDynamics_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelDynamics_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelDynamics_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelDynamics_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelDynamics_profile_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelDynamics_profile_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelDynamics_profile_cppflags  += -Wno-c++11-extensions
@@ -328,6 +330,7 @@ LowLevelDynamics_profile_lflags    := $(LowLevelDynamics_custom_lflags)
 LowLevelDynamics_profile_lflags    += $(addprefix -L, $(LowLevelDynamics_profile_lpaths))
 LowLevelDynamics_profile_lflags  += $(addprefix -l, $(LowLevelDynamics_profile_libraries))
 LowLevelDynamics_profile_lflags  += -arch x86_64
+LowLevelDynamics_profile_lflags  += -stdlib=libc++
 LowLevelDynamics_profile_objsdir  = $(OBJS_DIR)/LowLevelDynamics_profile
 LowLevelDynamics_profile_cpp_o    = $(addprefix $(LowLevelDynamics_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelDynamics_cppfiles)))))
 LowLevelDynamics_profile_cc_o    = $(addprefix $(LowLevelDynamics_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelDynamics_ccfiles)))))
@@ -420,16 +423,16 @@ LowLevelDynamics_release_common_cflags    += $(addprefix -D, $(LowLevelDynamics_
 LowLevelDynamics_release_common_cflags    += $(addprefix -I, $(LowLevelDynamics_release_hpaths))
 LowLevelDynamics_release_cflags	:= $(LowLevelDynamics_release_common_cflags)
 LowLevelDynamics_release_cflags  += -arch x86_64
-LowLevelDynamics_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelDynamics_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelDynamics_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelDynamics_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelDynamics_release_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelDynamics_release_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelDynamics_release_cflags  += -Wno-c++11-extensions
 LowLevelDynamics_release_cflags  += -O3 -fno-strict-aliasing
 LowLevelDynamics_release_cppflags	:= $(LowLevelDynamics_release_common_cflags)
 LowLevelDynamics_release_cppflags  += -arch x86_64
-LowLevelDynamics_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelDynamics_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelDynamics_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelDynamics_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelDynamics_release_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelDynamics_release_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelDynamics_release_cppflags  += -Wno-c++11-extensions
@@ -438,6 +441,7 @@ LowLevelDynamics_release_lflags    := $(LowLevelDynamics_custom_lflags)
 LowLevelDynamics_release_lflags    += $(addprefix -L, $(LowLevelDynamics_release_lpaths))
 LowLevelDynamics_release_lflags  += $(addprefix -l, $(LowLevelDynamics_release_libraries))
 LowLevelDynamics_release_lflags  += -arch x86_64
+LowLevelDynamics_release_lflags  += -stdlib=libc++
 LowLevelDynamics_release_objsdir  = $(OBJS_DIR)/LowLevelDynamics_release
 LowLevelDynamics_release_cpp_o    = $(addprefix $(LowLevelDynamics_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelDynamics_cppfiles)))))
 LowLevelDynamics_release_cc_o    = $(addprefix $(LowLevelDynamics_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelDynamics_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelParticles.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelParticles.mk
index 91c328a0..830c84d4 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelParticles.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelParticles.mk
@@ -74,16 +74,16 @@ LowLevelParticles_debug_common_cflags    += $(addprefix -D, $(LowLevelParticles_
 LowLevelParticles_debug_common_cflags    += $(addprefix -I, $(LowLevelParticles_debug_hpaths))
 LowLevelParticles_debug_cflags	:= $(LowLevelParticles_debug_common_cflags)
 LowLevelParticles_debug_cflags  += -arch x86_64
-LowLevelParticles_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelParticles_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelParticles_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelParticles_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelParticles_debug_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelParticles_debug_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelParticles_debug_cflags  += -Wno-c++11-extensions
 LowLevelParticles_debug_cflags  += -g3 -gdwarf-2 -O0
 LowLevelParticles_debug_cppflags	:= $(LowLevelParticles_debug_common_cflags)
 LowLevelParticles_debug_cppflags  += -arch x86_64
-LowLevelParticles_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelParticles_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelParticles_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelParticles_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelParticles_debug_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelParticles_debug_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelParticles_debug_cppflags  += -Wno-c++11-extensions
@@ -92,6 +92,7 @@ LowLevelParticles_debug_lflags    := $(LowLevelParticles_custom_lflags)
 LowLevelParticles_debug_lflags    += $(addprefix -L, $(LowLevelParticles_debug_lpaths))
 LowLevelParticles_debug_lflags  += $(addprefix -l, $(LowLevelParticles_debug_libraries))
 LowLevelParticles_debug_lflags  += -arch x86_64
+LowLevelParticles_debug_lflags  += -stdlib=libc++
 LowLevelParticles_debug_objsdir  = $(OBJS_DIR)/LowLevelParticles_debug
 LowLevelParticles_debug_cpp_o    = $(addprefix $(LowLevelParticles_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelParticles_cppfiles)))))
 LowLevelParticles_debug_cc_o    = $(addprefix $(LowLevelParticles_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelParticles_ccfiles)))))
@@ -179,16 +180,16 @@ LowLevelParticles_checked_common_cflags    += $(addprefix -D, $(LowLevelParticle
 LowLevelParticles_checked_common_cflags    += $(addprefix -I, $(LowLevelParticles_checked_hpaths))
 LowLevelParticles_checked_cflags	:= $(LowLevelParticles_checked_common_cflags)
 LowLevelParticles_checked_cflags  += -arch x86_64
-LowLevelParticles_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelParticles_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelParticles_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelParticles_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelParticles_checked_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelParticles_checked_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelParticles_checked_cflags  += -Wno-c++11-extensions
 LowLevelParticles_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 LowLevelParticles_checked_cppflags	:= $(LowLevelParticles_checked_common_cflags)
 LowLevelParticles_checked_cppflags  += -arch x86_64
-LowLevelParticles_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelParticles_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelParticles_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelParticles_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelParticles_checked_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelParticles_checked_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelParticles_checked_cppflags  += -Wno-c++11-extensions
@@ -197,6 +198,7 @@ LowLevelParticles_checked_lflags    := $(LowLevelParticles_custom_lflags)
 LowLevelParticles_checked_lflags    += $(addprefix -L, $(LowLevelParticles_checked_lpaths))
 LowLevelParticles_checked_lflags  += $(addprefix -l, $(LowLevelParticles_checked_libraries))
 LowLevelParticles_checked_lflags  += -arch x86_64
+LowLevelParticles_checked_lflags  += -stdlib=libc++
 LowLevelParticles_checked_objsdir  = $(OBJS_DIR)/LowLevelParticles_checked
 LowLevelParticles_checked_cpp_o    = $(addprefix $(LowLevelParticles_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelParticles_cppfiles)))))
 LowLevelParticles_checked_cc_o    = $(addprefix $(LowLevelParticles_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelParticles_ccfiles)))))
@@ -284,16 +286,16 @@ LowLevelParticles_profile_common_cflags    += $(addprefix -D, $(LowLevelParticle
 LowLevelParticles_profile_common_cflags    += $(addprefix -I, $(LowLevelParticles_profile_hpaths))
 LowLevelParticles_profile_cflags	:= $(LowLevelParticles_profile_common_cflags)
 LowLevelParticles_profile_cflags  += -arch x86_64
-LowLevelParticles_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelParticles_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelParticles_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelParticles_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelParticles_profile_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelParticles_profile_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelParticles_profile_cflags  += -Wno-c++11-extensions
 LowLevelParticles_profile_cflags  += -O3 -fno-strict-aliasing
 LowLevelParticles_profile_cppflags	:= $(LowLevelParticles_profile_common_cflags)
 LowLevelParticles_profile_cppflags  += -arch x86_64
-LowLevelParticles_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelParticles_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelParticles_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelParticles_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelParticles_profile_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelParticles_profile_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelParticles_profile_cppflags  += -Wno-c++11-extensions
@@ -302,6 +304,7 @@ LowLevelParticles_profile_lflags    := $(LowLevelParticles_custom_lflags)
 LowLevelParticles_profile_lflags    += $(addprefix -L, $(LowLevelParticles_profile_lpaths))
 LowLevelParticles_profile_lflags  += $(addprefix -l, $(LowLevelParticles_profile_libraries))
 LowLevelParticles_profile_lflags  += -arch x86_64
+LowLevelParticles_profile_lflags  += -stdlib=libc++
 LowLevelParticles_profile_objsdir  = $(OBJS_DIR)/LowLevelParticles_profile
 LowLevelParticles_profile_cpp_o    = $(addprefix $(LowLevelParticles_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelParticles_cppfiles)))))
 LowLevelParticles_profile_cc_o    = $(addprefix $(LowLevelParticles_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelParticles_ccfiles)))))
@@ -388,16 +391,16 @@ LowLevelParticles_release_common_cflags    += $(addprefix -D, $(LowLevelParticle
 LowLevelParticles_release_common_cflags    += $(addprefix -I, $(LowLevelParticles_release_hpaths))
 LowLevelParticles_release_cflags	:= $(LowLevelParticles_release_common_cflags)
 LowLevelParticles_release_cflags  += -arch x86_64
-LowLevelParticles_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelParticles_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelParticles_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelParticles_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelParticles_release_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelParticles_release_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelParticles_release_cflags  += -Wno-c++11-extensions
 LowLevelParticles_release_cflags  += -O3 -fno-strict-aliasing
 LowLevelParticles_release_cppflags	:= $(LowLevelParticles_release_common_cflags)
 LowLevelParticles_release_cppflags  += -arch x86_64
-LowLevelParticles_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-LowLevelParticles_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+LowLevelParticles_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+LowLevelParticles_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 LowLevelParticles_release_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 LowLevelParticles_release_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 LowLevelParticles_release_cppflags  += -Wno-c++11-extensions
@@ -406,6 +409,7 @@ LowLevelParticles_release_lflags    := $(LowLevelParticles_custom_lflags)
 LowLevelParticles_release_lflags    += $(addprefix -L, $(LowLevelParticles_release_lpaths))
 LowLevelParticles_release_lflags  += $(addprefix -l, $(LowLevelParticles_release_libraries))
 LowLevelParticles_release_lflags  += -arch x86_64
+LowLevelParticles_release_lflags  += -stdlib=libc++
 LowLevelParticles_release_objsdir  = $(OBJS_DIR)/LowLevelParticles_release
 LowLevelParticles_release_cpp_o    = $(addprefix $(LowLevelParticles_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(LowLevelParticles_cppfiles)))))
 LowLevelParticles_release_cc_o    = $(addprefix $(LowLevelParticles_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(LowLevelParticles_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysX.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysX.mk
index e8e0d05b..aa7390b2 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysX.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysX.mk
@@ -137,16 +137,16 @@ PhysX_release_common_cflags    += $(addprefix -D, $(PhysX_release_defines))
 PhysX_release_common_cflags    += $(addprefix -I, $(PhysX_release_hpaths))
 PhysX_release_cflags	:= $(PhysX_release_common_cflags)
 PhysX_release_cflags  += -arch x86_64
-PhysX_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysX_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysX_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysX_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysX_release_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysX_release_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysX_release_cflags  += -Wno-c++11-extensions
 PhysX_release_cflags  += -O3 -fno-strict-aliasing
 PhysX_release_cppflags	:= $(PhysX_release_common_cflags)
 PhysX_release_cppflags  += -arch x86_64
-PhysX_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysX_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysX_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysX_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysX_release_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysX_release_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysX_release_cppflags  += -Wno-c++11-extensions
@@ -155,6 +155,7 @@ PhysX_release_lflags    := $(PhysX_custom_lflags)
 PhysX_release_lflags    += $(addprefix -L, $(PhysX_release_lpaths))
 PhysX_release_lflags  += $(addprefix -l, $(PhysX_release_libraries))
 PhysX_release_lflags  += -arch x86_64
+PhysX_release_lflags  += -stdlib=libc++
 PhysX_release_objsdir  = $(OBJS_DIR)/PhysX_release
 PhysX_release_cpp_o    = $(addprefix $(PhysX_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysX_cppfiles)))))
 PhysX_release_cc_o    = $(addprefix $(PhysX_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysX_ccfiles)))))
@@ -282,16 +283,16 @@ PhysX_debug_common_cflags    += $(addprefix -D, $(PhysX_debug_defines))
 PhysX_debug_common_cflags    += $(addprefix -I, $(PhysX_debug_hpaths))
 PhysX_debug_cflags	:= $(PhysX_debug_common_cflags)
 PhysX_debug_cflags  += -arch x86_64
-PhysX_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysX_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysX_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysX_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysX_debug_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysX_debug_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysX_debug_cflags  += -Wno-c++11-extensions
 PhysX_debug_cflags  += -g3 -gdwarf-2 -O0
 PhysX_debug_cppflags	:= $(PhysX_debug_common_cflags)
 PhysX_debug_cppflags  += -arch x86_64
-PhysX_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysX_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysX_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysX_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysX_debug_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysX_debug_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysX_debug_cppflags  += -Wno-c++11-extensions
@@ -300,6 +301,7 @@ PhysX_debug_lflags    := $(PhysX_custom_lflags)
 PhysX_debug_lflags    += $(addprefix -L, $(PhysX_debug_lpaths))
 PhysX_debug_lflags  += $(addprefix -l, $(PhysX_debug_libraries))
 PhysX_debug_lflags  += -arch x86_64
+PhysX_debug_lflags  += -stdlib=libc++
 PhysX_debug_objsdir  = $(OBJS_DIR)/PhysX_debug
 PhysX_debug_cpp_o    = $(addprefix $(PhysX_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysX_cppfiles)))))
 PhysX_debug_cc_o    = $(addprefix $(PhysX_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysX_ccfiles)))))
@@ -426,16 +428,16 @@ PhysX_checked_common_cflags    += $(addprefix -D, $(PhysX_checked_defines))
 PhysX_checked_common_cflags    += $(addprefix -I, $(PhysX_checked_hpaths))
 PhysX_checked_cflags	:= $(PhysX_checked_common_cflags)
 PhysX_checked_cflags  += -arch x86_64
-PhysX_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysX_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysX_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysX_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysX_checked_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysX_checked_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysX_checked_cflags  += -Wno-c++11-extensions
 PhysX_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 PhysX_checked_cppflags	:= $(PhysX_checked_common_cflags)
 PhysX_checked_cppflags  += -arch x86_64
-PhysX_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysX_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysX_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysX_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysX_checked_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysX_checked_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysX_checked_cppflags  += -Wno-c++11-extensions
@@ -444,6 +446,7 @@ PhysX_checked_lflags    := $(PhysX_custom_lflags)
 PhysX_checked_lflags    += $(addprefix -L, $(PhysX_checked_lpaths))
 PhysX_checked_lflags  += $(addprefix -l, $(PhysX_checked_libraries))
 PhysX_checked_lflags  += -arch x86_64
+PhysX_checked_lflags  += -stdlib=libc++
 PhysX_checked_objsdir  = $(OBJS_DIR)/PhysX_checked
 PhysX_checked_cpp_o    = $(addprefix $(PhysX_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysX_cppfiles)))))
 PhysX_checked_cc_o    = $(addprefix $(PhysX_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysX_ccfiles)))))
@@ -570,16 +573,16 @@ PhysX_profile_common_cflags    += $(addprefix -D, $(PhysX_profile_defines))
 PhysX_profile_common_cflags    += $(addprefix -I, $(PhysX_profile_hpaths))
 PhysX_profile_cflags	:= $(PhysX_profile_common_cflags)
 PhysX_profile_cflags  += -arch x86_64
-PhysX_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysX_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysX_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysX_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysX_profile_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysX_profile_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysX_profile_cflags  += -Wno-c++11-extensions
 PhysX_profile_cflags  += -O3 -fno-strict-aliasing
 PhysX_profile_cppflags	:= $(PhysX_profile_common_cflags)
 PhysX_profile_cppflags  += -arch x86_64
-PhysX_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysX_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysX_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysX_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysX_profile_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysX_profile_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysX_profile_cppflags  += -Wno-c++11-extensions
@@ -588,6 +591,7 @@ PhysX_profile_lflags    := $(PhysX_custom_lflags)
 PhysX_profile_lflags    += $(addprefix -L, $(PhysX_profile_lpaths))
 PhysX_profile_lflags  += $(addprefix -l, $(PhysX_profile_libraries))
 PhysX_profile_lflags  += -arch x86_64
+PhysX_profile_lflags  += -stdlib=libc++
 PhysX_profile_objsdir  = $(OBJS_DIR)/PhysX_profile
 PhysX_profile_cpp_o    = $(addprefix $(PhysX_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysX_cppfiles)))))
 PhysX_profile_cc_o    = $(addprefix $(PhysX_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysX_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCharacterKinematic.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCharacterKinematic.mk
index 7a2ab721..8511c6c6 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCharacterKinematic.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCharacterKinematic.mk
@@ -75,16 +75,16 @@ PhysXCharacterKinematic_debug_common_cflags    += $(addprefix -D, $(PhysXCharact
 PhysXCharacterKinematic_debug_common_cflags    += $(addprefix -I, $(PhysXCharacterKinematic_debug_hpaths))
 PhysXCharacterKinematic_debug_cflags	:= $(PhysXCharacterKinematic_debug_common_cflags)
 PhysXCharacterKinematic_debug_cflags  += -arch x86_64
-PhysXCharacterKinematic_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCharacterKinematic_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCharacterKinematic_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCharacterKinematic_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCharacterKinematic_debug_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCharacterKinematic_debug_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCharacterKinematic_debug_cflags  += -Wno-c++11-extensions
 PhysXCharacterKinematic_debug_cflags  += -g3 -gdwarf-2 -O0
 PhysXCharacterKinematic_debug_cppflags	:= $(PhysXCharacterKinematic_debug_common_cflags)
 PhysXCharacterKinematic_debug_cppflags  += -arch x86_64
-PhysXCharacterKinematic_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCharacterKinematic_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCharacterKinematic_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCharacterKinematic_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCharacterKinematic_debug_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCharacterKinematic_debug_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCharacterKinematic_debug_cppflags  += -Wno-c++11-extensions
@@ -93,6 +93,7 @@ PhysXCharacterKinematic_debug_lflags    := $(PhysXCharacterKinematic_custom_lfla
 PhysXCharacterKinematic_debug_lflags    += $(addprefix -L, $(PhysXCharacterKinematic_debug_lpaths))
 PhysXCharacterKinematic_debug_lflags  += $(addprefix -l, $(PhysXCharacterKinematic_debug_libraries))
 PhysXCharacterKinematic_debug_lflags  += -arch x86_64
+PhysXCharacterKinematic_debug_lflags  += -stdlib=libc++
 PhysXCharacterKinematic_debug_objsdir  = $(OBJS_DIR)/PhysXCharacterKinematic_debug
 PhysXCharacterKinematic_debug_cpp_o    = $(addprefix $(PhysXCharacterKinematic_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXCharacterKinematic_cppfiles)))))
 PhysXCharacterKinematic_debug_cc_o    = $(addprefix $(PhysXCharacterKinematic_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXCharacterKinematic_ccfiles)))))
@@ -187,16 +188,16 @@ PhysXCharacterKinematic_checked_common_cflags    += $(addprefix -D, $(PhysXChara
 PhysXCharacterKinematic_checked_common_cflags    += $(addprefix -I, $(PhysXCharacterKinematic_checked_hpaths))
 PhysXCharacterKinematic_checked_cflags	:= $(PhysXCharacterKinematic_checked_common_cflags)
 PhysXCharacterKinematic_checked_cflags  += -arch x86_64
-PhysXCharacterKinematic_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCharacterKinematic_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCharacterKinematic_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCharacterKinematic_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCharacterKinematic_checked_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCharacterKinematic_checked_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCharacterKinematic_checked_cflags  += -Wno-c++11-extensions
 PhysXCharacterKinematic_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 PhysXCharacterKinematic_checked_cppflags	:= $(PhysXCharacterKinematic_checked_common_cflags)
 PhysXCharacterKinematic_checked_cppflags  += -arch x86_64
-PhysXCharacterKinematic_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCharacterKinematic_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCharacterKinematic_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCharacterKinematic_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCharacterKinematic_checked_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCharacterKinematic_checked_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCharacterKinematic_checked_cppflags  += -Wno-c++11-extensions
@@ -205,6 +206,7 @@ PhysXCharacterKinematic_checked_lflags    := $(PhysXCharacterKinematic_custom_lf
 PhysXCharacterKinematic_checked_lflags    += $(addprefix -L, $(PhysXCharacterKinematic_checked_lpaths))
 PhysXCharacterKinematic_checked_lflags  += $(addprefix -l, $(PhysXCharacterKinematic_checked_libraries))
 PhysXCharacterKinematic_checked_lflags  += -arch x86_64
+PhysXCharacterKinematic_checked_lflags  += -stdlib=libc++
 PhysXCharacterKinematic_checked_objsdir  = $(OBJS_DIR)/PhysXCharacterKinematic_checked
 PhysXCharacterKinematic_checked_cpp_o    = $(addprefix $(PhysXCharacterKinematic_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXCharacterKinematic_cppfiles)))))
 PhysXCharacterKinematic_checked_cc_o    = $(addprefix $(PhysXCharacterKinematic_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXCharacterKinematic_ccfiles)))))
@@ -299,16 +301,16 @@ PhysXCharacterKinematic_profile_common_cflags    += $(addprefix -D, $(PhysXChara
 PhysXCharacterKinematic_profile_common_cflags    += $(addprefix -I, $(PhysXCharacterKinematic_profile_hpaths))
 PhysXCharacterKinematic_profile_cflags	:= $(PhysXCharacterKinematic_profile_common_cflags)
 PhysXCharacterKinematic_profile_cflags  += -arch x86_64
-PhysXCharacterKinematic_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCharacterKinematic_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCharacterKinematic_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCharacterKinematic_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCharacterKinematic_profile_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCharacterKinematic_profile_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCharacterKinematic_profile_cflags  += -Wno-c++11-extensions
 PhysXCharacterKinematic_profile_cflags  += -O3 -fno-strict-aliasing
 PhysXCharacterKinematic_profile_cppflags	:= $(PhysXCharacterKinematic_profile_common_cflags)
 PhysXCharacterKinematic_profile_cppflags  += -arch x86_64
-PhysXCharacterKinematic_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCharacterKinematic_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCharacterKinematic_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCharacterKinematic_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCharacterKinematic_profile_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCharacterKinematic_profile_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCharacterKinematic_profile_cppflags  += -Wno-c++11-extensions
@@ -317,6 +319,7 @@ PhysXCharacterKinematic_profile_lflags    := $(PhysXCharacterKinematic_custom_lf
 PhysXCharacterKinematic_profile_lflags    += $(addprefix -L, $(PhysXCharacterKinematic_profile_lpaths))
 PhysXCharacterKinematic_profile_lflags  += $(addprefix -l, $(PhysXCharacterKinematic_profile_libraries))
 PhysXCharacterKinematic_profile_lflags  += -arch x86_64
+PhysXCharacterKinematic_profile_lflags  += -stdlib=libc++
 PhysXCharacterKinematic_profile_objsdir  = $(OBJS_DIR)/PhysXCharacterKinematic_profile
 PhysXCharacterKinematic_profile_cpp_o    = $(addprefix $(PhysXCharacterKinematic_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXCharacterKinematic_cppfiles)))))
 PhysXCharacterKinematic_profile_cc_o    = $(addprefix $(PhysXCharacterKinematic_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXCharacterKinematic_ccfiles)))))
@@ -410,16 +413,16 @@ PhysXCharacterKinematic_release_common_cflags    += $(addprefix -D, $(PhysXChara
 PhysXCharacterKinematic_release_common_cflags    += $(addprefix -I, $(PhysXCharacterKinematic_release_hpaths))
 PhysXCharacterKinematic_release_cflags	:= $(PhysXCharacterKinematic_release_common_cflags)
 PhysXCharacterKinematic_release_cflags  += -arch x86_64
-PhysXCharacterKinematic_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCharacterKinematic_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCharacterKinematic_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCharacterKinematic_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCharacterKinematic_release_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCharacterKinematic_release_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCharacterKinematic_release_cflags  += -Wno-c++11-extensions
 PhysXCharacterKinematic_release_cflags  += -O3 -fno-strict-aliasing
 PhysXCharacterKinematic_release_cppflags	:= $(PhysXCharacterKinematic_release_common_cflags)
 PhysXCharacterKinematic_release_cppflags  += -arch x86_64
-PhysXCharacterKinematic_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCharacterKinematic_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCharacterKinematic_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCharacterKinematic_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCharacterKinematic_release_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCharacterKinematic_release_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCharacterKinematic_release_cppflags  += -Wno-c++11-extensions
@@ -428,6 +431,7 @@ PhysXCharacterKinematic_release_lflags    := $(PhysXCharacterKinematic_custom_lf
 PhysXCharacterKinematic_release_lflags    += $(addprefix -L, $(PhysXCharacterKinematic_release_lpaths))
 PhysXCharacterKinematic_release_lflags  += $(addprefix -l, $(PhysXCharacterKinematic_release_libraries))
 PhysXCharacterKinematic_release_lflags  += -arch x86_64
+PhysXCharacterKinematic_release_lflags  += -stdlib=libc++
 PhysXCharacterKinematic_release_objsdir  = $(OBJS_DIR)/PhysXCharacterKinematic_release
 PhysXCharacterKinematic_release_cpp_o    = $(addprefix $(PhysXCharacterKinematic_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXCharacterKinematic_cppfiles)))))
 PhysXCharacterKinematic_release_cc_o    = $(addprefix $(PhysXCharacterKinematic_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXCharacterKinematic_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCommon.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCommon.mk
index 5020a3d6..70367dcc 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCommon.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCommon.mk
@@ -201,16 +201,16 @@ PhysXCommon_release_common_cflags    += $(addprefix -D, $(PhysXCommon_release_de
 PhysXCommon_release_common_cflags    += $(addprefix -I, $(PhysXCommon_release_hpaths))
 PhysXCommon_release_cflags	:= $(PhysXCommon_release_common_cflags)
 PhysXCommon_release_cflags  += -arch x86_64
-PhysXCommon_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCommon_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCommon_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCommon_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCommon_release_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCommon_release_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCommon_release_cflags  += -Wno-c++11-extensions
 PhysXCommon_release_cflags  += -O3 -fno-strict-aliasing
 PhysXCommon_release_cppflags	:= $(PhysXCommon_release_common_cflags)
 PhysXCommon_release_cppflags  += -arch x86_64
-PhysXCommon_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCommon_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCommon_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCommon_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCommon_release_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCommon_release_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCommon_release_cppflags  += -Wno-c++11-extensions
@@ -219,6 +219,7 @@ PhysXCommon_release_lflags    := $(PhysXCommon_custom_lflags)
 PhysXCommon_release_lflags    += $(addprefix -L, $(PhysXCommon_release_lpaths))
 PhysXCommon_release_lflags  += $(addprefix -l, $(PhysXCommon_release_libraries))
 PhysXCommon_release_lflags  += -arch x86_64
+PhysXCommon_release_lflags  += -stdlib=libc++
 PhysXCommon_release_objsdir  = $(OBJS_DIR)/PhysXCommon_release
 PhysXCommon_release_cpp_o    = $(addprefix $(PhysXCommon_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXCommon_cppfiles)))))
 PhysXCommon_release_cc_o    = $(addprefix $(PhysXCommon_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXCommon_ccfiles)))))
@@ -317,16 +318,16 @@ PhysXCommon_debug_common_cflags    += $(addprefix -D, $(PhysXCommon_debug_define
 PhysXCommon_debug_common_cflags    += $(addprefix -I, $(PhysXCommon_debug_hpaths))
 PhysXCommon_debug_cflags	:= $(PhysXCommon_debug_common_cflags)
 PhysXCommon_debug_cflags  += -arch x86_64
-PhysXCommon_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCommon_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCommon_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCommon_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCommon_debug_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCommon_debug_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCommon_debug_cflags  += -Wno-c++11-extensions
 PhysXCommon_debug_cflags  += -g3 -gdwarf-2 -O0
 PhysXCommon_debug_cppflags	:= $(PhysXCommon_debug_common_cflags)
 PhysXCommon_debug_cppflags  += -arch x86_64
-PhysXCommon_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCommon_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCommon_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCommon_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCommon_debug_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCommon_debug_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCommon_debug_cppflags  += -Wno-c++11-extensions
@@ -335,6 +336,7 @@ PhysXCommon_debug_lflags    := $(PhysXCommon_custom_lflags)
 PhysXCommon_debug_lflags    += $(addprefix -L, $(PhysXCommon_debug_lpaths))
 PhysXCommon_debug_lflags  += $(addprefix -l, $(PhysXCommon_debug_libraries))
 PhysXCommon_debug_lflags  += -arch x86_64
+PhysXCommon_debug_lflags  += -stdlib=libc++
 PhysXCommon_debug_objsdir  = $(OBJS_DIR)/PhysXCommon_debug
 PhysXCommon_debug_cpp_o    = $(addprefix $(PhysXCommon_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXCommon_cppfiles)))))
 PhysXCommon_debug_cc_o    = $(addprefix $(PhysXCommon_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXCommon_ccfiles)))))
@@ -432,16 +434,16 @@ PhysXCommon_checked_common_cflags    += $(addprefix -D, $(PhysXCommon_checked_de
 PhysXCommon_checked_common_cflags    += $(addprefix -I, $(PhysXCommon_checked_hpaths))
 PhysXCommon_checked_cflags	:= $(PhysXCommon_checked_common_cflags)
 PhysXCommon_checked_cflags  += -arch x86_64
-PhysXCommon_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCommon_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCommon_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCommon_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCommon_checked_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCommon_checked_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCommon_checked_cflags  += -Wno-c++11-extensions
 PhysXCommon_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 PhysXCommon_checked_cppflags	:= $(PhysXCommon_checked_common_cflags)
 PhysXCommon_checked_cppflags  += -arch x86_64
-PhysXCommon_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCommon_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCommon_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCommon_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCommon_checked_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCommon_checked_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCommon_checked_cppflags  += -Wno-c++11-extensions
@@ -450,6 +452,7 @@ PhysXCommon_checked_lflags    := $(PhysXCommon_custom_lflags)
 PhysXCommon_checked_lflags    += $(addprefix -L, $(PhysXCommon_checked_lpaths))
 PhysXCommon_checked_lflags  += $(addprefix -l, $(PhysXCommon_checked_libraries))
 PhysXCommon_checked_lflags  += -arch x86_64
+PhysXCommon_checked_lflags  += -stdlib=libc++
 PhysXCommon_checked_objsdir  = $(OBJS_DIR)/PhysXCommon_checked
 PhysXCommon_checked_cpp_o    = $(addprefix $(PhysXCommon_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXCommon_cppfiles)))))
 PhysXCommon_checked_cc_o    = $(addprefix $(PhysXCommon_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXCommon_ccfiles)))))
@@ -547,16 +550,16 @@ PhysXCommon_profile_common_cflags    += $(addprefix -D, $(PhysXCommon_profile_de
 PhysXCommon_profile_common_cflags    += $(addprefix -I, $(PhysXCommon_profile_hpaths))
 PhysXCommon_profile_cflags	:= $(PhysXCommon_profile_common_cflags)
 PhysXCommon_profile_cflags  += -arch x86_64
-PhysXCommon_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCommon_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCommon_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCommon_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCommon_profile_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCommon_profile_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCommon_profile_cflags  += -Wno-c++11-extensions
 PhysXCommon_profile_cflags  += -O3 -fno-strict-aliasing
 PhysXCommon_profile_cppflags	:= $(PhysXCommon_profile_common_cflags)
 PhysXCommon_profile_cppflags  += -arch x86_64
-PhysXCommon_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCommon_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCommon_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCommon_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCommon_profile_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCommon_profile_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCommon_profile_cppflags  += -Wno-c++11-extensions
@@ -565,6 +568,7 @@ PhysXCommon_profile_lflags    := $(PhysXCommon_custom_lflags)
 PhysXCommon_profile_lflags    += $(addprefix -L, $(PhysXCommon_profile_lpaths))
 PhysXCommon_profile_lflags  += $(addprefix -l, $(PhysXCommon_profile_libraries))
 PhysXCommon_profile_lflags  += -arch x86_64
+PhysXCommon_profile_lflags  += -stdlib=libc++
 PhysXCommon_profile_objsdir  = $(OBJS_DIR)/PhysXCommon_profile
 PhysXCommon_profile_cpp_o    = $(addprefix $(PhysXCommon_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXCommon_cppfiles)))))
 PhysXCommon_profile_cc_o    = $(addprefix $(PhysXCommon_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXCommon_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCooking.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCooking.mk
index 6f0f1634..15a4c71d 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCooking.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCooking.mk
@@ -92,16 +92,16 @@ PhysXCooking_release_common_cflags    += $(addprefix -D, $(PhysXCooking_release_
 PhysXCooking_release_common_cflags    += $(addprefix -I, $(PhysXCooking_release_hpaths))
 PhysXCooking_release_cflags	:= $(PhysXCooking_release_common_cflags)
 PhysXCooking_release_cflags  += -arch x86_64
-PhysXCooking_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCooking_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCooking_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCooking_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCooking_release_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCooking_release_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCooking_release_cflags  += -Wno-c++11-extensions
 PhysXCooking_release_cflags  += -O3 -fno-strict-aliasing
 PhysXCooking_release_cppflags	:= $(PhysXCooking_release_common_cflags)
 PhysXCooking_release_cppflags  += -arch x86_64
-PhysXCooking_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCooking_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCooking_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCooking_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCooking_release_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCooking_release_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCooking_release_cppflags  += -Wno-c++11-extensions
@@ -110,6 +110,7 @@ PhysXCooking_release_lflags    := $(PhysXCooking_custom_lflags)
 PhysXCooking_release_lflags    += $(addprefix -L, $(PhysXCooking_release_lpaths))
 PhysXCooking_release_lflags  += $(addprefix -l, $(PhysXCooking_release_libraries))
 PhysXCooking_release_lflags  += -arch x86_64
+PhysXCooking_release_lflags  += -stdlib=libc++
 PhysXCooking_release_objsdir  = $(OBJS_DIR)/PhysXCooking_release
 PhysXCooking_release_cpp_o    = $(addprefix $(PhysXCooking_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXCooking_cppfiles)))))
 PhysXCooking_release_cc_o    = $(addprefix $(PhysXCooking_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXCooking_ccfiles)))))
@@ -215,16 +216,16 @@ PhysXCooking_debug_common_cflags    += $(addprefix -D, $(PhysXCooking_debug_defi
 PhysXCooking_debug_common_cflags    += $(addprefix -I, $(PhysXCooking_debug_hpaths))
 PhysXCooking_debug_cflags	:= $(PhysXCooking_debug_common_cflags)
 PhysXCooking_debug_cflags  += -arch x86_64
-PhysXCooking_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCooking_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCooking_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCooking_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCooking_debug_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCooking_debug_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCooking_debug_cflags  += -Wno-c++11-extensions
 PhysXCooking_debug_cflags  += -g3 -gdwarf-2 -O0
 PhysXCooking_debug_cppflags	:= $(PhysXCooking_debug_common_cflags)
 PhysXCooking_debug_cppflags  += -arch x86_64
-PhysXCooking_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCooking_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCooking_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCooking_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCooking_debug_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCooking_debug_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCooking_debug_cppflags  += -Wno-c++11-extensions
@@ -233,6 +234,7 @@ PhysXCooking_debug_lflags    := $(PhysXCooking_custom_lflags)
 PhysXCooking_debug_lflags    += $(addprefix -L, $(PhysXCooking_debug_lpaths))
 PhysXCooking_debug_lflags  += $(addprefix -l, $(PhysXCooking_debug_libraries))
 PhysXCooking_debug_lflags  += -arch x86_64
+PhysXCooking_debug_lflags  += -stdlib=libc++
 PhysXCooking_debug_objsdir  = $(OBJS_DIR)/PhysXCooking_debug
 PhysXCooking_debug_cpp_o    = $(addprefix $(PhysXCooking_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXCooking_cppfiles)))))
 PhysXCooking_debug_cc_o    = $(addprefix $(PhysXCooking_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXCooking_ccfiles)))))
@@ -337,16 +339,16 @@ PhysXCooking_checked_common_cflags    += $(addprefix -D, $(PhysXCooking_checked_
 PhysXCooking_checked_common_cflags    += $(addprefix -I, $(PhysXCooking_checked_hpaths))
 PhysXCooking_checked_cflags	:= $(PhysXCooking_checked_common_cflags)
 PhysXCooking_checked_cflags  += -arch x86_64
-PhysXCooking_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCooking_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCooking_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCooking_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCooking_checked_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCooking_checked_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCooking_checked_cflags  += -Wno-c++11-extensions
 PhysXCooking_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 PhysXCooking_checked_cppflags	:= $(PhysXCooking_checked_common_cflags)
 PhysXCooking_checked_cppflags  += -arch x86_64
-PhysXCooking_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCooking_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCooking_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCooking_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCooking_checked_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCooking_checked_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCooking_checked_cppflags  += -Wno-c++11-extensions
@@ -355,6 +357,7 @@ PhysXCooking_checked_lflags    := $(PhysXCooking_custom_lflags)
 PhysXCooking_checked_lflags    += $(addprefix -L, $(PhysXCooking_checked_lpaths))
 PhysXCooking_checked_lflags  += $(addprefix -l, $(PhysXCooking_checked_libraries))
 PhysXCooking_checked_lflags  += -arch x86_64
+PhysXCooking_checked_lflags  += -stdlib=libc++
 PhysXCooking_checked_objsdir  = $(OBJS_DIR)/PhysXCooking_checked
 PhysXCooking_checked_cpp_o    = $(addprefix $(PhysXCooking_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXCooking_cppfiles)))))
 PhysXCooking_checked_cc_o    = $(addprefix $(PhysXCooking_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXCooking_ccfiles)))))
@@ -459,16 +462,16 @@ PhysXCooking_profile_common_cflags    += $(addprefix -D, $(PhysXCooking_profile_
 PhysXCooking_profile_common_cflags    += $(addprefix -I, $(PhysXCooking_profile_hpaths))
 PhysXCooking_profile_cflags	:= $(PhysXCooking_profile_common_cflags)
 PhysXCooking_profile_cflags  += -arch x86_64
-PhysXCooking_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCooking_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCooking_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCooking_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCooking_profile_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCooking_profile_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCooking_profile_cflags  += -Wno-c++11-extensions
 PhysXCooking_profile_cflags  += -O3 -fno-strict-aliasing
 PhysXCooking_profile_cppflags	:= $(PhysXCooking_profile_common_cflags)
 PhysXCooking_profile_cppflags  += -arch x86_64
-PhysXCooking_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXCooking_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXCooking_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXCooking_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXCooking_profile_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXCooking_profile_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXCooking_profile_cppflags  += -Wno-c++11-extensions
@@ -477,6 +480,7 @@ PhysXCooking_profile_lflags    := $(PhysXCooking_custom_lflags)
 PhysXCooking_profile_lflags    += $(addprefix -L, $(PhysXCooking_profile_lpaths))
 PhysXCooking_profile_lflags  += $(addprefix -l, $(PhysXCooking_profile_libraries))
 PhysXCooking_profile_lflags  += -arch x86_64
+PhysXCooking_profile_lflags  += -stdlib=libc++
 PhysXCooking_profile_objsdir  = $(OBJS_DIR)/PhysXCooking_profile
 PhysXCooking_profile_cpp_o    = $(addprefix $(PhysXCooking_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXCooking_cppfiles)))))
 PhysXCooking_profile_cc_o    = $(addprefix $(PhysXCooking_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXCooking_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXExtensions.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXExtensions.mk
index 11a6d0fa..3f4a5dfa 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXExtensions.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXExtensions.mk
@@ -130,16 +130,16 @@ PhysXExtensions_debug_common_cflags    += $(addprefix -D, $(PhysXExtensions_debu
 PhysXExtensions_debug_common_cflags    += $(addprefix -I, $(PhysXExtensions_debug_hpaths))
 PhysXExtensions_debug_cflags	:= $(PhysXExtensions_debug_common_cflags)
 PhysXExtensions_debug_cflags  += -arch x86_64
-PhysXExtensions_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXExtensions_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXExtensions_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXExtensions_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXExtensions_debug_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXExtensions_debug_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXExtensions_debug_cflags  += -Wno-c++11-extensions
 PhysXExtensions_debug_cflags  += -g3 -gdwarf-2 -O0
 PhysXExtensions_debug_cppflags	:= $(PhysXExtensions_debug_common_cflags)
 PhysXExtensions_debug_cppflags  += -arch x86_64
-PhysXExtensions_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXExtensions_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXExtensions_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXExtensions_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXExtensions_debug_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXExtensions_debug_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXExtensions_debug_cppflags  += -Wno-c++11-extensions
@@ -148,6 +148,7 @@ PhysXExtensions_debug_lflags    := $(PhysXExtensions_custom_lflags)
 PhysXExtensions_debug_lflags    += $(addprefix -L, $(PhysXExtensions_debug_lpaths))
 PhysXExtensions_debug_lflags  += $(addprefix -l, $(PhysXExtensions_debug_libraries))
 PhysXExtensions_debug_lflags  += -arch x86_64
+PhysXExtensions_debug_lflags  += -stdlib=libc++
 PhysXExtensions_debug_objsdir  = $(OBJS_DIR)/PhysXExtensions_debug
 PhysXExtensions_debug_cpp_o    = $(addprefix $(PhysXExtensions_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXExtensions_cppfiles)))))
 PhysXExtensions_debug_cc_o    = $(addprefix $(PhysXExtensions_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXExtensions_ccfiles)))))
@@ -253,16 +254,16 @@ PhysXExtensions_checked_common_cflags    += $(addprefix -D, $(PhysXExtensions_ch
 PhysXExtensions_checked_common_cflags    += $(addprefix -I, $(PhysXExtensions_checked_hpaths))
 PhysXExtensions_checked_cflags	:= $(PhysXExtensions_checked_common_cflags)
 PhysXExtensions_checked_cflags  += -arch x86_64
-PhysXExtensions_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXExtensions_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXExtensions_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXExtensions_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXExtensions_checked_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXExtensions_checked_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXExtensions_checked_cflags  += -Wno-c++11-extensions
 PhysXExtensions_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 PhysXExtensions_checked_cppflags	:= $(PhysXExtensions_checked_common_cflags)
 PhysXExtensions_checked_cppflags  += -arch x86_64
-PhysXExtensions_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXExtensions_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXExtensions_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXExtensions_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXExtensions_checked_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXExtensions_checked_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXExtensions_checked_cppflags  += -Wno-c++11-extensions
@@ -271,6 +272,7 @@ PhysXExtensions_checked_lflags    := $(PhysXExtensions_custom_lflags)
 PhysXExtensions_checked_lflags    += $(addprefix -L, $(PhysXExtensions_checked_lpaths))
 PhysXExtensions_checked_lflags  += $(addprefix -l, $(PhysXExtensions_checked_libraries))
 PhysXExtensions_checked_lflags  += -arch x86_64
+PhysXExtensions_checked_lflags  += -stdlib=libc++
 PhysXExtensions_checked_objsdir  = $(OBJS_DIR)/PhysXExtensions_checked
 PhysXExtensions_checked_cpp_o    = $(addprefix $(PhysXExtensions_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXExtensions_cppfiles)))))
 PhysXExtensions_checked_cc_o    = $(addprefix $(PhysXExtensions_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXExtensions_ccfiles)))))
@@ -376,16 +378,16 @@ PhysXExtensions_profile_common_cflags    += $(addprefix -D, $(PhysXExtensions_pr
 PhysXExtensions_profile_common_cflags    += $(addprefix -I, $(PhysXExtensions_profile_hpaths))
 PhysXExtensions_profile_cflags	:= $(PhysXExtensions_profile_common_cflags)
 PhysXExtensions_profile_cflags  += -arch x86_64
-PhysXExtensions_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXExtensions_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXExtensions_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXExtensions_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXExtensions_profile_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXExtensions_profile_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXExtensions_profile_cflags  += -Wno-c++11-extensions
 PhysXExtensions_profile_cflags  += -O3 -fno-strict-aliasing
 PhysXExtensions_profile_cppflags	:= $(PhysXExtensions_profile_common_cflags)
 PhysXExtensions_profile_cppflags  += -arch x86_64
-PhysXExtensions_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXExtensions_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXExtensions_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXExtensions_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXExtensions_profile_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXExtensions_profile_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXExtensions_profile_cppflags  += -Wno-c++11-extensions
@@ -394,6 +396,7 @@ PhysXExtensions_profile_lflags    := $(PhysXExtensions_custom_lflags)
 PhysXExtensions_profile_lflags    += $(addprefix -L, $(PhysXExtensions_profile_lpaths))
 PhysXExtensions_profile_lflags  += $(addprefix -l, $(PhysXExtensions_profile_libraries))
 PhysXExtensions_profile_lflags  += -arch x86_64
+PhysXExtensions_profile_lflags  += -stdlib=libc++
 PhysXExtensions_profile_objsdir  = $(OBJS_DIR)/PhysXExtensions_profile
 PhysXExtensions_profile_cpp_o    = $(addprefix $(PhysXExtensions_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXExtensions_cppfiles)))))
 PhysXExtensions_profile_cc_o    = $(addprefix $(PhysXExtensions_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXExtensions_ccfiles)))))
@@ -498,16 +501,16 @@ PhysXExtensions_release_common_cflags    += $(addprefix -D, $(PhysXExtensions_re
 PhysXExtensions_release_common_cflags    += $(addprefix -I, $(PhysXExtensions_release_hpaths))
 PhysXExtensions_release_cflags	:= $(PhysXExtensions_release_common_cflags)
 PhysXExtensions_release_cflags  += -arch x86_64
-PhysXExtensions_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXExtensions_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXExtensions_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXExtensions_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXExtensions_release_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXExtensions_release_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXExtensions_release_cflags  += -Wno-c++11-extensions
 PhysXExtensions_release_cflags  += -O3 -fno-strict-aliasing
 PhysXExtensions_release_cppflags	:= $(PhysXExtensions_release_common_cflags)
 PhysXExtensions_release_cppflags  += -arch x86_64
-PhysXExtensions_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXExtensions_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXExtensions_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXExtensions_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXExtensions_release_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXExtensions_release_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXExtensions_release_cppflags  += -Wno-c++11-extensions
@@ -516,6 +519,7 @@ PhysXExtensions_release_lflags    := $(PhysXExtensions_custom_lflags)
 PhysXExtensions_release_lflags    += $(addprefix -L, $(PhysXExtensions_release_lpaths))
 PhysXExtensions_release_lflags  += $(addprefix -l, $(PhysXExtensions_release_libraries))
 PhysXExtensions_release_lflags  += -arch x86_64
+PhysXExtensions_release_lflags  += -stdlib=libc++
 PhysXExtensions_release_objsdir  = $(OBJS_DIR)/PhysXExtensions_release
 PhysXExtensions_release_cpp_o    = $(addprefix $(PhysXExtensions_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXExtensions_cppfiles)))))
 PhysXExtensions_release_cc_o    = $(addprefix $(PhysXExtensions_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXExtensions_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXVehicle.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXVehicle.mk
index c3a864e3..2e39ba71 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXVehicle.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXVehicle.mk
@@ -77,16 +77,16 @@ PhysXVehicle_debug_common_cflags    += $(addprefix -D, $(PhysXVehicle_debug_defi
 PhysXVehicle_debug_common_cflags    += $(addprefix -I, $(PhysXVehicle_debug_hpaths))
 PhysXVehicle_debug_cflags	:= $(PhysXVehicle_debug_common_cflags)
 PhysXVehicle_debug_cflags  += -arch x86_64
-PhysXVehicle_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXVehicle_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXVehicle_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXVehicle_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXVehicle_debug_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXVehicle_debug_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXVehicle_debug_cflags  += -Wno-c++11-extensions
 PhysXVehicle_debug_cflags  += -g3 -gdwarf-2 -O0
 PhysXVehicle_debug_cppflags	:= $(PhysXVehicle_debug_common_cflags)
 PhysXVehicle_debug_cppflags  += -arch x86_64
-PhysXVehicle_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXVehicle_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXVehicle_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXVehicle_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXVehicle_debug_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXVehicle_debug_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXVehicle_debug_cppflags  += -Wno-c++11-extensions
@@ -95,6 +95,7 @@ PhysXVehicle_debug_lflags    := $(PhysXVehicle_custom_lflags)
 PhysXVehicle_debug_lflags    += $(addprefix -L, $(PhysXVehicle_debug_lpaths))
 PhysXVehicle_debug_lflags  += $(addprefix -l, $(PhysXVehicle_debug_libraries))
 PhysXVehicle_debug_lflags  += -arch x86_64
+PhysXVehicle_debug_lflags  += -stdlib=libc++
 PhysXVehicle_debug_objsdir  = $(OBJS_DIR)/PhysXVehicle_debug
 PhysXVehicle_debug_cpp_o    = $(addprefix $(PhysXVehicle_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXVehicle_cppfiles)))))
 PhysXVehicle_debug_cc_o    = $(addprefix $(PhysXVehicle_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXVehicle_ccfiles)))))
@@ -183,16 +184,16 @@ PhysXVehicle_checked_common_cflags    += $(addprefix -D, $(PhysXVehicle_checked_
 PhysXVehicle_checked_common_cflags    += $(addprefix -I, $(PhysXVehicle_checked_hpaths))
 PhysXVehicle_checked_cflags	:= $(PhysXVehicle_checked_common_cflags)
 PhysXVehicle_checked_cflags  += -arch x86_64
-PhysXVehicle_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXVehicle_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXVehicle_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXVehicle_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXVehicle_checked_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXVehicle_checked_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXVehicle_checked_cflags  += -Wno-c++11-extensions
 PhysXVehicle_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 PhysXVehicle_checked_cppflags	:= $(PhysXVehicle_checked_common_cflags)
 PhysXVehicle_checked_cppflags  += -arch x86_64
-PhysXVehicle_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXVehicle_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXVehicle_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXVehicle_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXVehicle_checked_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXVehicle_checked_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXVehicle_checked_cppflags  += -Wno-c++11-extensions
@@ -201,6 +202,7 @@ PhysXVehicle_checked_lflags    := $(PhysXVehicle_custom_lflags)
 PhysXVehicle_checked_lflags    += $(addprefix -L, $(PhysXVehicle_checked_lpaths))
 PhysXVehicle_checked_lflags  += $(addprefix -l, $(PhysXVehicle_checked_libraries))
 PhysXVehicle_checked_lflags  += -arch x86_64
+PhysXVehicle_checked_lflags  += -stdlib=libc++
 PhysXVehicle_checked_objsdir  = $(OBJS_DIR)/PhysXVehicle_checked
 PhysXVehicle_checked_cpp_o    = $(addprefix $(PhysXVehicle_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXVehicle_cppfiles)))))
 PhysXVehicle_checked_cc_o    = $(addprefix $(PhysXVehicle_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXVehicle_ccfiles)))))
@@ -289,16 +291,16 @@ PhysXVehicle_profile_common_cflags    += $(addprefix -D, $(PhysXVehicle_profile_
 PhysXVehicle_profile_common_cflags    += $(addprefix -I, $(PhysXVehicle_profile_hpaths))
 PhysXVehicle_profile_cflags	:= $(PhysXVehicle_profile_common_cflags)
 PhysXVehicle_profile_cflags  += -arch x86_64
-PhysXVehicle_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXVehicle_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXVehicle_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXVehicle_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXVehicle_profile_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXVehicle_profile_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXVehicle_profile_cflags  += -Wno-c++11-extensions
 PhysXVehicle_profile_cflags  += -O3 -fno-strict-aliasing
 PhysXVehicle_profile_cppflags	:= $(PhysXVehicle_profile_common_cflags)
 PhysXVehicle_profile_cppflags  += -arch x86_64
-PhysXVehicle_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXVehicle_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXVehicle_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXVehicle_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXVehicle_profile_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXVehicle_profile_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXVehicle_profile_cppflags  += -Wno-c++11-extensions
@@ -307,6 +309,7 @@ PhysXVehicle_profile_lflags    := $(PhysXVehicle_custom_lflags)
 PhysXVehicle_profile_lflags    += $(addprefix -L, $(PhysXVehicle_profile_lpaths))
 PhysXVehicle_profile_lflags  += $(addprefix -l, $(PhysXVehicle_profile_libraries))
 PhysXVehicle_profile_lflags  += -arch x86_64
+PhysXVehicle_profile_lflags  += -stdlib=libc++
 PhysXVehicle_profile_objsdir  = $(OBJS_DIR)/PhysXVehicle_profile
 PhysXVehicle_profile_cpp_o    = $(addprefix $(PhysXVehicle_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXVehicle_cppfiles)))))
 PhysXVehicle_profile_cc_o    = $(addprefix $(PhysXVehicle_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXVehicle_ccfiles)))))
@@ -394,16 +397,16 @@ PhysXVehicle_release_common_cflags    += $(addprefix -D, $(PhysXVehicle_release_
 PhysXVehicle_release_common_cflags    += $(addprefix -I, $(PhysXVehicle_release_hpaths))
 PhysXVehicle_release_cflags	:= $(PhysXVehicle_release_common_cflags)
 PhysXVehicle_release_cflags  += -arch x86_64
-PhysXVehicle_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXVehicle_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXVehicle_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXVehicle_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXVehicle_release_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXVehicle_release_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXVehicle_release_cflags  += -Wno-c++11-extensions
 PhysXVehicle_release_cflags  += -O3 -fno-strict-aliasing
 PhysXVehicle_release_cppflags	:= $(PhysXVehicle_release_common_cflags)
 PhysXVehicle_release_cppflags  += -arch x86_64
-PhysXVehicle_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PhysXVehicle_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+PhysXVehicle_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PhysXVehicle_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PhysXVehicle_release_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PhysXVehicle_release_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PhysXVehicle_release_cppflags  += -Wno-c++11-extensions
@@ -412,6 +415,7 @@ PhysXVehicle_release_lflags    := $(PhysXVehicle_custom_lflags)
 PhysXVehicle_release_lflags    += $(addprefix -L, $(PhysXVehicle_release_lpaths))
 PhysXVehicle_release_lflags  += $(addprefix -l, $(PhysXVehicle_release_libraries))
 PhysXVehicle_release_lflags  += -arch x86_64
+PhysXVehicle_release_lflags  += -stdlib=libc++
 PhysXVehicle_release_objsdir  = $(OBJS_DIR)/PhysXVehicle_release
 PhysXVehicle_release_cpp_o    = $(addprefix $(PhysXVehicle_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PhysXVehicle_cppfiles)))))
 PhysXVehicle_release_cc_o    = $(addprefix $(PhysXVehicle_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PhysXVehicle_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PsFastXml.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PsFastXml.mk
index e2fb043a..526f1276 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PsFastXml.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PsFastXml.mk
@@ -43,16 +43,17 @@ PsFastXml_debug_common_cflags    += $(addprefix -D, $(PsFastXml_debug_defines))
 PsFastXml_debug_common_cflags    += $(addprefix -I, $(PsFastXml_debug_hpaths))
 PsFastXml_debug_cflags	:= $(PsFastXml_debug_common_cflags)
 PsFastXml_debug_cflags  += -arch x86_64
-PsFastXml_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PsFastXml_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PsFastXml_debug_cflags  += -g3 -gdwarf-2 -O0
 PsFastXml_debug_cppflags	:= $(PsFastXml_debug_common_cflags)
 PsFastXml_debug_cppflags  += -arch x86_64
-PsFastXml_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PsFastXml_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PsFastXml_debug_cppflags  += -g3 -gdwarf-2 -O0
 PsFastXml_debug_lflags    := $(PsFastXml_custom_lflags)
 PsFastXml_debug_lflags    += $(addprefix -L, $(PsFastXml_debug_lpaths))
 PsFastXml_debug_lflags  += $(addprefix -l, $(PsFastXml_debug_libraries))
 PsFastXml_debug_lflags  += -arch x86_64
+PsFastXml_debug_lflags  += -stdlib=libc++
 PsFastXml_debug_objsdir  = $(OBJS_DIR)/PsFastXml_debug
 PsFastXml_debug_cpp_o    = $(addprefix $(PsFastXml_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PsFastXml_cppfiles)))))
 PsFastXml_debug_cc_o    = $(addprefix $(PsFastXml_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PsFastXml_ccfiles)))))
@@ -123,16 +124,17 @@ PsFastXml_release_common_cflags    += $(addprefix -D, $(PsFastXml_release_define
 PsFastXml_release_common_cflags    += $(addprefix -I, $(PsFastXml_release_hpaths))
 PsFastXml_release_cflags	:= $(PsFastXml_release_common_cflags)
 PsFastXml_release_cflags  += -arch x86_64
-PsFastXml_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PsFastXml_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PsFastXml_release_cflags  += -O3 -fno-strict-aliasing
 PsFastXml_release_cppflags	:= $(PsFastXml_release_common_cflags)
 PsFastXml_release_cppflags  += -arch x86_64
-PsFastXml_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PsFastXml_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PsFastXml_release_cppflags  += -O3 -fno-strict-aliasing
 PsFastXml_release_lflags    := $(PsFastXml_custom_lflags)
 PsFastXml_release_lflags    += $(addprefix -L, $(PsFastXml_release_lpaths))
 PsFastXml_release_lflags  += $(addprefix -l, $(PsFastXml_release_libraries))
 PsFastXml_release_lflags  += -arch x86_64
+PsFastXml_release_lflags  += -stdlib=libc++
 PsFastXml_release_objsdir  = $(OBJS_DIR)/PsFastXml_release
 PsFastXml_release_cpp_o    = $(addprefix $(PsFastXml_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PsFastXml_cppfiles)))))
 PsFastXml_release_cc_o    = $(addprefix $(PsFastXml_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PsFastXml_ccfiles)))))
@@ -204,16 +206,17 @@ PsFastXml_checked_common_cflags    += $(addprefix -D, $(PsFastXml_checked_define
 PsFastXml_checked_common_cflags    += $(addprefix -I, $(PsFastXml_checked_hpaths))
 PsFastXml_checked_cflags	:= $(PsFastXml_checked_common_cflags)
 PsFastXml_checked_cflags  += -arch x86_64
-PsFastXml_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PsFastXml_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PsFastXml_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 PsFastXml_checked_cppflags	:= $(PsFastXml_checked_common_cflags)
 PsFastXml_checked_cppflags  += -arch x86_64
-PsFastXml_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PsFastXml_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PsFastXml_checked_cppflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 PsFastXml_checked_lflags    := $(PsFastXml_custom_lflags)
 PsFastXml_checked_lflags    += $(addprefix -L, $(PsFastXml_checked_lpaths))
 PsFastXml_checked_lflags  += $(addprefix -l, $(PsFastXml_checked_libraries))
 PsFastXml_checked_lflags  += -arch x86_64
+PsFastXml_checked_lflags  += -stdlib=libc++
 PsFastXml_checked_objsdir  = $(OBJS_DIR)/PsFastXml_checked
 PsFastXml_checked_cpp_o    = $(addprefix $(PsFastXml_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PsFastXml_cppfiles)))))
 PsFastXml_checked_cc_o    = $(addprefix $(PsFastXml_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PsFastXml_ccfiles)))))
@@ -285,16 +288,17 @@ PsFastXml_profile_common_cflags    += $(addprefix -D, $(PsFastXml_profile_define
 PsFastXml_profile_common_cflags    += $(addprefix -I, $(PsFastXml_profile_hpaths))
 PsFastXml_profile_cflags	:= $(PsFastXml_profile_common_cflags)
 PsFastXml_profile_cflags  += -arch x86_64
-PsFastXml_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PsFastXml_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PsFastXml_profile_cflags  += -O3 -fno-strict-aliasing
 PsFastXml_profile_cppflags	:= $(PsFastXml_profile_common_cflags)
 PsFastXml_profile_cppflags  += -arch x86_64
-PsFastXml_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PsFastXml_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PsFastXml_profile_cppflags  += -O3 -fno-strict-aliasing
 PsFastXml_profile_lflags    := $(PsFastXml_custom_lflags)
 PsFastXml_profile_lflags    += $(addprefix -L, $(PsFastXml_profile_lpaths))
 PsFastXml_profile_lflags  += $(addprefix -l, $(PsFastXml_profile_libraries))
 PsFastXml_profile_lflags  += -arch x86_64
+PsFastXml_profile_lflags  += -stdlib=libc++
 PsFastXml_profile_objsdir  = $(OBJS_DIR)/PsFastXml_profile
 PsFastXml_profile_cpp_o    = $(addprefix $(PsFastXml_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PsFastXml_cppfiles)))))
 PsFastXml_profile_cc_o    = $(addprefix $(PsFastXml_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PsFastXml_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxFoundation.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxFoundation.mk
index fca4e56e..1fe13d72 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxFoundation.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxFoundation.mk
@@ -57,15 +57,15 @@ PxFoundation_debug_common_cflags    += $(addprefix -D, $(PxFoundation_debug_defi
 PxFoundation_debug_common_cflags    += $(addprefix -I, $(PxFoundation_debug_hpaths))
 PxFoundation_debug_cflags	:= $(PxFoundation_debug_common_cflags)
 PxFoundation_debug_cflags  += -arch x86_64
-PxFoundation_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxFoundation_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxFoundation_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxFoundation_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxFoundation_debug_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxFoundation_debug_cflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxFoundation_debug_cflags  += -g3 -gdwarf-2 -O0
 PxFoundation_debug_cppflags	:= $(PxFoundation_debug_common_cflags)
 PxFoundation_debug_cppflags  += -arch x86_64
-PxFoundation_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxFoundation_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxFoundation_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxFoundation_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxFoundation_debug_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxFoundation_debug_cppflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxFoundation_debug_cppflags  += -g3 -gdwarf-2 -O0
@@ -73,6 +73,7 @@ PxFoundation_debug_lflags    := $(PxFoundation_custom_lflags)
 PxFoundation_debug_lflags    += $(addprefix -L, $(PxFoundation_debug_lpaths))
 PxFoundation_debug_lflags  += $(addprefix -l, $(PxFoundation_debug_libraries))
 PxFoundation_debug_lflags  += -arch x86_64
+PxFoundation_debug_lflags  += -stdlib=libc++
 PxFoundation_debug_objsdir  = $(OBJS_DIR)/PxFoundation_debug
 PxFoundation_debug_cpp_o    = $(addprefix $(PxFoundation_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxFoundation_cppfiles)))))
 PxFoundation_debug_cc_o    = $(addprefix $(PxFoundation_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxFoundation_ccfiles)))))
@@ -141,15 +142,15 @@ PxFoundation_release_common_cflags    += $(addprefix -D, $(PxFoundation_release_
 PxFoundation_release_common_cflags    += $(addprefix -I, $(PxFoundation_release_hpaths))
 PxFoundation_release_cflags	:= $(PxFoundation_release_common_cflags)
 PxFoundation_release_cflags  += -arch x86_64
-PxFoundation_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxFoundation_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxFoundation_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxFoundation_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxFoundation_release_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxFoundation_release_cflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxFoundation_release_cflags  += -O3 -fno-strict-aliasing
 PxFoundation_release_cppflags	:= $(PxFoundation_release_common_cflags)
 PxFoundation_release_cppflags  += -arch x86_64
-PxFoundation_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxFoundation_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxFoundation_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxFoundation_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxFoundation_release_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxFoundation_release_cppflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxFoundation_release_cppflags  += -O3 -fno-strict-aliasing
@@ -157,6 +158,7 @@ PxFoundation_release_lflags    := $(PxFoundation_custom_lflags)
 PxFoundation_release_lflags    += $(addprefix -L, $(PxFoundation_release_lpaths))
 PxFoundation_release_lflags  += $(addprefix -l, $(PxFoundation_release_libraries))
 PxFoundation_release_lflags  += -arch x86_64
+PxFoundation_release_lflags  += -stdlib=libc++
 PxFoundation_release_objsdir  = $(OBJS_DIR)/PxFoundation_release
 PxFoundation_release_cpp_o    = $(addprefix $(PxFoundation_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxFoundation_cppfiles)))))
 PxFoundation_release_cc_o    = $(addprefix $(PxFoundation_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxFoundation_ccfiles)))))
@@ -226,15 +228,15 @@ PxFoundation_checked_common_cflags    += $(addprefix -D, $(PxFoundation_checked_
 PxFoundation_checked_common_cflags    += $(addprefix -I, $(PxFoundation_checked_hpaths))
 PxFoundation_checked_cflags	:= $(PxFoundation_checked_common_cflags)
 PxFoundation_checked_cflags  += -arch x86_64
-PxFoundation_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxFoundation_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxFoundation_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxFoundation_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxFoundation_checked_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxFoundation_checked_cflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxFoundation_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 PxFoundation_checked_cppflags	:= $(PxFoundation_checked_common_cflags)
 PxFoundation_checked_cppflags  += -arch x86_64
-PxFoundation_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxFoundation_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxFoundation_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxFoundation_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxFoundation_checked_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxFoundation_checked_cppflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxFoundation_checked_cppflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
@@ -242,6 +244,7 @@ PxFoundation_checked_lflags    := $(PxFoundation_custom_lflags)
 PxFoundation_checked_lflags    += $(addprefix -L, $(PxFoundation_checked_lpaths))
 PxFoundation_checked_lflags  += $(addprefix -l, $(PxFoundation_checked_libraries))
 PxFoundation_checked_lflags  += -arch x86_64
+PxFoundation_checked_lflags  += -stdlib=libc++
 PxFoundation_checked_objsdir  = $(OBJS_DIR)/PxFoundation_checked
 PxFoundation_checked_cpp_o    = $(addprefix $(PxFoundation_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxFoundation_cppfiles)))))
 PxFoundation_checked_cc_o    = $(addprefix $(PxFoundation_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxFoundation_ccfiles)))))
@@ -311,15 +314,15 @@ PxFoundation_profile_common_cflags    += $(addprefix -D, $(PxFoundation_profile_
 PxFoundation_profile_common_cflags    += $(addprefix -I, $(PxFoundation_profile_hpaths))
 PxFoundation_profile_cflags	:= $(PxFoundation_profile_common_cflags)
 PxFoundation_profile_cflags  += -arch x86_64
-PxFoundation_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxFoundation_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxFoundation_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxFoundation_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxFoundation_profile_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxFoundation_profile_cflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxFoundation_profile_cflags  += -O3 -fno-strict-aliasing
 PxFoundation_profile_cppflags	:= $(PxFoundation_profile_common_cflags)
 PxFoundation_profile_cppflags  += -arch x86_64
-PxFoundation_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxFoundation_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxFoundation_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxFoundation_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxFoundation_profile_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxFoundation_profile_cppflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxFoundation_profile_cppflags  += -O3 -fno-strict-aliasing
@@ -327,6 +330,7 @@ PxFoundation_profile_lflags    := $(PxFoundation_custom_lflags)
 PxFoundation_profile_lflags    += $(addprefix -L, $(PxFoundation_profile_lpaths))
 PxFoundation_profile_lflags  += $(addprefix -l, $(PxFoundation_profile_libraries))
 PxFoundation_profile_lflags  += -arch x86_64
+PxFoundation_profile_lflags  += -stdlib=libc++
 PxFoundation_profile_objsdir  = $(OBJS_DIR)/PxFoundation_profile
 PxFoundation_profile_cpp_o    = $(addprefix $(PxFoundation_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxFoundation_cppfiles)))))
 PxFoundation_profile_cc_o    = $(addprefix $(PxFoundation_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxFoundation_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxPvdSDK.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxPvdSDK.mk
index 3c32d6a6..1b104afb 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxPvdSDK.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxPvdSDK.mk
@@ -56,15 +56,15 @@ PxPvdSDK_debug_common_cflags    += $(addprefix -D, $(PxPvdSDK_debug_defines))
 PxPvdSDK_debug_common_cflags    += $(addprefix -I, $(PxPvdSDK_debug_hpaths))
 PxPvdSDK_debug_cflags	:= $(PxPvdSDK_debug_common_cflags)
 PxPvdSDK_debug_cflags  += -arch x86_64
-PxPvdSDK_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxPvdSDK_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxPvdSDK_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxPvdSDK_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxPvdSDK_debug_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxPvdSDK_debug_cflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxPvdSDK_debug_cflags  += -g3 -gdwarf-2 -O0
 PxPvdSDK_debug_cppflags	:= $(PxPvdSDK_debug_common_cflags)
 PxPvdSDK_debug_cppflags  += -arch x86_64
-PxPvdSDK_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxPvdSDK_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxPvdSDK_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxPvdSDK_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxPvdSDK_debug_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxPvdSDK_debug_cppflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxPvdSDK_debug_cppflags  += -g3 -gdwarf-2 -O0
@@ -72,6 +72,7 @@ PxPvdSDK_debug_lflags    := $(PxPvdSDK_custom_lflags)
 PxPvdSDK_debug_lflags    += $(addprefix -L, $(PxPvdSDK_debug_lpaths))
 PxPvdSDK_debug_lflags  += $(addprefix -l, $(PxPvdSDK_debug_libraries))
 PxPvdSDK_debug_lflags  += -arch x86_64
+PxPvdSDK_debug_lflags  += -stdlib=libc++
 PxPvdSDK_debug_objsdir  = $(OBJS_DIR)/PxPvdSDK_debug
 PxPvdSDK_debug_cpp_o    = $(addprefix $(PxPvdSDK_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxPvdSDK_cppfiles)))))
 PxPvdSDK_debug_cc_o    = $(addprefix $(PxPvdSDK_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxPvdSDK_ccfiles)))))
@@ -145,15 +146,15 @@ PxPvdSDK_release_common_cflags    += $(addprefix -D, $(PxPvdSDK_release_defines)
 PxPvdSDK_release_common_cflags    += $(addprefix -I, $(PxPvdSDK_release_hpaths))
 PxPvdSDK_release_cflags	:= $(PxPvdSDK_release_common_cflags)
 PxPvdSDK_release_cflags  += -arch x86_64
-PxPvdSDK_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxPvdSDK_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxPvdSDK_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxPvdSDK_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxPvdSDK_release_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxPvdSDK_release_cflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxPvdSDK_release_cflags  += -O3 -fno-strict-aliasing
 PxPvdSDK_release_cppflags	:= $(PxPvdSDK_release_common_cflags)
 PxPvdSDK_release_cppflags  += -arch x86_64
-PxPvdSDK_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxPvdSDK_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxPvdSDK_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxPvdSDK_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxPvdSDK_release_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxPvdSDK_release_cppflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxPvdSDK_release_cppflags  += -O3 -fno-strict-aliasing
@@ -161,6 +162,7 @@ PxPvdSDK_release_lflags    := $(PxPvdSDK_custom_lflags)
 PxPvdSDK_release_lflags    += $(addprefix -L, $(PxPvdSDK_release_lpaths))
 PxPvdSDK_release_lflags  += $(addprefix -l, $(PxPvdSDK_release_libraries))
 PxPvdSDK_release_lflags  += -arch x86_64
+PxPvdSDK_release_lflags  += -stdlib=libc++
 PxPvdSDK_release_objsdir  = $(OBJS_DIR)/PxPvdSDK_release
 PxPvdSDK_release_cpp_o    = $(addprefix $(PxPvdSDK_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxPvdSDK_cppfiles)))))
 PxPvdSDK_release_cc_o    = $(addprefix $(PxPvdSDK_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxPvdSDK_ccfiles)))))
@@ -235,15 +237,15 @@ PxPvdSDK_checked_common_cflags    += $(addprefix -D, $(PxPvdSDK_checked_defines)
 PxPvdSDK_checked_common_cflags    += $(addprefix -I, $(PxPvdSDK_checked_hpaths))
 PxPvdSDK_checked_cflags	:= $(PxPvdSDK_checked_common_cflags)
 PxPvdSDK_checked_cflags  += -arch x86_64
-PxPvdSDK_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxPvdSDK_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxPvdSDK_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxPvdSDK_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxPvdSDK_checked_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxPvdSDK_checked_cflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxPvdSDK_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 PxPvdSDK_checked_cppflags	:= $(PxPvdSDK_checked_common_cflags)
 PxPvdSDK_checked_cppflags  += -arch x86_64
-PxPvdSDK_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxPvdSDK_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxPvdSDK_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxPvdSDK_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxPvdSDK_checked_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxPvdSDK_checked_cppflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxPvdSDK_checked_cppflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
@@ -251,6 +253,7 @@ PxPvdSDK_checked_lflags    := $(PxPvdSDK_custom_lflags)
 PxPvdSDK_checked_lflags    += $(addprefix -L, $(PxPvdSDK_checked_lpaths))
 PxPvdSDK_checked_lflags  += $(addprefix -l, $(PxPvdSDK_checked_libraries))
 PxPvdSDK_checked_lflags  += -arch x86_64
+PxPvdSDK_checked_lflags  += -stdlib=libc++
 PxPvdSDK_checked_objsdir  = $(OBJS_DIR)/PxPvdSDK_checked
 PxPvdSDK_checked_cpp_o    = $(addprefix $(PxPvdSDK_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxPvdSDK_cppfiles)))))
 PxPvdSDK_checked_cc_o    = $(addprefix $(PxPvdSDK_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxPvdSDK_ccfiles)))))
@@ -325,15 +328,15 @@ PxPvdSDK_profile_common_cflags    += $(addprefix -D, $(PxPvdSDK_profile_defines)
 PxPvdSDK_profile_common_cflags    += $(addprefix -I, $(PxPvdSDK_profile_hpaths))
 PxPvdSDK_profile_cflags	:= $(PxPvdSDK_profile_common_cflags)
 PxPvdSDK_profile_cflags  += -arch x86_64
-PxPvdSDK_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxPvdSDK_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxPvdSDK_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxPvdSDK_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxPvdSDK_profile_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxPvdSDK_profile_cflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxPvdSDK_profile_cflags  += -O3 -fno-strict-aliasing
 PxPvdSDK_profile_cppflags	:= $(PxPvdSDK_profile_common_cflags)
 PxPvdSDK_profile_cppflags  += -arch x86_64
-PxPvdSDK_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-PxPvdSDK_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast
+PxPvdSDK_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxPvdSDK_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-old-style-cast -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 PxPvdSDK_profile_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 PxPvdSDK_profile_cppflags  += -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 PxPvdSDK_profile_cppflags  += -O3 -fno-strict-aliasing
@@ -341,6 +344,7 @@ PxPvdSDK_profile_lflags    := $(PxPvdSDK_custom_lflags)
 PxPvdSDK_profile_lflags    += $(addprefix -L, $(PxPvdSDK_profile_lpaths))
 PxPvdSDK_profile_lflags  += $(addprefix -l, $(PxPvdSDK_profile_libraries))
 PxPvdSDK_profile_lflags  += -arch x86_64
+PxPvdSDK_profile_lflags  += -stdlib=libc++
 PxPvdSDK_profile_objsdir  = $(OBJS_DIR)/PxPvdSDK_profile
 PxPvdSDK_profile_cpp_o    = $(addprefix $(PxPvdSDK_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxPvdSDK_cppfiles)))))
 PxPvdSDK_profile_cc_o    = $(addprefix $(PxPvdSDK_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxPvdSDK_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxTask.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxTask.mk
index fb6dc418..7d030fcf 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxTask.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxTask.mk
@@ -42,16 +42,17 @@ PxTask_debug_common_cflags    += $(addprefix -D, $(PxTask_debug_defines))
 PxTask_debug_common_cflags    += $(addprefix -I, $(PxTask_debug_hpaths))
 PxTask_debug_cflags	:= $(PxTask_debug_common_cflags)
 PxTask_debug_cflags  += -arch x86_64
-PxTask_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxTask_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PxTask_debug_cflags  += -g3 -gdwarf-2 -O0
 PxTask_debug_cppflags	:= $(PxTask_debug_common_cflags)
 PxTask_debug_cppflags  += -arch x86_64
-PxTask_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxTask_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PxTask_debug_cppflags  += -g3 -gdwarf-2 -O0
 PxTask_debug_lflags    := $(PxTask_custom_lflags)
 PxTask_debug_lflags    += $(addprefix -L, $(PxTask_debug_lpaths))
 PxTask_debug_lflags  += $(addprefix -l, $(PxTask_debug_libraries))
 PxTask_debug_lflags  += -arch x86_64
+PxTask_debug_lflags  += -stdlib=libc++
 PxTask_debug_objsdir  = $(OBJS_DIR)/PxTask_debug
 PxTask_debug_cpp_o    = $(addprefix $(PxTask_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxTask_cppfiles)))))
 PxTask_debug_cc_o    = $(addprefix $(PxTask_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxTask_ccfiles)))))
@@ -121,16 +122,17 @@ PxTask_release_common_cflags    += $(addprefix -D, $(PxTask_release_defines))
 PxTask_release_common_cflags    += $(addprefix -I, $(PxTask_release_hpaths))
 PxTask_release_cflags	:= $(PxTask_release_common_cflags)
 PxTask_release_cflags  += -arch x86_64
-PxTask_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxTask_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PxTask_release_cflags  += -O3 -fno-strict-aliasing
 PxTask_release_cppflags	:= $(PxTask_release_common_cflags)
 PxTask_release_cppflags  += -arch x86_64
-PxTask_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxTask_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PxTask_release_cppflags  += -O3 -fno-strict-aliasing
 PxTask_release_lflags    := $(PxTask_custom_lflags)
 PxTask_release_lflags    += $(addprefix -L, $(PxTask_release_lpaths))
 PxTask_release_lflags  += $(addprefix -l, $(PxTask_release_libraries))
 PxTask_release_lflags  += -arch x86_64
+PxTask_release_lflags  += -stdlib=libc++
 PxTask_release_objsdir  = $(OBJS_DIR)/PxTask_release
 PxTask_release_cpp_o    = $(addprefix $(PxTask_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxTask_cppfiles)))))
 PxTask_release_cc_o    = $(addprefix $(PxTask_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxTask_ccfiles)))))
@@ -201,16 +203,17 @@ PxTask_checked_common_cflags    += $(addprefix -D, $(PxTask_checked_defines))
 PxTask_checked_common_cflags    += $(addprefix -I, $(PxTask_checked_hpaths))
 PxTask_checked_cflags	:= $(PxTask_checked_common_cflags)
 PxTask_checked_cflags  += -arch x86_64
-PxTask_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxTask_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PxTask_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 PxTask_checked_cppflags	:= $(PxTask_checked_common_cflags)
 PxTask_checked_cppflags  += -arch x86_64
-PxTask_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxTask_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PxTask_checked_cppflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 PxTask_checked_lflags    := $(PxTask_custom_lflags)
 PxTask_checked_lflags    += $(addprefix -L, $(PxTask_checked_lpaths))
 PxTask_checked_lflags  += $(addprefix -l, $(PxTask_checked_libraries))
 PxTask_checked_lflags  += -arch x86_64
+PxTask_checked_lflags  += -stdlib=libc++
 PxTask_checked_objsdir  = $(OBJS_DIR)/PxTask_checked
 PxTask_checked_cpp_o    = $(addprefix $(PxTask_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxTask_cppfiles)))))
 PxTask_checked_cc_o    = $(addprefix $(PxTask_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxTask_ccfiles)))))
@@ -281,16 +284,17 @@ PxTask_profile_common_cflags    += $(addprefix -D, $(PxTask_profile_defines))
 PxTask_profile_common_cflags    += $(addprefix -I, $(PxTask_profile_hpaths))
 PxTask_profile_cflags	:= $(PxTask_profile_common_cflags)
 PxTask_profile_cflags  += -arch x86_64
-PxTask_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxTask_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PxTask_profile_cflags  += -O3 -fno-strict-aliasing
 PxTask_profile_cppflags	:= $(PxTask_profile_common_cflags)
 PxTask_profile_cppflags  += -arch x86_64
-PxTask_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+PxTask_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
 PxTask_profile_cppflags  += -O3 -fno-strict-aliasing
 PxTask_profile_lflags    := $(PxTask_custom_lflags)
 PxTask_profile_lflags    += $(addprefix -L, $(PxTask_profile_lpaths))
 PxTask_profile_lflags  += $(addprefix -l, $(PxTask_profile_libraries))
 PxTask_profile_lflags  += -arch x86_64
+PxTask_profile_lflags  += -stdlib=libc++
 PxTask_profile_objsdir  = $(OBJS_DIR)/PxTask_profile
 PxTask_profile_cpp_o    = $(addprefix $(PxTask_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxTask_cppfiles)))))
 PxTask_profile_cc_o    = $(addprefix $(PxTask_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxTask_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.SceneQuery.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.SceneQuery.mk
index 569f17a3..25bbbeb9 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.SceneQuery.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.SceneQuery.mk
@@ -82,16 +82,16 @@ SceneQuery_debug_common_cflags    += $(addprefix -D, $(SceneQuery_debug_defines)
 SceneQuery_debug_common_cflags    += $(addprefix -I, $(SceneQuery_debug_hpaths))
 SceneQuery_debug_cflags	:= $(SceneQuery_debug_common_cflags)
 SceneQuery_debug_cflags  += -arch x86_64
-SceneQuery_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SceneQuery_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SceneQuery_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SceneQuery_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SceneQuery_debug_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SceneQuery_debug_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SceneQuery_debug_cflags  += -Wno-c++11-extensions
 SceneQuery_debug_cflags  += -g3 -gdwarf-2 -O0
 SceneQuery_debug_cppflags	:= $(SceneQuery_debug_common_cflags)
 SceneQuery_debug_cppflags  += -arch x86_64
-SceneQuery_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SceneQuery_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SceneQuery_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SceneQuery_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SceneQuery_debug_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SceneQuery_debug_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SceneQuery_debug_cppflags  += -Wno-c++11-extensions
@@ -100,6 +100,7 @@ SceneQuery_debug_lflags    := $(SceneQuery_custom_lflags)
 SceneQuery_debug_lflags    += $(addprefix -L, $(SceneQuery_debug_lpaths))
 SceneQuery_debug_lflags  += $(addprefix -l, $(SceneQuery_debug_libraries))
 SceneQuery_debug_lflags  += -arch x86_64
+SceneQuery_debug_lflags  += -stdlib=libc++
 SceneQuery_debug_objsdir  = $(OBJS_DIR)/SceneQuery_debug
 SceneQuery_debug_cpp_o    = $(addprefix $(SceneQuery_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(SceneQuery_cppfiles)))))
 SceneQuery_debug_cc_o    = $(addprefix $(SceneQuery_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(SceneQuery_ccfiles)))))
@@ -198,16 +199,16 @@ SceneQuery_checked_common_cflags    += $(addprefix -D, $(SceneQuery_checked_defi
 SceneQuery_checked_common_cflags    += $(addprefix -I, $(SceneQuery_checked_hpaths))
 SceneQuery_checked_cflags	:= $(SceneQuery_checked_common_cflags)
 SceneQuery_checked_cflags  += -arch x86_64
-SceneQuery_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SceneQuery_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SceneQuery_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SceneQuery_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SceneQuery_checked_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SceneQuery_checked_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SceneQuery_checked_cflags  += -Wno-c++11-extensions
 SceneQuery_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 SceneQuery_checked_cppflags	:= $(SceneQuery_checked_common_cflags)
 SceneQuery_checked_cppflags  += -arch x86_64
-SceneQuery_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SceneQuery_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SceneQuery_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SceneQuery_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SceneQuery_checked_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SceneQuery_checked_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SceneQuery_checked_cppflags  += -Wno-c++11-extensions
@@ -216,6 +217,7 @@ SceneQuery_checked_lflags    := $(SceneQuery_custom_lflags)
 SceneQuery_checked_lflags    += $(addprefix -L, $(SceneQuery_checked_lpaths))
 SceneQuery_checked_lflags  += $(addprefix -l, $(SceneQuery_checked_libraries))
 SceneQuery_checked_lflags  += -arch x86_64
+SceneQuery_checked_lflags  += -stdlib=libc++
 SceneQuery_checked_objsdir  = $(OBJS_DIR)/SceneQuery_checked
 SceneQuery_checked_cpp_o    = $(addprefix $(SceneQuery_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(SceneQuery_cppfiles)))))
 SceneQuery_checked_cc_o    = $(addprefix $(SceneQuery_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(SceneQuery_ccfiles)))))
@@ -314,16 +316,16 @@ SceneQuery_profile_common_cflags    += $(addprefix -D, $(SceneQuery_profile_defi
 SceneQuery_profile_common_cflags    += $(addprefix -I, $(SceneQuery_profile_hpaths))
 SceneQuery_profile_cflags	:= $(SceneQuery_profile_common_cflags)
 SceneQuery_profile_cflags  += -arch x86_64
-SceneQuery_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SceneQuery_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SceneQuery_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SceneQuery_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SceneQuery_profile_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SceneQuery_profile_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SceneQuery_profile_cflags  += -Wno-c++11-extensions
 SceneQuery_profile_cflags  += -O3 -fno-strict-aliasing
 SceneQuery_profile_cppflags	:= $(SceneQuery_profile_common_cflags)
 SceneQuery_profile_cppflags  += -arch x86_64
-SceneQuery_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SceneQuery_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SceneQuery_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SceneQuery_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SceneQuery_profile_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SceneQuery_profile_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SceneQuery_profile_cppflags  += -Wno-c++11-extensions
@@ -332,6 +334,7 @@ SceneQuery_profile_lflags    := $(SceneQuery_custom_lflags)
 SceneQuery_profile_lflags    += $(addprefix -L, $(SceneQuery_profile_lpaths))
 SceneQuery_profile_lflags  += $(addprefix -l, $(SceneQuery_profile_libraries))
 SceneQuery_profile_lflags  += -arch x86_64
+SceneQuery_profile_lflags  += -stdlib=libc++
 SceneQuery_profile_objsdir  = $(OBJS_DIR)/SceneQuery_profile
 SceneQuery_profile_cpp_o    = $(addprefix $(SceneQuery_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(SceneQuery_cppfiles)))))
 SceneQuery_profile_cc_o    = $(addprefix $(SceneQuery_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(SceneQuery_ccfiles)))))
@@ -429,16 +432,16 @@ SceneQuery_release_common_cflags    += $(addprefix -D, $(SceneQuery_release_defi
 SceneQuery_release_common_cflags    += $(addprefix -I, $(SceneQuery_release_hpaths))
 SceneQuery_release_cflags	:= $(SceneQuery_release_common_cflags)
 SceneQuery_release_cflags  += -arch x86_64
-SceneQuery_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SceneQuery_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SceneQuery_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SceneQuery_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SceneQuery_release_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SceneQuery_release_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SceneQuery_release_cflags  += -Wno-c++11-extensions
 SceneQuery_release_cflags  += -O3 -fno-strict-aliasing
 SceneQuery_release_cppflags	:= $(SceneQuery_release_common_cflags)
 SceneQuery_release_cppflags  += -arch x86_64
-SceneQuery_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SceneQuery_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SceneQuery_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SceneQuery_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SceneQuery_release_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SceneQuery_release_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SceneQuery_release_cppflags  += -Wno-c++11-extensions
@@ -447,6 +450,7 @@ SceneQuery_release_lflags    := $(SceneQuery_custom_lflags)
 SceneQuery_release_lflags    += $(addprefix -L, $(SceneQuery_release_lpaths))
 SceneQuery_release_lflags  += $(addprefix -l, $(SceneQuery_release_libraries))
 SceneQuery_release_lflags  += -arch x86_64
+SceneQuery_release_lflags  += -stdlib=libc++
 SceneQuery_release_objsdir  = $(OBJS_DIR)/SceneQuery_release
 SceneQuery_release_cpp_o    = $(addprefix $(SceneQuery_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(SceneQuery_cppfiles)))))
 SceneQuery_release_cc_o    = $(addprefix $(SceneQuery_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(SceneQuery_ccfiles)))))
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.SimulationController.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.SimulationController.mk
index f5bc8b93..6138be89 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.SimulationController.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.SimulationController.mk
@@ -124,16 +124,16 @@ SimulationController_debug_common_cflags    += $(addprefix -D, $(SimulationContr
 SimulationController_debug_common_cflags    += $(addprefix -I, $(SimulationController_debug_hpaths))
 SimulationController_debug_cflags	:= $(SimulationController_debug_common_cflags)
 SimulationController_debug_cflags  += -arch x86_64
-SimulationController_debug_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SimulationController_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SimulationController_debug_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SimulationController_debug_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SimulationController_debug_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SimulationController_debug_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SimulationController_debug_cflags  += -Wno-c++11-extensions
 SimulationController_debug_cflags  += -g3 -gdwarf-2 -O0
 SimulationController_debug_cppflags	:= $(SimulationController_debug_common_cflags)
 SimulationController_debug_cppflags  += -arch x86_64
-SimulationController_debug_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SimulationController_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SimulationController_debug_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SimulationController_debug_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SimulationController_debug_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SimulationController_debug_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SimulationController_debug_cppflags  += -Wno-c++11-extensions
@@ -142,6 +142,7 @@ SimulationController_debug_lflags    := $(SimulationController_custom_lflags)
 SimulationController_debug_lflags    += $(addprefix -L, $(SimulationController_debug_lpaths))
 SimulationController_debug_lflags  += $(addprefix -l, $(SimulationController_debug_libraries))
 SimulationController_debug_lflags  += -arch x86_64
+SimulationController_debug_lflags  += -stdlib=libc++
 SimulationController_debug_objsdir  = $(OBJS_DIR)/SimulationController_debug
 SimulationController_debug_cpp_o    = $(addprefix $(SimulationController_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(SimulationController_cppfiles)))))
 SimulationController_debug_cc_o    = $(addprefix $(SimulationController_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(SimulationController_ccfiles)))))
@@ -252,16 +253,16 @@ SimulationController_checked_common_cflags    += $(addprefix -D, $(SimulationCon
 SimulationController_checked_common_cflags    += $(addprefix -I, $(SimulationController_checked_hpaths))
 SimulationController_checked_cflags	:= $(SimulationController_checked_common_cflags)
 SimulationController_checked_cflags  += -arch x86_64
-SimulationController_checked_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SimulationController_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SimulationController_checked_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SimulationController_checked_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SimulationController_checked_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SimulationController_checked_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SimulationController_checked_cflags  += -Wno-c++11-extensions
 SimulationController_checked_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 SimulationController_checked_cppflags	:= $(SimulationController_checked_common_cflags)
 SimulationController_checked_cppflags  += -arch x86_64
-SimulationController_checked_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SimulationController_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SimulationController_checked_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SimulationController_checked_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SimulationController_checked_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SimulationController_checked_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SimulationController_checked_cppflags  += -Wno-c++11-extensions
@@ -270,6 +271,7 @@ SimulationController_checked_lflags    := $(SimulationController_custom_lflags)
 SimulationController_checked_lflags    += $(addprefix -L, $(SimulationController_checked_lpaths))
 SimulationController_checked_lflags  += $(addprefix -l, $(SimulationController_checked_libraries))
 SimulationController_checked_lflags  += -arch x86_64
+SimulationController_checked_lflags  += -stdlib=libc++
 SimulationController_checked_objsdir  = $(OBJS_DIR)/SimulationController_checked
 SimulationController_checked_cpp_o    = $(addprefix $(SimulationController_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(SimulationController_cppfiles)))))
 SimulationController_checked_cc_o    = $(addprefix $(SimulationController_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(SimulationController_ccfiles)))))
@@ -380,16 +382,16 @@ SimulationController_profile_common_cflags    += $(addprefix -D, $(SimulationCon
 SimulationController_profile_common_cflags    += $(addprefix -I, $(SimulationController_profile_hpaths))
 SimulationController_profile_cflags	:= $(SimulationController_profile_common_cflags)
 SimulationController_profile_cflags  += -arch x86_64
-SimulationController_profile_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SimulationController_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SimulationController_profile_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SimulationController_profile_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SimulationController_profile_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SimulationController_profile_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SimulationController_profile_cflags  += -Wno-c++11-extensions
 SimulationController_profile_cflags  += -O3 -fno-strict-aliasing
 SimulationController_profile_cppflags	:= $(SimulationController_profile_common_cflags)
 SimulationController_profile_cppflags  += -arch x86_64
-SimulationController_profile_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SimulationController_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SimulationController_profile_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SimulationController_profile_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SimulationController_profile_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SimulationController_profile_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SimulationController_profile_cppflags  += -Wno-c++11-extensions
@@ -398,6 +400,7 @@ SimulationController_profile_lflags    := $(SimulationController_custom_lflags)
 SimulationController_profile_lflags    += $(addprefix -L, $(SimulationController_profile_lpaths))
 SimulationController_profile_lflags  += $(addprefix -l, $(SimulationController_profile_libraries))
 SimulationController_profile_lflags  += -arch x86_64
+SimulationController_profile_lflags  += -stdlib=libc++
 SimulationController_profile_objsdir  = $(OBJS_DIR)/SimulationController_profile
 SimulationController_profile_cpp_o    = $(addprefix $(SimulationController_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(SimulationController_cppfiles)))))
 SimulationController_profile_cc_o    = $(addprefix $(SimulationController_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(SimulationController_ccfiles)))))
@@ -507,16 +510,16 @@ SimulationController_release_common_cflags    += $(addprefix -D, $(SimulationCon
 SimulationController_release_common_cflags    += $(addprefix -I, $(SimulationController_release_hpaths))
 SimulationController_release_cflags	:= $(SimulationController_release_common_cflags)
 SimulationController_release_cflags  += -arch x86_64
-SimulationController_release_cflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SimulationController_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SimulationController_release_cflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SimulationController_release_cflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SimulationController_release_cflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SimulationController_release_cflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SimulationController_release_cflags  += -Wno-c++11-extensions
 SimulationController_release_cflags  += -O3 -fno-strict-aliasing
 SimulationController_release_cppflags	:= $(SimulationController_release_common_cflags)
 SimulationController_release_cppflags  += -arch x86_64
-SimulationController_release_cppflags  += -pipe -mmacosx-version-min=10.7 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
-SimulationController_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables
+SimulationController_release_cppflags  += -pipe -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.9 -msse2 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -Werror
+SimulationController_release_cppflags  += -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -pedantic -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-zero-as-null-pointer-constant -Wno-unknown-warning-option -Wno-deprecated -Wno-c++98-compat-pedantic
 SimulationController_release_cppflags  += -Wno-cast-align -Wno-conversion -Wno-missing-variable-declarations -Wno-shift-sign-overflow
 SimulationController_release_cppflags  += -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-invalid-offsetof
 SimulationController_release_cppflags  += -Wno-c++11-extensions
@@ -525,6 +528,7 @@ SimulationController_release_lflags    := $(SimulationController_custom_lflags)
 SimulationController_release_lflags    += $(addprefix -L, $(SimulationController_release_lpaths))
 SimulationController_release_lflags  += $(addprefix -l, $(SimulationController_release_libraries))
 SimulationController_release_lflags  += -arch x86_64
+SimulationController_release_lflags  += -stdlib=libc++
 SimulationController_release_objsdir  = $(OBJS_DIR)/SimulationController_release
 SimulationController_release_cpp_o    = $(addprefix $(SimulationController_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(SimulationController_cppfiles)))))
 SimulationController_release_cc_o    = $(addprefix $(SimulationController_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(SimulationController_ccfiles)))))