PhysX 3.4, APEX 1.4 patch release @25256367

1 files changed, 12 insertions, 8 deletions

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)))))