PhysX 3.4.1, APEX 1.4.1 Release @22845541v3.4.1

21 files changed, 190 insertions, 194 deletions

diff --git a/APEX_1.4/compiler/android16/Makefile.APEX_Clothing.mk b/APEX_1.4/compiler/android16/Makefile.APEX_Clothing.mk
index 469c9b0b..034ea51b 100644
--- a/APEX_1.4/compiler/android16/Makefile.APEX_Clothing.mk
+++ b/APEX_1.4/compiler/android16/Makefile.APEX_Clothing.mk
@@ -122,8 +122,8 @@ APEX_Clothing_debug_hpaths    += ./../../../PxShared/src/pvd/src
 APEX_Clothing_debug_lpaths    := 
 APEX_Clothing_debug_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Clothing_debug_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Clothing_debug_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Clothing_debug_lpaths    += ./../../../PxShared/lib/android16
+APEX_Clothing_debug_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Clothing_debug_defines   := $(APEX_Clothing_custom_defines)
 APEX_Clothing_debug_defines   += ANDROID
 APEX_Clothing_debug_defines   += GLES2
@@ -144,9 +144,9 @@ APEX_Clothing_debug_defines   += PX_SUPPORT_VISUAL_DEBUGGER
 APEX_Clothing_debug_defines   += PHYSX_PROFILE_SDK
 APEX_Clothing_debug_defines   += PX_NVTX=1
 APEX_Clothing_debug_libraries := 
-APEX_Clothing_debug_libraries += NvParameterizedDEBUG
-APEX_Clothing_debug_libraries += PsFastXmlDEBUG
 APEX_Clothing_debug_libraries += PxFoundationDEBUG
+APEX_Clothing_debug_libraries += PsFastXmlDEBUG
+APEX_Clothing_debug_libraries += NvParameterizedDEBUG
 APEX_Clothing_debug_libraries += PxPvdSDKDEBUG
 APEX_Clothing_debug_libraries += PhysX3CommonDEBUG
 APEX_Clothing_debug_common_cflags	:= $(APEX_Clothing_custom_cflags)
@@ -186,9 +186,9 @@ postbuild_APEX_Clothing_debug: mainbuild_APEX_Clothing_debug
 mainbuild_APEX_Clothing_debug: prebuild_APEX_Clothing_debug $(APEX_Clothing_debug_bin)
 prebuild_APEX_Clothing_debug:
 
-$(APEX_Clothing_debug_bin): $(NvParameterized_debug_obj) $(PsFastXml_debug_obj) $(PxPvdSDK_debug_obj) $(APEX_Clothing_debug_obj) build_NvParameterized_debug build_PsFastXml_debug build_PxFoundation_debug build_PxPvdSDK_debug 
+$(APEX_Clothing_debug_bin): $(PsFastXml_debug_obj) $(NvParameterized_debug_obj) $(PxPvdSDK_debug_obj) $(APEX_Clothing_debug_obj) build_PxFoundation_debug build_PsFastXml_debug build_NvParameterized_debug build_PxPvdSDK_debug 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_ClothingDEBUG.a`
-	@$(AR) rcs $(APEX_Clothing_debug_bin) $(NvParameterized_debug_obj) $(PsFastXml_debug_obj) $(PxPvdSDK_debug_obj) $(APEX_Clothing_debug_obj)
+	@$(AR) rcs $(APEX_Clothing_debug_bin) $(PsFastXml_debug_obj) $(NvParameterized_debug_obj) $(PxPvdSDK_debug_obj) $(APEX_Clothing_debug_obj)
 	$(ECHO) building $@ complete!
 
 APEX_Clothing_debug_DEPDIR = $(dir $(@))/$(*F)
@@ -279,8 +279,8 @@ APEX_Clothing_release_hpaths    += ./../../../PxShared/src/pvd/src
 APEX_Clothing_release_lpaths    := 
 APEX_Clothing_release_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Clothing_release_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Clothing_release_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Clothing_release_lpaths    += ./../../../PxShared/lib/android16
+APEX_Clothing_release_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Clothing_release_defines   := $(APEX_Clothing_custom_defines)
 APEX_Clothing_release_defines   += ANDROID
 APEX_Clothing_release_defines   += GLES2
@@ -296,9 +296,9 @@ APEX_Clothing_release_defines   += cloth=cloth_embedded
 APEX_Clothing_release_defines   += NDEBUG
 APEX_Clothing_release_defines   += APEX_SHIPPING
 APEX_Clothing_release_libraries := 
-APEX_Clothing_release_libraries += NvParameterized
-APEX_Clothing_release_libraries += PsFastXml
 APEX_Clothing_release_libraries += PxFoundation
+APEX_Clothing_release_libraries += PsFastXml
+APEX_Clothing_release_libraries += NvParameterized
 APEX_Clothing_release_libraries += PxPvdSDK
 APEX_Clothing_release_libraries += PhysX3Common
 APEX_Clothing_release_common_cflags	:= $(APEX_Clothing_custom_cflags)
@@ -337,9 +337,9 @@ postbuild_APEX_Clothing_release: mainbuild_APEX_Clothing_release
 mainbuild_APEX_Clothing_release: prebuild_APEX_Clothing_release $(APEX_Clothing_release_bin)
 prebuild_APEX_Clothing_release:
 
-$(APEX_Clothing_release_bin): $(NvParameterized_release_obj) $(PsFastXml_release_obj) $(PxPvdSDK_release_obj) $(APEX_Clothing_release_obj) build_NvParameterized_release build_PsFastXml_release build_PxFoundation_release build_PxPvdSDK_release 
+$(APEX_Clothing_release_bin): $(PsFastXml_release_obj) $(NvParameterized_release_obj) $(PxPvdSDK_release_obj) $(APEX_Clothing_release_obj) build_PxFoundation_release build_PsFastXml_release build_NvParameterized_release build_PxPvdSDK_release 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_Clothing.a`
-	@$(AR) rcs $(APEX_Clothing_release_bin) $(NvParameterized_release_obj) $(PsFastXml_release_obj) $(PxPvdSDK_release_obj) $(APEX_Clothing_release_obj)
+	@$(AR) rcs $(APEX_Clothing_release_bin) $(PsFastXml_release_obj) $(NvParameterized_release_obj) $(PxPvdSDK_release_obj) $(APEX_Clothing_release_obj)
 	$(ECHO) building $@ complete!
 
 APEX_Clothing_release_DEPDIR = $(dir $(@))/$(*F)
@@ -430,8 +430,8 @@ APEX_Clothing_profile_hpaths    += ./../../../PxShared/src/pvd/src
 APEX_Clothing_profile_lpaths    := 
 APEX_Clothing_profile_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Clothing_profile_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Clothing_profile_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Clothing_profile_lpaths    += ./../../../PxShared/lib/android16
+APEX_Clothing_profile_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Clothing_profile_defines   := $(APEX_Clothing_custom_defines)
 APEX_Clothing_profile_defines   += ANDROID
 APEX_Clothing_profile_defines   += GLES2
@@ -450,9 +450,9 @@ APEX_Clothing_profile_defines   += PHYSX_PROFILE_SDK
 APEX_Clothing_profile_defines   += PX_SUPPORT_VISUAL_DEBUGGER
 APEX_Clothing_profile_defines   += PX_NVTX=1
 APEX_Clothing_profile_libraries := 
-APEX_Clothing_profile_libraries += NvParameterizedPROFILE
-APEX_Clothing_profile_libraries += PsFastXmlPROFILE
 APEX_Clothing_profile_libraries += PxFoundationPROFILE
+APEX_Clothing_profile_libraries += PsFastXmlPROFILE
+APEX_Clothing_profile_libraries += NvParameterizedPROFILE
 APEX_Clothing_profile_libraries += PxPvdSDKPROFILE
 APEX_Clothing_profile_libraries += PhysX3CommonPROFILE
 APEX_Clothing_profile_common_cflags	:= $(APEX_Clothing_custom_cflags)
@@ -491,9 +491,9 @@ postbuild_APEX_Clothing_profile: mainbuild_APEX_Clothing_profile
 mainbuild_APEX_Clothing_profile: prebuild_APEX_Clothing_profile $(APEX_Clothing_profile_bin)
 prebuild_APEX_Clothing_profile:
 
-$(APEX_Clothing_profile_bin): $(NvParameterized_profile_obj) $(PsFastXml_profile_obj) $(PxPvdSDK_profile_obj) $(APEX_Clothing_profile_obj) build_NvParameterized_profile build_PsFastXml_profile build_PxFoundation_profile build_PxPvdSDK_profile 
+$(APEX_Clothing_profile_bin): $(PsFastXml_profile_obj) $(NvParameterized_profile_obj) $(PxPvdSDK_profile_obj) $(APEX_Clothing_profile_obj) build_PxFoundation_profile build_PsFastXml_profile build_NvParameterized_profile build_PxPvdSDK_profile 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_ClothingPROFILE.a`
-	@$(AR) rcs $(APEX_Clothing_profile_bin) $(NvParameterized_profile_obj) $(PsFastXml_profile_obj) $(PxPvdSDK_profile_obj) $(APEX_Clothing_profile_obj)
+	@$(AR) rcs $(APEX_Clothing_profile_bin) $(PsFastXml_profile_obj) $(NvParameterized_profile_obj) $(PxPvdSDK_profile_obj) $(APEX_Clothing_profile_obj)
 	$(ECHO) building $@ complete!
 
 APEX_Clothing_profile_DEPDIR = $(dir $(@))/$(*F)
@@ -584,8 +584,8 @@ APEX_Clothing_checked_hpaths    += ./../../../PxShared/src/pvd/src
 APEX_Clothing_checked_lpaths    := 
 APEX_Clothing_checked_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Clothing_checked_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Clothing_checked_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Clothing_checked_lpaths    += ./../../../PxShared/lib/android16
+APEX_Clothing_checked_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Clothing_checked_defines   := $(APEX_Clothing_custom_defines)
 APEX_Clothing_checked_defines   += ANDROID
 APEX_Clothing_checked_defines   += GLES2
@@ -605,9 +605,9 @@ APEX_Clothing_checked_defines   += PX_SUPPORT_VISUAL_DEBUGGER
 APEX_Clothing_checked_defines   += PX_ENABLE_CHECKED_ASSERTS
 APEX_Clothing_checked_defines   += PX_NVTX=1
 APEX_Clothing_checked_libraries := 
-APEX_Clothing_checked_libraries += NvParameterizedCHECKED
-APEX_Clothing_checked_libraries += PsFastXmlCHECKED
 APEX_Clothing_checked_libraries += PxFoundationCHECKED
+APEX_Clothing_checked_libraries += PsFastXmlCHECKED
+APEX_Clothing_checked_libraries += NvParameterizedCHECKED
 APEX_Clothing_checked_libraries += PxPvdSDKCHECKED
 APEX_Clothing_checked_libraries += PhysX3CommonCHECKED
 APEX_Clothing_checked_common_cflags	:= $(APEX_Clothing_custom_cflags)
@@ -647,9 +647,9 @@ postbuild_APEX_Clothing_checked: mainbuild_APEX_Clothing_checked
 mainbuild_APEX_Clothing_checked: prebuild_APEX_Clothing_checked $(APEX_Clothing_checked_bin)
 prebuild_APEX_Clothing_checked:
 
-$(APEX_Clothing_checked_bin): $(NvParameterized_checked_obj) $(PsFastXml_checked_obj) $(PxPvdSDK_checked_obj) $(APEX_Clothing_checked_obj) build_NvParameterized_checked build_PsFastXml_checked build_PxFoundation_checked build_PxPvdSDK_checked 
+$(APEX_Clothing_checked_bin): $(PsFastXml_checked_obj) $(NvParameterized_checked_obj) $(PxPvdSDK_checked_obj) $(APEX_Clothing_checked_obj) build_PxFoundation_checked build_PsFastXml_checked build_NvParameterized_checked build_PxPvdSDK_checked 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_ClothingCHECKED.a`
-	@$(AR) rcs $(APEX_Clothing_checked_bin) $(NvParameterized_checked_obj) $(PsFastXml_checked_obj) $(PxPvdSDK_checked_obj) $(APEX_Clothing_checked_obj)
+	@$(AR) rcs $(APEX_Clothing_checked_bin) $(PsFastXml_checked_obj) $(NvParameterized_checked_obj) $(PxPvdSDK_checked_obj) $(APEX_Clothing_checked_obj)
 	$(ECHO) building $@ complete!
 
 APEX_Clothing_checked_DEPDIR = $(dir $(@))/$(*F)
diff --git a/APEX_1.4/compiler/android16/Makefile.APEX_Destructible.mk b/APEX_1.4/compiler/android16/Makefile.APEX_Destructible.mk
index a2070a96..45dc2305 100644
--- a/APEX_1.4/compiler/android16/Makefile.APEX_Destructible.mk
+++ b/APEX_1.4/compiler/android16/Makefile.APEX_Destructible.mk
@@ -127,8 +127,8 @@ APEX_Destructible_debug_hpaths    += ./../../module/destructible/fracture/Core
 APEX_Destructible_debug_lpaths    := 
 APEX_Destructible_debug_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Destructible_debug_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Destructible_debug_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Destructible_debug_lpaths    += ./../../../PxShared/lib/android16
+APEX_Destructible_debug_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Destructible_debug_defines   := $(APEX_Destructible_custom_defines)
 APEX_Destructible_debug_defines   += ANDROID
 APEX_Destructible_debug_defines   += GLES2
@@ -148,9 +148,9 @@ APEX_Destructible_debug_defines   += PX_SUPPORT_VISUAL_DEBUGGER
 APEX_Destructible_debug_defines   += PHYSX_PROFILE_SDK
 APEX_Destructible_debug_defines   += PX_NVTX=1
 APEX_Destructible_debug_libraries := 
-APEX_Destructible_debug_libraries += NvParameterizedDEBUG
-APEX_Destructible_debug_libraries += PsFastXmlDEBUG
 APEX_Destructible_debug_libraries += PxFoundationDEBUG
+APEX_Destructible_debug_libraries += PsFastXmlDEBUG
+APEX_Destructible_debug_libraries += NvParameterizedDEBUG
 APEX_Destructible_debug_libraries += PxPvdSDKDEBUG
 APEX_Destructible_debug_libraries += PhysX3CommonDEBUG
 APEX_Destructible_debug_libraries += PhysX3DEBUG
@@ -192,9 +192,9 @@ postbuild_APEX_Destructible_debug: mainbuild_APEX_Destructible_debug
 mainbuild_APEX_Destructible_debug: prebuild_APEX_Destructible_debug $(APEX_Destructible_debug_bin)
 prebuild_APEX_Destructible_debug:
 
-$(APEX_Destructible_debug_bin): $(NvParameterized_debug_obj) $(PsFastXml_debug_obj) $(PxPvdSDK_debug_obj) $(APEX_Destructible_debug_obj) build_NvParameterized_debug build_PsFastXml_debug build_PxFoundation_debug build_PxPvdSDK_debug 
+$(APEX_Destructible_debug_bin): $(PsFastXml_debug_obj) $(NvParameterized_debug_obj) $(PxPvdSDK_debug_obj) $(APEX_Destructible_debug_obj) build_PxFoundation_debug build_PsFastXml_debug build_NvParameterized_debug build_PxPvdSDK_debug 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_DestructibleDEBUG.a`
-	@$(AR) rcs $(APEX_Destructible_debug_bin) $(NvParameterized_debug_obj) $(PsFastXml_debug_obj) $(PxPvdSDK_debug_obj) $(APEX_Destructible_debug_obj)
+	@$(AR) rcs $(APEX_Destructible_debug_bin) $(PsFastXml_debug_obj) $(NvParameterized_debug_obj) $(PxPvdSDK_debug_obj) $(APEX_Destructible_debug_obj)
 	$(ECHO) building $@ complete!
 
 APEX_Destructible_debug_DEPDIR = $(dir $(@))/$(*F)
@@ -281,8 +281,8 @@ APEX_Destructible_release_hpaths    += ./../../module/destructible/fracture/Core
 APEX_Destructible_release_lpaths    := 
 APEX_Destructible_release_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Destructible_release_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Destructible_release_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Destructible_release_lpaths    += ./../../../PxShared/lib/android16
+APEX_Destructible_release_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Destructible_release_defines   := $(APEX_Destructible_custom_defines)
 APEX_Destructible_release_defines   += ANDROID
 APEX_Destructible_release_defines   += GLES2
@@ -297,9 +297,9 @@ APEX_Destructible_release_defines   += ENABLE_TEST=0
 APEX_Destructible_release_defines   += NDEBUG
 APEX_Destructible_release_defines   += APEX_SHIPPING
 APEX_Destructible_release_libraries := 
-APEX_Destructible_release_libraries += NvParameterized
-APEX_Destructible_release_libraries += PsFastXml
 APEX_Destructible_release_libraries += PxFoundation
+APEX_Destructible_release_libraries += PsFastXml
+APEX_Destructible_release_libraries += NvParameterized
 APEX_Destructible_release_libraries += PxPvdSDK
 APEX_Destructible_release_libraries += PhysX3Common
 APEX_Destructible_release_libraries += PhysX3
@@ -340,9 +340,9 @@ postbuild_APEX_Destructible_release: mainbuild_APEX_Destructible_release
 mainbuild_APEX_Destructible_release: prebuild_APEX_Destructible_release $(APEX_Destructible_release_bin)
 prebuild_APEX_Destructible_release:
 
-$(APEX_Destructible_release_bin): $(NvParameterized_release_obj) $(PsFastXml_release_obj) $(PxPvdSDK_release_obj) $(APEX_Destructible_release_obj) build_NvParameterized_release build_PsFastXml_release build_PxFoundation_release build_PxPvdSDK_release 
+$(APEX_Destructible_release_bin): $(PsFastXml_release_obj) $(NvParameterized_release_obj) $(PxPvdSDK_release_obj) $(APEX_Destructible_release_obj) build_PxFoundation_release build_PsFastXml_release build_NvParameterized_release build_PxPvdSDK_release 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_Destructible.a`
-	@$(AR) rcs $(APEX_Destructible_release_bin) $(NvParameterized_release_obj) $(PsFastXml_release_obj) $(PxPvdSDK_release_obj) $(APEX_Destructible_release_obj)
+	@$(AR) rcs $(APEX_Destructible_release_bin) $(PsFastXml_release_obj) $(NvParameterized_release_obj) $(PxPvdSDK_release_obj) $(APEX_Destructible_release_obj)
 	$(ECHO) building $@ complete!
 
 APEX_Destructible_release_DEPDIR = $(dir $(@))/$(*F)
@@ -429,8 +429,8 @@ APEX_Destructible_profile_hpaths    += ./../../module/destructible/fracture/Core
 APEX_Destructible_profile_lpaths    := 
 APEX_Destructible_profile_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Destructible_profile_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Destructible_profile_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Destructible_profile_lpaths    += ./../../../PxShared/lib/android16
+APEX_Destructible_profile_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Destructible_profile_defines   := $(APEX_Destructible_custom_defines)
 APEX_Destructible_profile_defines   += ANDROID
 APEX_Destructible_profile_defines   += GLES2
@@ -448,9 +448,9 @@ APEX_Destructible_profile_defines   += PHYSX_PROFILE_SDK
 APEX_Destructible_profile_defines   += PX_SUPPORT_VISUAL_DEBUGGER
 APEX_Destructible_profile_defines   += PX_NVTX=1
 APEX_Destructible_profile_libraries := 
-APEX_Destructible_profile_libraries += NvParameterizedPROFILE
-APEX_Destructible_profile_libraries += PsFastXmlPROFILE
 APEX_Destructible_profile_libraries += PxFoundationPROFILE
+APEX_Destructible_profile_libraries += PsFastXmlPROFILE
+APEX_Destructible_profile_libraries += NvParameterizedPROFILE
 APEX_Destructible_profile_libraries += PxPvdSDKPROFILE
 APEX_Destructible_profile_libraries += PhysX3CommonPROFILE
 APEX_Destructible_profile_libraries += PhysX3PROFILE
@@ -491,9 +491,9 @@ postbuild_APEX_Destructible_profile: mainbuild_APEX_Destructible_profile
 mainbuild_APEX_Destructible_profile: prebuild_APEX_Destructible_profile $(APEX_Destructible_profile_bin)
 prebuild_APEX_Destructible_profile:
 
-$(APEX_Destructible_profile_bin): $(NvParameterized_profile_obj) $(PsFastXml_profile_obj) $(PxPvdSDK_profile_obj) $(APEX_Destructible_profile_obj) build_NvParameterized_profile build_PsFastXml_profile build_PxFoundation_profile build_PxPvdSDK_profile 
+$(APEX_Destructible_profile_bin): $(PsFastXml_profile_obj) $(NvParameterized_profile_obj) $(PxPvdSDK_profile_obj) $(APEX_Destructible_profile_obj) build_PxFoundation_profile build_PsFastXml_profile build_NvParameterized_profile build_PxPvdSDK_profile 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_DestructiblePROFILE.a`
-	@$(AR) rcs $(APEX_Destructible_profile_bin) $(NvParameterized_profile_obj) $(PsFastXml_profile_obj) $(PxPvdSDK_profile_obj) $(APEX_Destructible_profile_obj)
+	@$(AR) rcs $(APEX_Destructible_profile_bin) $(PsFastXml_profile_obj) $(NvParameterized_profile_obj) $(PxPvdSDK_profile_obj) $(APEX_Destructible_profile_obj)
 	$(ECHO) building $@ complete!
 
 APEX_Destructible_profile_DEPDIR = $(dir $(@))/$(*F)
@@ -580,8 +580,8 @@ APEX_Destructible_checked_hpaths    += ./../../module/destructible/fracture/Core
 APEX_Destructible_checked_lpaths    := 
 APEX_Destructible_checked_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Destructible_checked_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Destructible_checked_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Destructible_checked_lpaths    += ./../../../PxShared/lib/android16
+APEX_Destructible_checked_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Destructible_checked_defines   := $(APEX_Destructible_custom_defines)
 APEX_Destructible_checked_defines   += ANDROID
 APEX_Destructible_checked_defines   += GLES2
@@ -600,9 +600,9 @@ APEX_Destructible_checked_defines   += PX_SUPPORT_VISUAL_DEBUGGER
 APEX_Destructible_checked_defines   += PX_ENABLE_CHECKED_ASSERTS
 APEX_Destructible_checked_defines   += PX_NVTX=1
 APEX_Destructible_checked_libraries := 
-APEX_Destructible_checked_libraries += NvParameterizedCHECKED
-APEX_Destructible_checked_libraries += PsFastXmlCHECKED
 APEX_Destructible_checked_libraries += PxFoundationCHECKED
+APEX_Destructible_checked_libraries += PsFastXmlCHECKED
+APEX_Destructible_checked_libraries += NvParameterizedCHECKED
 APEX_Destructible_checked_libraries += PxPvdSDKCHECKED
 APEX_Destructible_checked_libraries += PhysX3CommonCHECKED
 APEX_Destructible_checked_libraries += PhysX3CHECKED
@@ -644,9 +644,9 @@ postbuild_APEX_Destructible_checked: mainbuild_APEX_Destructible_checked
 mainbuild_APEX_Destructible_checked: prebuild_APEX_Destructible_checked $(APEX_Destructible_checked_bin)
 prebuild_APEX_Destructible_checked:
 
-$(APEX_Destructible_checked_bin): $(NvParameterized_checked_obj) $(PsFastXml_checked_obj) $(PxPvdSDK_checked_obj) $(APEX_Destructible_checked_obj) build_NvParameterized_checked build_PsFastXml_checked build_PxFoundation_checked build_PxPvdSDK_checked 
+$(APEX_Destructible_checked_bin): $(PsFastXml_checked_obj) $(NvParameterized_checked_obj) $(PxPvdSDK_checked_obj) $(APEX_Destructible_checked_obj) build_PxFoundation_checked build_PsFastXml_checked build_NvParameterized_checked build_PxPvdSDK_checked 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_DestructibleCHECKED.a`
-	@$(AR) rcs $(APEX_Destructible_checked_bin) $(NvParameterized_checked_obj) $(PsFastXml_checked_obj) $(PxPvdSDK_checked_obj) $(APEX_Destructible_checked_obj)
+	@$(AR) rcs $(APEX_Destructible_checked_bin) $(PsFastXml_checked_obj) $(NvParameterized_checked_obj) $(PxPvdSDK_checked_obj) $(APEX_Destructible_checked_obj)
 	$(ECHO) building $@ complete!
 
 APEX_Destructible_checked_DEPDIR = $(dir $(@))/$(*F)
diff --git a/APEX_1.4/compiler/android16/Makefile.APEX_Legacy.mk b/APEX_1.4/compiler/android16/Makefile.APEX_Legacy.mk
index d6fde613..a12a1de6 100644
--- a/APEX_1.4/compiler/android16/Makefile.APEX_Legacy.mk
+++ b/APEX_1.4/compiler/android16/Makefile.APEX_Legacy.mk
@@ -274,8 +274,8 @@ APEX_Legacy_debug_hpaths    += ./../../module/clothing/include/autogen
 APEX_Legacy_debug_lpaths    := 
 APEX_Legacy_debug_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Legacy_debug_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Legacy_debug_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Legacy_debug_lpaths    += ./../../../PxShared/lib/android16
+APEX_Legacy_debug_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Legacy_debug_defines   := $(APEX_Legacy_custom_defines)
 APEX_Legacy_debug_defines   += ANDROID
 APEX_Legacy_debug_defines   += GLES2
@@ -294,8 +294,8 @@ APEX_Legacy_debug_defines   += PX_SUPPORT_VISUAL_DEBUGGER
 APEX_Legacy_debug_defines   += PHYSX_PROFILE_SDK
 APEX_Legacy_debug_defines   += PX_NVTX=1
 APEX_Legacy_debug_libraries := 
-APEX_Legacy_debug_libraries += NvParameterizedDEBUG
 APEX_Legacy_debug_libraries += PxFoundationDEBUG
+APEX_Legacy_debug_libraries += NvParameterizedDEBUG
 APEX_Legacy_debug_libraries += PxTaskDEBUG
 APEX_Legacy_debug_libraries += PhysX3CommonDEBUG
 APEX_Legacy_debug_common_cflags	:= $(APEX_Legacy_custom_cflags)
@@ -335,7 +335,7 @@ postbuild_APEX_Legacy_debug: mainbuild_APEX_Legacy_debug
 mainbuild_APEX_Legacy_debug: prebuild_APEX_Legacy_debug $(APEX_Legacy_debug_bin)
 prebuild_APEX_Legacy_debug:
 
-$(APEX_Legacy_debug_bin): $(NvParameterized_debug_obj) $(PxTask_debug_obj) $(APEX_Legacy_debug_obj) build_NvParameterized_debug build_PxFoundation_debug build_PxTask_debug 
+$(APEX_Legacy_debug_bin): $(NvParameterized_debug_obj) $(PxTask_debug_obj) $(APEX_Legacy_debug_obj) build_PxFoundation_debug build_NvParameterized_debug build_PxTask_debug 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_LegacyDEBUG.a`
 	@$(AR) rcs $(APEX_Legacy_debug_bin) $(NvParameterized_debug_obj) $(PxTask_debug_obj) $(APEX_Legacy_debug_obj)
 	$(ECHO) building $@ complete!
@@ -432,8 +432,8 @@ APEX_Legacy_release_hpaths    += ./../../module/clothing/include/autogen
 APEX_Legacy_release_lpaths    := 
 APEX_Legacy_release_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Legacy_release_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Legacy_release_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Legacy_release_lpaths    += ./../../../PxShared/lib/android16
+APEX_Legacy_release_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Legacy_release_defines   := $(APEX_Legacy_custom_defines)
 APEX_Legacy_release_defines   += ANDROID
 APEX_Legacy_release_defines   += GLES2
@@ -447,8 +447,8 @@ APEX_Legacy_release_defines   += NV_PARAMETERIZED_HIDE_DESCRIPTIONS=1
 APEX_Legacy_release_defines   += NDEBUG
 APEX_Legacy_release_defines   += APEX_SHIPPING
 APEX_Legacy_release_libraries := 
-APEX_Legacy_release_libraries += NvParameterized
 APEX_Legacy_release_libraries += PxFoundation
+APEX_Legacy_release_libraries += NvParameterized
 APEX_Legacy_release_libraries += PxTask
 APEX_Legacy_release_libraries += PhysX3Common
 APEX_Legacy_release_common_cflags	:= $(APEX_Legacy_custom_cflags)
@@ -487,7 +487,7 @@ postbuild_APEX_Legacy_release: mainbuild_APEX_Legacy_release
 mainbuild_APEX_Legacy_release: prebuild_APEX_Legacy_release $(APEX_Legacy_release_bin)
 prebuild_APEX_Legacy_release:
 
-$(APEX_Legacy_release_bin): $(NvParameterized_release_obj) $(PxTask_release_obj) $(APEX_Legacy_release_obj) build_NvParameterized_release build_PxFoundation_release build_PxTask_release 
+$(APEX_Legacy_release_bin): $(NvParameterized_release_obj) $(PxTask_release_obj) $(APEX_Legacy_release_obj) build_PxFoundation_release build_NvParameterized_release build_PxTask_release 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_Legacy.a`
 	@$(AR) rcs $(APEX_Legacy_release_bin) $(NvParameterized_release_obj) $(PxTask_release_obj) $(APEX_Legacy_release_obj)
 	$(ECHO) building $@ complete!
@@ -584,8 +584,8 @@ APEX_Legacy_profile_hpaths    += ./../../module/clothing/include/autogen
 APEX_Legacy_profile_lpaths    := 
 APEX_Legacy_profile_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Legacy_profile_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Legacy_profile_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Legacy_profile_lpaths    += ./../../../PxShared/lib/android16
+APEX_Legacy_profile_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Legacy_profile_defines   := $(APEX_Legacy_custom_defines)
 APEX_Legacy_profile_defines   += ANDROID
 APEX_Legacy_profile_defines   += GLES2
@@ -602,8 +602,8 @@ APEX_Legacy_profile_defines   += PHYSX_PROFILE_SDK
 APEX_Legacy_profile_defines   += PX_SUPPORT_VISUAL_DEBUGGER
 APEX_Legacy_profile_defines   += PX_NVTX=1
 APEX_Legacy_profile_libraries := 
-APEX_Legacy_profile_libraries += NvParameterizedPROFILE
 APEX_Legacy_profile_libraries += PxFoundationPROFILE
+APEX_Legacy_profile_libraries += NvParameterizedPROFILE
 APEX_Legacy_profile_libraries += PxTaskPROFILE
 APEX_Legacy_profile_libraries += PhysX3CommonPROFILE
 APEX_Legacy_profile_common_cflags	:= $(APEX_Legacy_custom_cflags)
@@ -642,7 +642,7 @@ postbuild_APEX_Legacy_profile: mainbuild_APEX_Legacy_profile
 mainbuild_APEX_Legacy_profile: prebuild_APEX_Legacy_profile $(APEX_Legacy_profile_bin)
 prebuild_APEX_Legacy_profile:
 
-$(APEX_Legacy_profile_bin): $(NvParameterized_profile_obj) $(PxTask_profile_obj) $(APEX_Legacy_profile_obj) build_NvParameterized_profile build_PxFoundation_profile build_PxTask_profile 
+$(APEX_Legacy_profile_bin): $(NvParameterized_profile_obj) $(PxTask_profile_obj) $(APEX_Legacy_profile_obj) build_PxFoundation_profile build_NvParameterized_profile build_PxTask_profile 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_LegacyPROFILE.a`
 	@$(AR) rcs $(APEX_Legacy_profile_bin) $(NvParameterized_profile_obj) $(PxTask_profile_obj) $(APEX_Legacy_profile_obj)
 	$(ECHO) building $@ complete!
@@ -739,8 +739,8 @@ APEX_Legacy_checked_hpaths    += ./../../module/clothing/include/autogen
 APEX_Legacy_checked_lpaths    := 
 APEX_Legacy_checked_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Legacy_checked_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Legacy_checked_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Legacy_checked_lpaths    += ./../../../PxShared/lib/android16
+APEX_Legacy_checked_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Legacy_checked_defines   := $(APEX_Legacy_custom_defines)
 APEX_Legacy_checked_defines   += ANDROID
 APEX_Legacy_checked_defines   += GLES2
@@ -758,8 +758,8 @@ APEX_Legacy_checked_defines   += PX_SUPPORT_VISUAL_DEBUGGER
 APEX_Legacy_checked_defines   += PX_ENABLE_CHECKED_ASSERTS
 APEX_Legacy_checked_defines   += PX_NVTX=1
 APEX_Legacy_checked_libraries := 
-APEX_Legacy_checked_libraries += NvParameterizedCHECKED
 APEX_Legacy_checked_libraries += PxFoundationCHECKED
+APEX_Legacy_checked_libraries += NvParameterizedCHECKED
 APEX_Legacy_checked_libraries += PxTaskCHECKED
 APEX_Legacy_checked_libraries += PhysX3CommonCHECKED
 APEX_Legacy_checked_common_cflags	:= $(APEX_Legacy_custom_cflags)
@@ -799,7 +799,7 @@ postbuild_APEX_Legacy_checked: mainbuild_APEX_Legacy_checked
 mainbuild_APEX_Legacy_checked: prebuild_APEX_Legacy_checked $(APEX_Legacy_checked_bin)
 prebuild_APEX_Legacy_checked:
 
-$(APEX_Legacy_checked_bin): $(NvParameterized_checked_obj) $(PxTask_checked_obj) $(APEX_Legacy_checked_obj) build_NvParameterized_checked build_PxFoundation_checked build_PxTask_checked 
+$(APEX_Legacy_checked_bin): $(NvParameterized_checked_obj) $(PxTask_checked_obj) $(APEX_Legacy_checked_obj) build_PxFoundation_checked build_NvParameterized_checked build_PxTask_checked 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_LegacyCHECKED.a`
 	@$(AR) rcs $(APEX_Legacy_checked_bin) $(NvParameterized_checked_obj) $(PxTask_checked_obj) $(APEX_Legacy_checked_obj)
 	$(ECHO) building $@ complete!
diff --git a/APEX_1.4/compiler/android16/Makefile.APEX_Loader.mk b/APEX_1.4/compiler/android16/Makefile.APEX_Loader.mk
index cdab6d67..7d9ff825 100644
--- a/APEX_1.4/compiler/android16/Makefile.APEX_Loader.mk
+++ b/APEX_1.4/compiler/android16/Makefile.APEX_Loader.mk
@@ -72,9 +72,9 @@ APEX_Loader_debug_hpaths    += ./../../include/destructible
 APEX_Loader_debug_lpaths    := 
 APEX_Loader_debug_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Loader_debug_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Loader_debug_lpaths    += ./../../lib/android16
-APEX_Loader_debug_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Loader_debug_lpaths    += ./../../../PxShared/lib/android16
+APEX_Loader_debug_lpaths    += ./../../NvParameterized/lib/android16
+APEX_Loader_debug_lpaths    += ./../../lib/android16
 APEX_Loader_debug_defines   := $(APEX_Loader_custom_defines)
 APEX_Loader_debug_defines   += ANDROID
 APEX_Loader_debug_defines   += GLES2
@@ -94,15 +94,15 @@ APEX_Loader_debug_defines   += PX_SUPPORT_VISUAL_DEBUGGER
 APEX_Loader_debug_defines   += PHYSX_PROFILE_SDK
 APEX_Loader_debug_defines   += PX_NVTX=1
 APEX_Loader_debug_libraries := 
-APEX_Loader_debug_libraries += APEX_ClothingDEBUG
-APEX_Loader_debug_libraries += APEX_DestructibleDEBUG
-APEX_Loader_debug_libraries += APEX_LegacyDEBUG
-APEX_Loader_debug_libraries += ApexCommonDEBUG
-APEX_Loader_debug_libraries += ApexFrameworkDEBUG
-APEX_Loader_debug_libraries += NvParameterizedDEBUG
-APEX_Loader_debug_libraries += PsFastXmlDEBUG
 APEX_Loader_debug_libraries += PxFoundationDEBUG
+APEX_Loader_debug_libraries += PsFastXmlDEBUG
+APEX_Loader_debug_libraries += NvParameterizedDEBUG
 APEX_Loader_debug_libraries += PxPvdSDKDEBUG
+APEX_Loader_debug_libraries += ApexFrameworkDEBUG
+APEX_Loader_debug_libraries += ApexCommonDEBUG
+APEX_Loader_debug_libraries += APEX_ClothingDEBUG
+APEX_Loader_debug_libraries += APEX_LegacyDEBUG
+APEX_Loader_debug_libraries += APEX_DestructibleDEBUG
 APEX_Loader_debug_libraries += PhysX3CommonDEBUG
 APEX_Loader_debug_common_cflags	:= $(APEX_Loader_custom_cflags)
 APEX_Loader_debug_common_cflags    += $(addprefix -D, $(APEX_Loader_debug_defines))
@@ -141,9 +141,9 @@ postbuild_APEX_Loader_debug: mainbuild_APEX_Loader_debug
 mainbuild_APEX_Loader_debug: prebuild_APEX_Loader_debug $(APEX_Loader_debug_bin)
 prebuild_APEX_Loader_debug:
 
-$(APEX_Loader_debug_bin): $(NvParameterized_debug_obj) $(PsFastXml_debug_obj) $(PxPvdSDK_debug_obj) $(APEX_Loader_debug_obj) build_APEX_Clothing_debug build_APEX_Destructible_debug build_APEX_Legacy_debug build_ApexCommon_debug build_ApexFramework_debug build_NvParameterized_debug build_PsFastXml_debug build_PxFoundation_debug build_PxPvdSDK_debug 
+$(APEX_Loader_debug_bin): $(PsFastXml_debug_obj) $(NvParameterized_debug_obj) $(PxPvdSDK_debug_obj) $(APEX_Loader_debug_obj) build_PxFoundation_debug build_PsFastXml_debug build_NvParameterized_debug build_PxPvdSDK_debug build_ApexFramework_debug build_ApexCommon_debug build_APEX_Clothing_debug build_APEX_Legacy_debug build_APEX_Destructible_debug 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_LoaderDEBUG.a`
-	@$(AR) rcs $(APEX_Loader_debug_bin) $(NvParameterized_debug_obj) $(PsFastXml_debug_obj) $(PxPvdSDK_debug_obj) $(APEX_Loader_debug_obj)
+	@$(AR) rcs $(APEX_Loader_debug_bin) $(PsFastXml_debug_obj) $(NvParameterized_debug_obj) $(PxPvdSDK_debug_obj) $(APEX_Loader_debug_obj)
 	$(ECHO) building $@ complete!
 
 APEX_Loader_debug_DEPDIR = $(dir $(@))/$(*F)
@@ -229,9 +229,9 @@ APEX_Loader_release_hpaths    += ./../../include/destructible
 APEX_Loader_release_lpaths    := 
 APEX_Loader_release_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Loader_release_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Loader_release_lpaths    += ./../../lib/android16
-APEX_Loader_release_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Loader_release_lpaths    += ./../../../PxShared/lib/android16
+APEX_Loader_release_lpaths    += ./../../NvParameterized/lib/android16
+APEX_Loader_release_lpaths    += ./../../lib/android16
 APEX_Loader_release_defines   := $(APEX_Loader_custom_defines)
 APEX_Loader_release_defines   += ANDROID
 APEX_Loader_release_defines   += GLES2
@@ -246,15 +246,15 @@ APEX_Loader_release_defines   += ENABLE_TEST=0
 APEX_Loader_release_defines   += NDEBUG
 APEX_Loader_release_defines   += APEX_SHIPPING
 APEX_Loader_release_libraries := 
-APEX_Loader_release_libraries += APEX_Clothing
-APEX_Loader_release_libraries += APEX_Destructible
-APEX_Loader_release_libraries += APEX_Legacy
-APEX_Loader_release_libraries += ApexCommon
-APEX_Loader_release_libraries += ApexFramework
-APEX_Loader_release_libraries += NvParameterized
-APEX_Loader_release_libraries += PsFastXml
 APEX_Loader_release_libraries += PxFoundation
+APEX_Loader_release_libraries += PsFastXml
+APEX_Loader_release_libraries += NvParameterized
 APEX_Loader_release_libraries += PxPvdSDK
+APEX_Loader_release_libraries += ApexFramework
+APEX_Loader_release_libraries += ApexCommon
+APEX_Loader_release_libraries += APEX_Clothing
+APEX_Loader_release_libraries += APEX_Legacy
+APEX_Loader_release_libraries += APEX_Destructible
 APEX_Loader_release_libraries += PhysX3Common
 APEX_Loader_release_common_cflags	:= $(APEX_Loader_custom_cflags)
 APEX_Loader_release_common_cflags    += $(addprefix -D, $(APEX_Loader_release_defines))
@@ -292,9 +292,9 @@ postbuild_APEX_Loader_release: mainbuild_APEX_Loader_release
 mainbuild_APEX_Loader_release: prebuild_APEX_Loader_release $(APEX_Loader_release_bin)
 prebuild_APEX_Loader_release:
 
-$(APEX_Loader_release_bin): $(NvParameterized_release_obj) $(PsFastXml_release_obj) $(PxPvdSDK_release_obj) $(APEX_Loader_release_obj) build_APEX_Clothing_release build_APEX_Destructible_release build_APEX_Legacy_release build_ApexCommon_release build_ApexFramework_release build_NvParameterized_release build_PsFastXml_release build_PxFoundation_release build_PxPvdSDK_release 
+$(APEX_Loader_release_bin): $(PsFastXml_release_obj) $(NvParameterized_release_obj) $(PxPvdSDK_release_obj) $(APEX_Loader_release_obj) build_PxFoundation_release build_PsFastXml_release build_NvParameterized_release build_PxPvdSDK_release build_ApexFramework_release build_ApexCommon_release build_APEX_Clothing_release build_APEX_Legacy_release build_APEX_Destructible_release 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_Loader.a`
-	@$(AR) rcs $(APEX_Loader_release_bin) $(NvParameterized_release_obj) $(PsFastXml_release_obj) $(PxPvdSDK_release_obj) $(APEX_Loader_release_obj)
+	@$(AR) rcs $(APEX_Loader_release_bin) $(PsFastXml_release_obj) $(NvParameterized_release_obj) $(PxPvdSDK_release_obj) $(APEX_Loader_release_obj)
 	$(ECHO) building $@ complete!
 
 APEX_Loader_release_DEPDIR = $(dir $(@))/$(*F)
@@ -380,9 +380,9 @@ APEX_Loader_profile_hpaths    += ./../../include/destructible
 APEX_Loader_profile_lpaths    := 
 APEX_Loader_profile_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Loader_profile_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Loader_profile_lpaths    += ./../../lib/android16
-APEX_Loader_profile_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Loader_profile_lpaths    += ./../../../PxShared/lib/android16
+APEX_Loader_profile_lpaths    += ./../../NvParameterized/lib/android16
+APEX_Loader_profile_lpaths    += ./../../lib/android16
 APEX_Loader_profile_defines   := $(APEX_Loader_custom_defines)
 APEX_Loader_profile_defines   += ANDROID
 APEX_Loader_profile_defines   += GLES2
@@ -400,15 +400,15 @@ APEX_Loader_profile_defines   += PHYSX_PROFILE_SDK
 APEX_Loader_profile_defines   += PX_SUPPORT_VISUAL_DEBUGGER
 APEX_Loader_profile_defines   += PX_NVTX=1
 APEX_Loader_profile_libraries := 
-APEX_Loader_profile_libraries += APEX_ClothingPROFILE
-APEX_Loader_profile_libraries += APEX_DestructiblePROFILE
-APEX_Loader_profile_libraries += APEX_LegacyPROFILE
-APEX_Loader_profile_libraries += ApexCommonPROFILE
-APEX_Loader_profile_libraries += ApexFrameworkPROFILE
-APEX_Loader_profile_libraries += NvParameterizedPROFILE
-APEX_Loader_profile_libraries += PsFastXmlPROFILE
 APEX_Loader_profile_libraries += PxFoundationPROFILE
+APEX_Loader_profile_libraries += PsFastXmlPROFILE
+APEX_Loader_profile_libraries += NvParameterizedPROFILE
 APEX_Loader_profile_libraries += PxPvdSDKPROFILE
+APEX_Loader_profile_libraries += ApexFrameworkPROFILE
+APEX_Loader_profile_libraries += ApexCommonPROFILE
+APEX_Loader_profile_libraries += APEX_ClothingPROFILE
+APEX_Loader_profile_libraries += APEX_LegacyPROFILE
+APEX_Loader_profile_libraries += APEX_DestructiblePROFILE
 APEX_Loader_profile_libraries += PhysX3CommonPROFILE
 APEX_Loader_profile_common_cflags	:= $(APEX_Loader_custom_cflags)
 APEX_Loader_profile_common_cflags    += $(addprefix -D, $(APEX_Loader_profile_defines))
@@ -446,9 +446,9 @@ postbuild_APEX_Loader_profile: mainbuild_APEX_Loader_profile
 mainbuild_APEX_Loader_profile: prebuild_APEX_Loader_profile $(APEX_Loader_profile_bin)
 prebuild_APEX_Loader_profile:
 
-$(APEX_Loader_profile_bin): $(NvParameterized_profile_obj) $(PsFastXml_profile_obj) $(PxPvdSDK_profile_obj) $(APEX_Loader_profile_obj) build_APEX_Clothing_profile build_APEX_Destructible_profile build_APEX_Legacy_profile build_ApexCommon_profile build_ApexFramework_profile build_NvParameterized_profile build_PsFastXml_profile build_PxFoundation_profile build_PxPvdSDK_profile 
+$(APEX_Loader_profile_bin): $(PsFastXml_profile_obj) $(NvParameterized_profile_obj) $(PxPvdSDK_profile_obj) $(APEX_Loader_profile_obj) build_PxFoundation_profile build_PsFastXml_profile build_NvParameterized_profile build_PxPvdSDK_profile build_ApexFramework_profile build_ApexCommon_profile build_APEX_Clothing_profile build_APEX_Legacy_profile build_APEX_Destructible_profile 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_LoaderPROFILE.a`
-	@$(AR) rcs $(APEX_Loader_profile_bin) $(NvParameterized_profile_obj) $(PsFastXml_profile_obj) $(PxPvdSDK_profile_obj) $(APEX_Loader_profile_obj)
+	@$(AR) rcs $(APEX_Loader_profile_bin) $(PsFastXml_profile_obj) $(NvParameterized_profile_obj) $(PxPvdSDK_profile_obj) $(APEX_Loader_profile_obj)
 	$(ECHO) building $@ complete!
 
 APEX_Loader_profile_DEPDIR = $(dir $(@))/$(*F)
@@ -534,9 +534,9 @@ APEX_Loader_checked_hpaths    += ./../../include/destructible
 APEX_Loader_checked_lpaths    := 
 APEX_Loader_checked_lpaths    += ./../../../PxShared/lib/makeandroid16
 APEX_Loader_checked_lpaths    += ./../../../PhysX_3.4/Lib/android16
-APEX_Loader_checked_lpaths    += ./../../lib/android16
-APEX_Loader_checked_lpaths    += ./../../NvParameterized/lib/android16
 APEX_Loader_checked_lpaths    += ./../../../PxShared/lib/android16
+APEX_Loader_checked_lpaths    += ./../../NvParameterized/lib/android16
+APEX_Loader_checked_lpaths    += ./../../lib/android16
 APEX_Loader_checked_defines   := $(APEX_Loader_custom_defines)
 APEX_Loader_checked_defines   += ANDROID
 APEX_Loader_checked_defines   += GLES2
@@ -555,15 +555,15 @@ APEX_Loader_checked_defines   += PX_SUPPORT_VISUAL_DEBUGGER
 APEX_Loader_checked_defines   += PX_ENABLE_CHECKED_ASSERTS
 APEX_Loader_checked_defines   += PX_NVTX=1
 APEX_Loader_checked_libraries := 
-APEX_Loader_checked_libraries += APEX_ClothingCHECKED
-APEX_Loader_checked_libraries += APEX_DestructibleCHECKED
-APEX_Loader_checked_libraries += APEX_LegacyCHECKED
-APEX_Loader_checked_libraries += ApexCommonCHECKED
-APEX_Loader_checked_libraries += ApexFrameworkCHECKED
-APEX_Loader_checked_libraries += NvParameterizedCHECKED
-APEX_Loader_checked_libraries += PsFastXmlCHECKED
 APEX_Loader_checked_libraries += PxFoundationCHECKED
+APEX_Loader_checked_libraries += PsFastXmlCHECKED
+APEX_Loader_checked_libraries += NvParameterizedCHECKED
 APEX_Loader_checked_libraries += PxPvdSDKCHECKED
+APEX_Loader_checked_libraries += ApexFrameworkCHECKED
+APEX_Loader_checked_libraries += ApexCommonCHECKED
+APEX_Loader_checked_libraries += APEX_ClothingCHECKED
+APEX_Loader_checked_libraries += APEX_LegacyCHECKED
+APEX_Loader_checked_libraries += APEX_DestructibleCHECKED
 APEX_Loader_checked_libraries += PhysX3CommonCHECKED
 APEX_Loader_checked_common_cflags	:= $(APEX_Loader_custom_cflags)
 APEX_Loader_checked_common_cflags    += $(addprefix -D, $(APEX_Loader_checked_defines))
@@ -602,9 +602,9 @@ postbuild_APEX_Loader_checked: mainbuild_APEX_Loader_checked
 mainbuild_APEX_Loader_checked: prebuild_APEX_Loader_checked $(APEX_Loader_checked_bin)
 prebuild_APEX_Loader_checked:
 
-$(APEX_Loader_checked_bin): $(NvParameterized_checked_obj) $(PsFastXml_checked_obj) $(PxPvdSDK_checked_obj) $(APEX_Loader_checked_obj) build_APEX_Clothing_checked build_APEX_Destructible_checked build_APEX_Legacy_checked build_ApexCommon_checked build_ApexFramework_checked build_NvParameterized_checked build_PsFastXml_checked build_PxFoundation_checked build_PxPvdSDK_checked 
+$(APEX_Loader_checked_bin): $(PsFastXml_checked_obj) $(NvParameterized_checked_obj) $(PxPvdSDK_checked_obj) $(APEX_Loader_checked_obj) build_PxFoundation_checked build_PsFastXml_checked build_NvParameterized_checked build_PxPvdSDK_checked build_ApexFramework_checked build_ApexCommon_checked build_APEX_Clothing_checked build_APEX_Legacy_checked build_APEX_Destructible_checked 
 	mkdir -p `dirname ./../../lib/android16/libAPEX_LoaderCHECKED.a`
-	@$(AR) rcs $(APEX_Loader_checked_bin) $(NvParameterized_checked_obj) $(PsFastXml_checked_obj) $(PxPvdSDK_checked_obj) $(APEX_Loader_checked_obj)
+	@$(AR) rcs $(APEX_Loader_checked_bin) $(PsFastXml_checked_obj) $(NvParameterized_checked_obj) $(PxPvdSDK_checked_obj) $(APEX_Loader_checked_obj)
 	$(ECHO) building $@ complete!
 
 APEX_Loader_checked_DEPDIR = $(dir $(@))/$(*F)
diff --git a/APEX_1.4/compiler/android16/Makefile.ApexFramework.mk b/APEX_1.4/compiler/android16/Makefile.ApexFramework.mk
index ab8b7fc3..ab1949a2 100644
--- a/APEX_1.4/compiler/android16/Makefile.ApexFramework.mk
+++ b/APEX_1.4/compiler/android16/Makefile.ApexFramework.mk
@@ -107,10 +107,10 @@ ApexFramework_debug_hpaths    += ./../../../PxShared/src/cudamanager/include
 ApexFramework_debug_lpaths    := 
 ApexFramework_debug_lpaths    += ./../../../PxShared/lib/makeandroid16
 ApexFramework_debug_lpaths    += ./../../../PhysX_3.4/Lib/android16
-ApexFramework_debug_lpaths    += ./../../lib/android16
-ApexFramework_debug_lpaths    += ./../../NvParameterized/lib/android16
 ApexFramework_debug_lpaths    += ./../../../PxShared/lib/android16
+ApexFramework_debug_lpaths    += ./../../NvParameterized/lib/android16
 ApexFramework_debug_lpaths    += ./../../shared/general/RenderDebug/lib/android16
+ApexFramework_debug_lpaths    += ./../../lib/android16
 ApexFramework_debug_defines   := $(ApexFramework_custom_defines)
 ApexFramework_debug_defines   += ANDROID
 ApexFramework_debug_defines   += GLES2
@@ -128,14 +128,14 @@ ApexFramework_debug_defines   += PX_SUPPORT_VISUAL_DEBUGGER
 ApexFramework_debug_defines   += PHYSX_PROFILE_SDK
 ApexFramework_debug_defines   += PX_NVTX=1
 ApexFramework_debug_libraries := 
-ApexFramework_debug_libraries += ApexCommonDEBUG
-ApexFramework_debug_libraries += ApexSharedDEBUG
+ApexFramework_debug_libraries += PxFoundationDEBUG
 ApexFramework_debug_libraries += NvParameterizedDEBUG
 ApexFramework_debug_libraries += PsFastXmlDEBUG
-ApexFramework_debug_libraries += PxFoundationDEBUG
-ApexFramework_debug_libraries += PxPvdSDKDEBUG
-ApexFramework_debug_libraries += PxTaskDEBUG
 ApexFramework_debug_libraries += RenderDebugDEBUG
+ApexFramework_debug_libraries += PxTaskDEBUG
+ApexFramework_debug_libraries += PxPvdSDKDEBUG
+ApexFramework_debug_libraries += ApexSharedDEBUG
+ApexFramework_debug_libraries += ApexCommonDEBUG
 ApexFramework_debug_libraries += PhysX3CommonDEBUG
 ApexFramework_debug_common_cflags	:= $(ApexFramework_custom_cflags)
 ApexFramework_debug_common_cflags    += $(addprefix -D, $(ApexFramework_debug_defines))
@@ -174,9 +174,9 @@ postbuild_ApexFramework_debug: mainbuild_ApexFramework_debug
 mainbuild_ApexFramework_debug: prebuild_ApexFramework_debug $(ApexFramework_debug_bin)
 prebuild_ApexFramework_debug:
 
-$(ApexFramework_debug_bin): $(NvParameterized_debug_obj) $(PsFastXml_debug_obj) $(PxPvdSDK_debug_obj) $(PxTask_debug_obj) $(RenderDebug_debug_obj) $(ApexFramework_debug_obj) build_ApexCommon_debug build_ApexShared_debug build_NvParameterized_debug build_PsFastXml_debug build_PxFoundation_debug build_PxPvdSDK_debug build_PxTask_debug build_RenderDebug_debug 
+$(ApexFramework_debug_bin): $(NvParameterized_debug_obj) $(PsFastXml_debug_obj) $(RenderDebug_debug_obj) $(PxTask_debug_obj) $(PxPvdSDK_debug_obj) $(ApexFramework_debug_obj) build_PxFoundation_debug build_NvParameterized_debug build_PsFastXml_debug build_RenderDebug_debug build_PxTask_debug build_PxPvdSDK_debug build_ApexShared_debug build_ApexCommon_debug 
 	mkdir -p `dirname ./../../lib/android16/libApexFrameworkDEBUG.a`
-	@$(AR) rcs $(ApexFramework_debug_bin) $(NvParameterized_debug_obj) $(PsFastXml_debug_obj) $(PxPvdSDK_debug_obj) $(PxTask_debug_obj) $(RenderDebug_debug_obj) $(ApexFramework_debug_obj)
+	@$(AR) rcs $(ApexFramework_debug_bin) $(NvParameterized_debug_obj) $(PsFastXml_debug_obj) $(RenderDebug_debug_obj) $(PxTask_debug_obj) $(PxPvdSDK_debug_obj) $(ApexFramework_debug_obj)
 	$(ECHO) building $@ complete!
 
 ApexFramework_debug_DEPDIR = $(dir $(@))/$(*F)
@@ -258,10 +258,10 @@ ApexFramework_release_hpaths    += ./../../../PxShared/src/cudamanager/include
 ApexFramework_release_lpaths    := 
 ApexFramework_release_lpaths    += ./../../../PxShared/lib/makeandroid16
 ApexFramework_release_lpaths    += ./../../../PhysX_3.4/Lib/android16
-ApexFramework_release_lpaths    += ./../../lib/android16
-ApexFramework_release_lpaths    += ./../../NvParameterized/lib/android16
 ApexFramework_release_lpaths    += ./../../../PxShared/lib/android16
+ApexFramework_release_lpaths    += ./../../NvParameterized/lib/android16
 ApexFramework_release_lpaths    += ./../../shared/general/RenderDebug/lib/android16
+ApexFramework_release_lpaths    += ./../../lib/android16
 ApexFramework_release_defines   := $(ApexFramework_custom_defines)
 ApexFramework_release_defines   += ANDROID
 ApexFramework_release_defines   += GLES2
@@ -274,14 +274,14 @@ ApexFramework_release_defines   += PX_PHYSX_STATIC_LIB
 ApexFramework_release_defines   += NDEBUG
 ApexFramework_release_defines   += APEX_SHIPPING
 ApexFramework_release_libraries := 
-ApexFramework_release_libraries += ApexCommon
-ApexFramework_release_libraries += ApexShared
+ApexFramework_release_libraries += PxFoundation
 ApexFramework_release_libraries += NvParameterized
 ApexFramework_release_libraries += PsFastXml
-ApexFramework_release_libraries += PxFoundation
-ApexFramework_release_libraries += PxPvdSDK
-ApexFramework_release_libraries += PxTask
 ApexFramework_release_libraries += RenderDebug
+ApexFramework_release_libraries += PxTask
+ApexFramework_release_libraries += PxPvdSDK
+ApexFramework_release_libraries += ApexShared
+ApexFramework_release_libraries += ApexCommon
 ApexFramework_release_libraries += PhysX3Common
 ApexFramework_release_common_cflags	:= $(ApexFramework_custom_cflags)
 ApexFramework_release_common_cflags    += $(addprefix -D, $(ApexFramework_release_defines))
@@ -319,9 +319,9 @@ postbuild_ApexFramework_release: mainbuild_ApexFramework_release
 mainbuild_ApexFramework_release: prebuild_ApexFramework_release $(ApexFramework_release_bin)
 prebuild_ApexFramework_release:
 
-$(ApexFramework_release_bin): $(NvParameterized_release_obj) $(PsFastXml_release_obj) $(PxPvdSDK_release_obj) $(PxTask_release_obj) $(RenderDebug_release_obj) $(ApexFramework_release_obj) build_ApexCommon_release build_ApexShared_release build_NvParameterized_release build_PsFastXml_release build_PxFoundation_release build_PxPvdSDK_release build_PxTask_release build_RenderDebug_release 
+$(ApexFramework_release_bin): $(NvParameterized_release_obj) $(PsFastXml_release_obj) $(RenderDebug_release_obj) $(PxTask_release_obj) $(PxPvdSDK_release_obj) $(ApexFramework_release_obj) build_PxFoundation_release build_NvParameterized_release build_PsFastXml_release build_RenderDebug_release build_PxTask_release build_PxPvdSDK_release build_ApexShared_release build_ApexCommon_release 
 	mkdir -p `dirname ./../../lib/android16/libApexFramework.a`
-	@$(AR) rcs $(ApexFramework_release_bin) $(NvParameterized_release_obj) $(PsFastXml_release_obj) $(PxPvdSDK_release_obj) $(PxTask_release_obj) $(RenderDebug_release_obj) $(ApexFramework_release_obj)
+	@$(AR) rcs $(ApexFramework_release_bin) $(NvParameterized_release_obj) $(PsFastXml_release_obj) $(RenderDebug_release_obj) $(PxTask_release_obj) $(PxPvdSDK_release_obj) $(ApexFramework_release_obj)
 	$(ECHO) building $@ complete!
 
 ApexFramework_release_DEPDIR = $(dir $(@))/$(*F)
@@ -403,10 +403,10 @@ ApexFramework_profile_hpaths    += ./../../../PxShared/src/cudamanager/include
 ApexFramework_profile_lpaths    := 
 ApexFramework_profile_lpaths    += ./../../../PxShared/lib/makeandroid16
 ApexFramework_profile_lpaths    += ./../../../PhysX_3.4/Lib/android16
-ApexFramework_profile_lpaths    += ./../../lib/android16
-ApexFramework_profile_lpaths    += ./../../NvParameterized/lib/android16
 ApexFramework_profile_lpaths    += ./../../../PxShared/lib/android16
+ApexFramework_profile_lpaths    += ./../../NvParameterized/lib/android16
 ApexFramework_profile_lpaths    += ./../../shared/general/RenderDebug/lib/android16
+ApexFramework_profile_lpaths    += ./../../lib/android16
 ApexFramework_profile_defines   := $(ApexFramework_custom_defines)
 ApexFramework_profile_defines   += ANDROID
 ApexFramework_profile_defines   += GLES2
@@ -422,14 +422,14 @@ ApexFramework_profile_defines   += PHYSX_PROFILE_SDK
 ApexFramework_profile_defines   += PX_SUPPORT_VISUAL_DEBUGGER
 ApexFramework_profile_defines   += PX_NVTX=1
 ApexFramework_profile_libraries := 
-ApexFramework_profile_libraries += ApexCommonPROFILE
-ApexFramework_profile_libraries += ApexSharedPROFILE
+ApexFramework_profile_libraries += PxFoundationPROFILE
 ApexFramework_profile_libraries += NvParameterizedPROFILE
 ApexFramework_profile_libraries += PsFastXmlPROFILE
-ApexFramework_profile_libraries += PxFoundationPROFILE
-ApexFramework_profile_libraries += PxPvdSDKPROFILE
-ApexFramework_profile_libraries += PxTaskPROFILE
 ApexFramework_profile_libraries += RenderDebugPROFILE
+ApexFramework_profile_libraries += PxTaskPROFILE
+ApexFramework_profile_libraries += PxPvdSDKPROFILE
+ApexFramework_profile_libraries += ApexSharedPROFILE
+ApexFramework_profile_libraries += ApexCommonPROFILE
 ApexFramework_profile_libraries += PhysX3CommonPROFILE
 ApexFramework_profile_common_cflags	:= $(ApexFramework_custom_cflags)
 ApexFramework_profile_common_cflags    += $(addprefix -D, $(ApexFramework_profile_defines))
@@ -467,9 +467,9 @@ postbuild_ApexFramework_profile: mainbuild_ApexFramework_profile
 mainbuild_ApexFramework_profile: prebuild_ApexFramework_profile $(ApexFramework_profile_bin)
 prebuild_ApexFramework_profile:
 
-$(ApexFramework_profile_bin): $(NvParameterized_profile_obj) $(PsFastXml_profile_obj) $(PxPvdSDK_profile_obj) $(PxTask_profile_obj) $(RenderDebug_profile_obj) $(ApexFramework_profile_obj) build_ApexCommon_profile build_ApexShared_profile build_NvParameterized_profile build_PsFastXml_profile build_PxFoundation_profile build_PxPvdSDK_profile build_PxTask_profile build_RenderDebug_profile 
+$(ApexFramework_profile_bin): $(NvParameterized_profile_obj) $(PsFastXml_profile_obj) $(RenderDebug_profile_obj) $(PxTask_profile_obj) $(PxPvdSDK_profile_obj) $(ApexFramework_profile_obj) build_PxFoundation_profile build_NvParameterized_profile build_PsFastXml_profile build_RenderDebug_profile build_PxTask_profile build_PxPvdSDK_profile build_ApexShared_profile build_ApexCommon_profile 
 	mkdir -p `dirname ./../../lib/android16/libApexFrameworkPROFILE.a`
-	@$(AR) rcs $(ApexFramework_profile_bin) $(NvParameterized_profile_obj) $(PsFastXml_profile_obj) $(PxPvdSDK_profile_obj) $(PxTask_profile_obj) $(RenderDebug_profile_obj) $(ApexFramework_profile_obj)
+	@$(AR) rcs $(ApexFramework_profile_bin) $(NvParameterized_profile_obj) $(PsFastXml_profile_obj) $(RenderDebug_profile_obj) $(PxTask_profile_obj) $(PxPvdSDK_profile_obj) $(ApexFramework_profile_obj)
 	$(ECHO) building $@ complete!
 
 ApexFramework_profile_DEPDIR = $(dir $(@))/$(*F)
@@ -551,10 +551,10 @@ ApexFramework_checked_hpaths    += ./../../../PxShared/src/cudamanager/include
 ApexFramework_checked_lpaths    := 
 ApexFramework_checked_lpaths    += ./../../../PxShared/lib/makeandroid16
 ApexFramework_checked_lpaths    += ./../../../PhysX_3.4/Lib/android16
-ApexFramework_checked_lpaths    += ./../../lib/android16
-ApexFramework_checked_lpaths    += ./../../NvParameterized/lib/android16
 ApexFramework_checked_lpaths    += ./../../../PxShared/lib/android16
+ApexFramework_checked_lpaths    += ./../../NvParameterized/lib/android16
 ApexFramework_checked_lpaths    += ./../../shared/general/RenderDebug/lib/android16
+ApexFramework_checked_lpaths    += ./../../lib/android16
 ApexFramework_checked_defines   := $(ApexFramework_custom_defines)
 ApexFramework_checked_defines   += ANDROID
 ApexFramework_checked_defines   += GLES2
@@ -571,14 +571,14 @@ ApexFramework_checked_defines   += PX_SUPPORT_VISUAL_DEBUGGER
 ApexFramework_checked_defines   += PX_ENABLE_CHECKED_ASSERTS
 ApexFramework_checked_defines   += PX_NVTX=1
 ApexFramework_checked_libraries := 
-ApexFramework_checked_libraries += ApexCommonCHECKED
-ApexFramework_checked_libraries += ApexSharedCHECKED
+ApexFramework_checked_libraries += PxFoundationCHECKED
 ApexFramework_checked_libraries += NvParameterizedCHECKED
 ApexFramework_checked_libraries += PsFastXmlCHECKED
-ApexFramework_checked_libraries += PxFoundationCHECKED
-ApexFramework_checked_libraries += PxPvdSDKCHECKED
-ApexFramework_checked_libraries += PxTaskCHECKED
 ApexFramework_checked_libraries += RenderDebugCHECKED
+ApexFramework_checked_libraries += PxTaskCHECKED
+ApexFramework_checked_libraries += PxPvdSDKCHECKED
+ApexFramework_checked_libraries += ApexSharedCHECKED
+ApexFramework_checked_libraries += ApexCommonCHECKED
 ApexFramework_checked_libraries += PhysX3CommonCHECKED
 ApexFramework_checked_common_cflags	:= $(ApexFramework_custom_cflags)
 ApexFramework_checked_common_cflags    += $(addprefix -D, $(ApexFramework_checked_defines))
@@ -617,9 +617,9 @@ postbuild_ApexFramework_checked: mainbuild_ApexFramework_checked
 mainbuild_ApexFramework_checked: prebuild_ApexFramework_checked $(ApexFramework_checked_bin)
 prebuild_ApexFramework_checked:
 
-$(ApexFramework_checked_bin): $(NvParameterized_checked_obj) $(PsFastXml_checked_obj) $(PxPvdSDK_checked_obj) $(PxTask_checked_obj) $(RenderDebug_checked_obj) $(ApexFramework_checked_obj) build_ApexCommon_checked build_ApexShared_checked build_NvParameterized_checked build_PsFastXml_checked build_PxFoundation_checked build_PxPvdSDK_checked build_PxTask_checked build_RenderDebug_checked 
+$(ApexFramework_checked_bin): $(NvParameterized_checked_obj) $(PsFastXml_checked_obj) $(RenderDebug_checked_obj) $(PxTask_checked_obj) $(PxPvdSDK_checked_obj) $(ApexFramework_checked_obj) build_PxFoundation_checked build_NvParameterized_checked build_PsFastXml_checked build_RenderDebug_checked build_PxTask_checked build_PxPvdSDK_checked build_ApexShared_checked build_ApexCommon_checked 
 	mkdir -p `dirname ./../../lib/android16/libApexFrameworkCHECKED.a`
-	@$(AR) rcs $(ApexFramework_checked_bin) $(NvParameterized_checked_obj) $(PsFastXml_checked_obj) $(PxPvdSDK_checked_obj) $(PxTask_checked_obj) $(RenderDebug_checked_obj) $(ApexFramework_checked_obj)
+	@$(AR) rcs $(ApexFramework_checked_bin) $(NvParameterized_checked_obj) $(PsFastXml_checked_obj) $(RenderDebug_checked_obj) $(PxTask_checked_obj) $(PxPvdSDK_checked_obj) $(ApexFramework_checked_obj)
 	$(ECHO) building $@ complete!
 
 ApexFramework_checked_DEPDIR = $(dir $(@))/$(*F)
diff --git a/APEX_1.4/compiler/linux32/Makefile.PsFastXml.mk b/APEX_1.4/compiler/linux32/Makefile.PsFastXml.mk
index c623e666..01ae4503 100644
--- a/APEX_1.4/compiler/linux32/Makefile.PsFastXml.mk
+++ b/APEX_1.4/compiler/linux32/Makefile.PsFastXml.mk
@@ -39,7 +39,7 @@ PsFastXml_debug_common_cflags    += -MMD
 PsFastXml_debug_common_cflags    += $(addprefix -D, $(PsFastXml_debug_defines))
 PsFastXml_debug_common_cflags    += $(addprefix -I, $(PsFastXml_debug_hpaths))
 PsFastXml_debug_common_cflags  += -m32
-PsFastXml_debug_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PsFastXml_debug_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PsFastXml_debug_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PsFastXml_debug_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PsFastXml_debug_common_cflags  += -Wno-missing-field-initializers
@@ -119,7 +119,7 @@ PsFastXml_release_common_cflags    += -MMD
 PsFastXml_release_common_cflags    += $(addprefix -D, $(PsFastXml_release_defines))
 PsFastXml_release_common_cflags    += $(addprefix -I, $(PsFastXml_release_hpaths))
 PsFastXml_release_common_cflags  += -m32
-PsFastXml_release_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PsFastXml_release_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PsFastXml_release_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PsFastXml_release_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PsFastXml_release_common_cflags  += -Wno-missing-field-initializers
@@ -200,7 +200,7 @@ PsFastXml_checked_common_cflags    += -MMD
 PsFastXml_checked_common_cflags    += $(addprefix -D, $(PsFastXml_checked_defines))
 PsFastXml_checked_common_cflags    += $(addprefix -I, $(PsFastXml_checked_hpaths))
 PsFastXml_checked_common_cflags  += -m32
-PsFastXml_checked_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PsFastXml_checked_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PsFastXml_checked_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PsFastXml_checked_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PsFastXml_checked_common_cflags  += -Wno-missing-field-initializers
@@ -281,7 +281,7 @@ PsFastXml_profile_common_cflags    += -MMD
 PsFastXml_profile_common_cflags    += $(addprefix -D, $(PsFastXml_profile_defines))
 PsFastXml_profile_common_cflags    += $(addprefix -I, $(PsFastXml_profile_hpaths))
 PsFastXml_profile_common_cflags  += -m32
-PsFastXml_profile_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PsFastXml_profile_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PsFastXml_profile_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PsFastXml_profile_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PsFastXml_profile_common_cflags  += -Wno-missing-field-initializers
diff --git a/APEX_1.4/compiler/linux32/Makefile.PxFoundation.mk b/APEX_1.4/compiler/linux32/Makefile.PxFoundation.mk
index 5e3392fc..7130acc7 100644
--- a/APEX_1.4/compiler/linux32/Makefile.PxFoundation.mk
+++ b/APEX_1.4/compiler/linux32/Makefile.PxFoundation.mk
@@ -55,7 +55,7 @@ PxFoundation_debug_common_cflags    += -MMD
 PxFoundation_debug_common_cflags    += $(addprefix -D, $(PxFoundation_debug_defines))
 PxFoundation_debug_common_cflags    += $(addprefix -I, $(PxFoundation_debug_hpaths))
 PxFoundation_debug_common_cflags  += -m32
-PxFoundation_debug_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxFoundation_debug_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxFoundation_debug_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxFoundation_debug_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxFoundation_debug_common_cflags  += -Wno-missing-field-initializers
@@ -135,7 +135,7 @@ PxFoundation_release_common_cflags    += -MMD
 PxFoundation_release_common_cflags    += $(addprefix -D, $(PxFoundation_release_defines))
 PxFoundation_release_common_cflags    += $(addprefix -I, $(PxFoundation_release_hpaths))
 PxFoundation_release_common_cflags  += -m32
-PxFoundation_release_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxFoundation_release_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxFoundation_release_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxFoundation_release_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxFoundation_release_common_cflags  += -Wno-missing-field-initializers
@@ -216,7 +216,7 @@ PxFoundation_checked_common_cflags    += -MMD
 PxFoundation_checked_common_cflags    += $(addprefix -D, $(PxFoundation_checked_defines))
 PxFoundation_checked_common_cflags    += $(addprefix -I, $(PxFoundation_checked_hpaths))
 PxFoundation_checked_common_cflags  += -m32
-PxFoundation_checked_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxFoundation_checked_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxFoundation_checked_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxFoundation_checked_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxFoundation_checked_common_cflags  += -Wno-missing-field-initializers
@@ -297,7 +297,7 @@ PxFoundation_profile_common_cflags    += -MMD
 PxFoundation_profile_common_cflags    += $(addprefix -D, $(PxFoundation_profile_defines))
 PxFoundation_profile_common_cflags    += $(addprefix -I, $(PxFoundation_profile_hpaths))
 PxFoundation_profile_common_cflags  += -m32
-PxFoundation_profile_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxFoundation_profile_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxFoundation_profile_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxFoundation_profile_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxFoundation_profile_common_cflags  += -Wno-missing-field-initializers
diff --git a/APEX_1.4/compiler/linux32/Makefile.PxPvdSDK.mk b/APEX_1.4/compiler/linux32/Makefile.PxPvdSDK.mk
index 3fc8752b..bf0bf71a 100644
--- a/APEX_1.4/compiler/linux32/Makefile.PxPvdSDK.mk
+++ b/APEX_1.4/compiler/linux32/Makefile.PxPvdSDK.mk
@@ -54,7 +54,7 @@ PxPvdSDK_debug_common_cflags    += -MMD
 PxPvdSDK_debug_common_cflags    += $(addprefix -D, $(PxPvdSDK_debug_defines))
 PxPvdSDK_debug_common_cflags    += $(addprefix -I, $(PxPvdSDK_debug_hpaths))
 PxPvdSDK_debug_common_cflags  += -m32
-PxPvdSDK_debug_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxPvdSDK_debug_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxPvdSDK_debug_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxPvdSDK_debug_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxPvdSDK_debug_common_cflags  += -Wno-missing-field-initializers
@@ -139,7 +139,7 @@ PxPvdSDK_release_common_cflags    += -MMD
 PxPvdSDK_release_common_cflags    += $(addprefix -D, $(PxPvdSDK_release_defines))
 PxPvdSDK_release_common_cflags    += $(addprefix -I, $(PxPvdSDK_release_hpaths))
 PxPvdSDK_release_common_cflags  += -m32
-PxPvdSDK_release_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxPvdSDK_release_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxPvdSDK_release_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxPvdSDK_release_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxPvdSDK_release_common_cflags  += -Wno-missing-field-initializers
@@ -225,7 +225,7 @@ PxPvdSDK_checked_common_cflags    += -MMD
 PxPvdSDK_checked_common_cflags    += $(addprefix -D, $(PxPvdSDK_checked_defines))
 PxPvdSDK_checked_common_cflags    += $(addprefix -I, $(PxPvdSDK_checked_hpaths))
 PxPvdSDK_checked_common_cflags  += -m32
-PxPvdSDK_checked_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxPvdSDK_checked_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxPvdSDK_checked_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxPvdSDK_checked_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxPvdSDK_checked_common_cflags  += -Wno-missing-field-initializers
@@ -311,7 +311,7 @@ PxPvdSDK_profile_common_cflags    += -MMD
 PxPvdSDK_profile_common_cflags    += $(addprefix -D, $(PxPvdSDK_profile_defines))
 PxPvdSDK_profile_common_cflags    += $(addprefix -I, $(PxPvdSDK_profile_hpaths))
 PxPvdSDK_profile_common_cflags  += -m32
-PxPvdSDK_profile_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxPvdSDK_profile_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxPvdSDK_profile_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxPvdSDK_profile_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxPvdSDK_profile_common_cflags  += -Wno-missing-field-initializers
diff --git a/APEX_1.4/compiler/linux32/Makefile.PxTask.mk b/APEX_1.4/compiler/linux32/Makefile.PxTask.mk
index f460bb4e..ae01f1b2 100644
--- a/APEX_1.4/compiler/linux32/Makefile.PxTask.mk
+++ b/APEX_1.4/compiler/linux32/Makefile.PxTask.mk
@@ -38,7 +38,7 @@ PxTask_debug_common_cflags    += -MMD
 PxTask_debug_common_cflags    += $(addprefix -D, $(PxTask_debug_defines))
 PxTask_debug_common_cflags    += $(addprefix -I, $(PxTask_debug_hpaths))
 PxTask_debug_common_cflags  += -m32
-PxTask_debug_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxTask_debug_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxTask_debug_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxTask_debug_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxTask_debug_common_cflags  += -Wno-missing-field-initializers
@@ -117,7 +117,7 @@ PxTask_release_common_cflags    += -MMD
 PxTask_release_common_cflags    += $(addprefix -D, $(PxTask_release_defines))
 PxTask_release_common_cflags    += $(addprefix -I, $(PxTask_release_hpaths))
 PxTask_release_common_cflags  += -m32
-PxTask_release_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxTask_release_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxTask_release_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxTask_release_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxTask_release_common_cflags  += -Wno-missing-field-initializers
@@ -197,7 +197,7 @@ PxTask_checked_common_cflags    += -MMD
 PxTask_checked_common_cflags    += $(addprefix -D, $(PxTask_checked_defines))
 PxTask_checked_common_cflags    += $(addprefix -I, $(PxTask_checked_hpaths))
 PxTask_checked_common_cflags  += -m32
-PxTask_checked_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxTask_checked_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxTask_checked_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxTask_checked_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxTask_checked_common_cflags  += -Wno-missing-field-initializers
@@ -277,7 +277,7 @@ PxTask_profile_common_cflags    += -MMD
 PxTask_profile_common_cflags    += $(addprefix -D, $(PxTask_profile_defines))
 PxTask_profile_common_cflags    += $(addprefix -I, $(PxTask_profile_hpaths))
 PxTask_profile_common_cflags  += -m32
-PxTask_profile_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxTask_profile_common_cflags  += -Werror -m32 -fPIC -msse2 -mfpmath=sse -malign-double -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxTask_profile_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxTask_profile_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxTask_profile_common_cflags  += -Wno-missing-field-initializers
diff --git a/APEX_1.4/compiler/linux64/Makefile.ApexFramework.mk b/APEX_1.4/compiler/linux64/Makefile.ApexFramework.mk
index 31d9922c..9c08e637 100644
--- a/APEX_1.4/compiler/linux64/Makefile.ApexFramework.mk
+++ b/APEX_1.4/compiler/linux64/Makefile.ApexFramework.mk
@@ -124,7 +124,6 @@ ApexFramework_debug_libraries += PxPvdSDKDEBUG_x64
 ApexFramework_debug_libraries += PxTaskDEBUG
 ApexFramework_debug_libraries += RenderDebugDEBUG
 ApexFramework_debug_libraries += PhysX3CommonDEBUG_x64
-ApexFramework_debug_libraries += PxCudaContextManagerDEBUG_x64
 ApexFramework_debug_common_cflags	:= $(ApexFramework_custom_cflags)
 ApexFramework_debug_common_cflags    += -MMD
 ApexFramework_debug_common_cflags    += $(addprefix -D, $(ApexFramework_debug_defines))
@@ -253,7 +252,6 @@ ApexFramework_release_libraries += PxPvdSDK_x64
 ApexFramework_release_libraries += PxTask
 ApexFramework_release_libraries += RenderDebug
 ApexFramework_release_libraries += PhysX3Common_x64
-ApexFramework_release_libraries += PxCudaContextManager_x64
 ApexFramework_release_common_cflags	:= $(ApexFramework_custom_cflags)
 ApexFramework_release_common_cflags    += -MMD
 ApexFramework_release_common_cflags    += $(addprefix -D, $(ApexFramework_release_defines))
@@ -382,7 +380,6 @@ ApexFramework_profile_libraries += PxPvdSDKPROFILE_x64
 ApexFramework_profile_libraries += PxTaskPROFILE
 ApexFramework_profile_libraries += RenderDebugPROFILE
 ApexFramework_profile_libraries += PhysX3CommonPROFILE_x64
-ApexFramework_profile_libraries += PxCudaContextManagerPROFILE_x64
 ApexFramework_profile_common_cflags	:= $(ApexFramework_custom_cflags)
 ApexFramework_profile_common_cflags    += -MMD
 ApexFramework_profile_common_cflags    += $(addprefix -D, $(ApexFramework_profile_defines))
@@ -512,7 +509,6 @@ ApexFramework_checked_libraries += PxPvdSDKCHECKED_x64
 ApexFramework_checked_libraries += PxTaskCHECKED
 ApexFramework_checked_libraries += RenderDebugCHECKED
 ApexFramework_checked_libraries += PhysX3CommonCHECKED_x64
-ApexFramework_checked_libraries += PxCudaContextManagerCHECKED_x64
 ApexFramework_checked_common_cflags	:= $(ApexFramework_custom_cflags)
 ApexFramework_checked_common_cflags    += -MMD
 ApexFramework_checked_common_cflags    += $(addprefix -D, $(ApexFramework_checked_defines))
diff --git a/APEX_1.4/compiler/linux64/Makefile.PsFastXml.mk b/APEX_1.4/compiler/linux64/Makefile.PsFastXml.mk
index 56a460ca..811bbb85 100644
--- a/APEX_1.4/compiler/linux64/Makefile.PsFastXml.mk
+++ b/APEX_1.4/compiler/linux64/Makefile.PsFastXml.mk
@@ -39,7 +39,7 @@ PsFastXml_debug_common_cflags    += -MMD
 PsFastXml_debug_common_cflags    += $(addprefix -D, $(PsFastXml_debug_defines))
 PsFastXml_debug_common_cflags    += $(addprefix -I, $(PsFastXml_debug_hpaths))
 PsFastXml_debug_common_cflags  += -m64
-PsFastXml_debug_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PsFastXml_debug_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PsFastXml_debug_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PsFastXml_debug_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PsFastXml_debug_common_cflags  += -Wno-missing-field-initializers
@@ -119,7 +119,7 @@ PsFastXml_release_common_cflags    += -MMD
 PsFastXml_release_common_cflags    += $(addprefix -D, $(PsFastXml_release_defines))
 PsFastXml_release_common_cflags    += $(addprefix -I, $(PsFastXml_release_hpaths))
 PsFastXml_release_common_cflags  += -m64
-PsFastXml_release_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PsFastXml_release_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PsFastXml_release_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PsFastXml_release_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PsFastXml_release_common_cflags  += -Wno-missing-field-initializers
@@ -200,7 +200,7 @@ PsFastXml_checked_common_cflags    += -MMD
 PsFastXml_checked_common_cflags    += $(addprefix -D, $(PsFastXml_checked_defines))
 PsFastXml_checked_common_cflags    += $(addprefix -I, $(PsFastXml_checked_hpaths))
 PsFastXml_checked_common_cflags  += -m64
-PsFastXml_checked_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PsFastXml_checked_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PsFastXml_checked_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PsFastXml_checked_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PsFastXml_checked_common_cflags  += -Wno-missing-field-initializers
@@ -281,7 +281,7 @@ PsFastXml_profile_common_cflags    += -MMD
 PsFastXml_profile_common_cflags    += $(addprefix -D, $(PsFastXml_profile_defines))
 PsFastXml_profile_common_cflags    += $(addprefix -I, $(PsFastXml_profile_hpaths))
 PsFastXml_profile_common_cflags  += -m64
-PsFastXml_profile_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PsFastXml_profile_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PsFastXml_profile_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PsFastXml_profile_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PsFastXml_profile_common_cflags  += -Wno-missing-field-initializers
diff --git a/APEX_1.4/compiler/linux64/Makefile.PxFoundation.mk b/APEX_1.4/compiler/linux64/Makefile.PxFoundation.mk
index 3bcfd8c8..2a39480c 100644
--- a/APEX_1.4/compiler/linux64/Makefile.PxFoundation.mk
+++ b/APEX_1.4/compiler/linux64/Makefile.PxFoundation.mk
@@ -55,7 +55,7 @@ PxFoundation_debug_common_cflags    += -MMD
 PxFoundation_debug_common_cflags    += $(addprefix -D, $(PxFoundation_debug_defines))
 PxFoundation_debug_common_cflags    += $(addprefix -I, $(PxFoundation_debug_hpaths))
 PxFoundation_debug_common_cflags  += -m64
-PxFoundation_debug_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxFoundation_debug_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxFoundation_debug_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxFoundation_debug_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxFoundation_debug_common_cflags  += -Wno-missing-field-initializers
@@ -135,7 +135,7 @@ PxFoundation_release_common_cflags    += -MMD
 PxFoundation_release_common_cflags    += $(addprefix -D, $(PxFoundation_release_defines))
 PxFoundation_release_common_cflags    += $(addprefix -I, $(PxFoundation_release_hpaths))
 PxFoundation_release_common_cflags  += -m64
-PxFoundation_release_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxFoundation_release_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxFoundation_release_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxFoundation_release_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxFoundation_release_common_cflags  += -Wno-missing-field-initializers
@@ -216,7 +216,7 @@ PxFoundation_checked_common_cflags    += -MMD
 PxFoundation_checked_common_cflags    += $(addprefix -D, $(PxFoundation_checked_defines))
 PxFoundation_checked_common_cflags    += $(addprefix -I, $(PxFoundation_checked_hpaths))
 PxFoundation_checked_common_cflags  += -m64
-PxFoundation_checked_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxFoundation_checked_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxFoundation_checked_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxFoundation_checked_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxFoundation_checked_common_cflags  += -Wno-missing-field-initializers
@@ -297,7 +297,7 @@ PxFoundation_profile_common_cflags    += -MMD
 PxFoundation_profile_common_cflags    += $(addprefix -D, $(PxFoundation_profile_defines))
 PxFoundation_profile_common_cflags    += $(addprefix -I, $(PxFoundation_profile_hpaths))
 PxFoundation_profile_common_cflags  += -m64
-PxFoundation_profile_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxFoundation_profile_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxFoundation_profile_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxFoundation_profile_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxFoundation_profile_common_cflags  += -Wno-missing-field-initializers
diff --git a/APEX_1.4/compiler/linux64/Makefile.PxPvdSDK.mk b/APEX_1.4/compiler/linux64/Makefile.PxPvdSDK.mk
index d7447bfa..cce382bd 100644
--- a/APEX_1.4/compiler/linux64/Makefile.PxPvdSDK.mk
+++ b/APEX_1.4/compiler/linux64/Makefile.PxPvdSDK.mk
@@ -54,7 +54,7 @@ PxPvdSDK_debug_common_cflags    += -MMD
 PxPvdSDK_debug_common_cflags    += $(addprefix -D, $(PxPvdSDK_debug_defines))
 PxPvdSDK_debug_common_cflags    += $(addprefix -I, $(PxPvdSDK_debug_hpaths))
 PxPvdSDK_debug_common_cflags  += -m64
-PxPvdSDK_debug_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxPvdSDK_debug_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxPvdSDK_debug_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxPvdSDK_debug_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxPvdSDK_debug_common_cflags  += -Wno-missing-field-initializers
@@ -139,7 +139,7 @@ PxPvdSDK_release_common_cflags    += -MMD
 PxPvdSDK_release_common_cflags    += $(addprefix -D, $(PxPvdSDK_release_defines))
 PxPvdSDK_release_common_cflags    += $(addprefix -I, $(PxPvdSDK_release_hpaths))
 PxPvdSDK_release_common_cflags  += -m64
-PxPvdSDK_release_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxPvdSDK_release_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxPvdSDK_release_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxPvdSDK_release_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxPvdSDK_release_common_cflags  += -Wno-missing-field-initializers
@@ -225,7 +225,7 @@ PxPvdSDK_checked_common_cflags    += -MMD
 PxPvdSDK_checked_common_cflags    += $(addprefix -D, $(PxPvdSDK_checked_defines))
 PxPvdSDK_checked_common_cflags    += $(addprefix -I, $(PxPvdSDK_checked_hpaths))
 PxPvdSDK_checked_common_cflags  += -m64
-PxPvdSDK_checked_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxPvdSDK_checked_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxPvdSDK_checked_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxPvdSDK_checked_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxPvdSDK_checked_common_cflags  += -Wno-missing-field-initializers
@@ -311,7 +311,7 @@ PxPvdSDK_profile_common_cflags    += -MMD
 PxPvdSDK_profile_common_cflags    += $(addprefix -D, $(PxPvdSDK_profile_defines))
 PxPvdSDK_profile_common_cflags    += $(addprefix -I, $(PxPvdSDK_profile_hpaths))
 PxPvdSDK_profile_common_cflags  += -m64
-PxPvdSDK_profile_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxPvdSDK_profile_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxPvdSDK_profile_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxPvdSDK_profile_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxPvdSDK_profile_common_cflags  += -Wno-missing-field-initializers
diff --git a/APEX_1.4/compiler/linux64/Makefile.PxTask.mk b/APEX_1.4/compiler/linux64/Makefile.PxTask.mk
index 083593f7..b92e078c 100644
--- a/APEX_1.4/compiler/linux64/Makefile.PxTask.mk
+++ b/APEX_1.4/compiler/linux64/Makefile.PxTask.mk
@@ -38,7 +38,7 @@ PxTask_debug_common_cflags    += -MMD
 PxTask_debug_common_cflags    += $(addprefix -D, $(PxTask_debug_defines))
 PxTask_debug_common_cflags    += $(addprefix -I, $(PxTask_debug_hpaths))
 PxTask_debug_common_cflags  += -m64
-PxTask_debug_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxTask_debug_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxTask_debug_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxTask_debug_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxTask_debug_common_cflags  += -Wno-missing-field-initializers
@@ -117,7 +117,7 @@ PxTask_release_common_cflags    += -MMD
 PxTask_release_common_cflags    += $(addprefix -D, $(PxTask_release_defines))
 PxTask_release_common_cflags    += $(addprefix -I, $(PxTask_release_hpaths))
 PxTask_release_common_cflags  += -m64
-PxTask_release_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxTask_release_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxTask_release_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxTask_release_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxTask_release_common_cflags  += -Wno-missing-field-initializers
@@ -197,7 +197,7 @@ PxTask_checked_common_cflags    += -MMD
 PxTask_checked_common_cflags    += $(addprefix -D, $(PxTask_checked_defines))
 PxTask_checked_common_cflags    += $(addprefix -I, $(PxTask_checked_hpaths))
 PxTask_checked_common_cflags  += -m64
-PxTask_checked_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxTask_checked_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxTask_checked_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxTask_checked_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxTask_checked_common_cflags  += -Wno-missing-field-initializers
@@ -277,7 +277,7 @@ PxTask_profile_common_cflags    += -MMD
 PxTask_profile_common_cflags    += $(addprefix -D, $(PxTask_profile_defines))
 PxTask_profile_common_cflags    += $(addprefix -I, $(PxTask_profile_hpaths))
 PxTask_profile_common_cflags  += -m64
-PxTask_profile_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -ffast-math -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
+PxTask_profile_common_cflags  += -Werror -m64 -fPIC -msse2 -mfpmath=sse -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden
 PxTask_profile_common_cflags  += -Wall -Wextra -Wstrict-aliasing=2 -fdiagnostics-show-option
 PxTask_profile_common_cflags  += -Wno-invalid-offsetof -Wno-uninitialized
 PxTask_profile_common_cflags  += -Wno-missing-field-initializers
diff --git a/APEX_1.4/compiler/resource/apex.rc b/APEX_1.4/compiler/resource/apex.rc
index 4464094e..730140a6 100644
--- a/APEX_1.4/compiler/resource/apex.rc
+++ b/APEX_1.4/compiler/resource/apex.rc
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "NVIDIA Corporation"
             VALUE "FileDescription", "APEX Dynamic Link Library"
-            VALUE "FileVersion", "1.4.0"
+            VALUE "FileVersion", "1.4.1"
             VALUE "InternalName", "APEX_1.4"
             VALUE "LegalCopyright", "Copyright (C) 2015 NVIDIA Corporation"
             VALUE "OriginalFilename", "apex.dll"
             VALUE "ProductName", " APEX Dynamic Link Library"
-            VALUE "ProductVersion", "1.4.0.0"
+            VALUE "ProductVersion", "1.4.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/APEX_1.4/compiler/vc11win32-PhysX_3.4/ApexFramework.vcxproj b/APEX_1.4/compiler/vc11win32-PhysX_3.4/ApexFramework.vcxproj
index cc1f439f..e19c5d3b 100644
--- a/APEX_1.4/compiler/vc11win32-PhysX_3.4/ApexFramework.vcxproj
+++ b/APEX_1.4/compiler/vc11win32-PhysX_3.4/ApexFramework.vcxproj
@@ -123,7 +123,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x86 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonDEBUG_x86.lib;PxCudaContextManagerDEBUG_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonDEBUG_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)DEBUG_x86.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc11win32;../../../PhysX_3.4/Lib/vc11win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)DEBUG_x86.dll.pdb</ProgramDatabaseFile>
@@ -165,7 +165,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x86 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3Common_x86.lib;PxCudaContextManager_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3Common_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)_x86.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc11win32;../../../PhysX_3.4/Lib/vc11win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)_x86.dll.pdb</ProgramDatabaseFile>
@@ -207,7 +207,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x86 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonPROFILE_x86.lib;PxCudaContextManagerPROFILE_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonPROFILE_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)PROFILE_x86.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc11win32;../../../PhysX_3.4/Lib/vc11win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)PROFILE_x86.dll.pdb</ProgramDatabaseFile>
@@ -249,7 +249,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x86 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonCHECKED_x86.lib;PxCudaContextManagerCHECKED_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonCHECKED_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)CHECKED_x86.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc11win32;../../../PhysX_3.4/Lib/vc11win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)CHECKED_x86.dll.pdb</ProgramDatabaseFile>
diff --git a/APEX_1.4/compiler/vc11win64-PhysX_3.4/ApexFramework.vcxproj b/APEX_1.4/compiler/vc11win64-PhysX_3.4/ApexFramework.vcxproj
index 05e36f15..dcb070c3 100644
--- a/APEX_1.4/compiler/vc11win64-PhysX_3.4/ApexFramework.vcxproj
+++ b/APEX_1.4/compiler/vc11win64-PhysX_3.4/ApexFramework.vcxproj
@@ -122,7 +122,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x64 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonDEBUG_x64.lib;PxCudaContextManagerDEBUG_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonDEBUG_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)DEBUG_x64.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc11win64;../../../PhysX_3.4/Lib/vc11win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)DEBUG_x64.dll.pdb</ProgramDatabaseFile>
@@ -163,7 +163,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x64 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3Common_x64.lib;PxCudaContextManager_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3Common_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)_x64.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc11win64;../../../PhysX_3.4/Lib/vc11win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)_x64.dll.pdb</ProgramDatabaseFile>
@@ -204,7 +204,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x64 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonPROFILE_x64.lib;PxCudaContextManagerPROFILE_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonPROFILE_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)PROFILE_x64.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc11win64;../../../PhysX_3.4/Lib/vc11win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)PROFILE_x64.dll.pdb</ProgramDatabaseFile>
@@ -245,7 +245,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x64 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonCHECKED_x64.lib;PxCudaContextManagerCHECKED_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonCHECKED_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)CHECKED_x64.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc11win64;../../../PhysX_3.4/Lib/vc11win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)CHECKED_x64.dll.pdb</ProgramDatabaseFile>
diff --git a/APEX_1.4/compiler/vc12win32-PhysX_3.4/ApexFramework.vcxproj b/APEX_1.4/compiler/vc12win32-PhysX_3.4/ApexFramework.vcxproj
index bd541e74..4c305c68 100644
--- a/APEX_1.4/compiler/vc12win32-PhysX_3.4/ApexFramework.vcxproj
+++ b/APEX_1.4/compiler/vc12win32-PhysX_3.4/ApexFramework.vcxproj
@@ -123,7 +123,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x86 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonDEBUG_x86.lib;PxCudaContextManagerDEBUG_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonDEBUG_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)DEBUG_x86.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc12win32;../../../PhysX_3.4/Lib/vc12win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)DEBUG_x86.dll.pdb</ProgramDatabaseFile>
@@ -165,7 +165,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x86 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3Common_x86.lib;PxCudaContextManager_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3Common_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)_x86.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc12win32;../../../PhysX_3.4/Lib/vc12win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)_x86.dll.pdb</ProgramDatabaseFile>
@@ -207,7 +207,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x86 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonPROFILE_x86.lib;PxCudaContextManagerPROFILE_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonPROFILE_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)PROFILE_x86.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc12win32;../../../PhysX_3.4/Lib/vc12win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)PROFILE_x86.dll.pdb</ProgramDatabaseFile>
@@ -249,7 +249,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x86 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonCHECKED_x86.lib;PxCudaContextManagerCHECKED_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonCHECKED_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)CHECKED_x86.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc12win32;../../../PhysX_3.4/Lib/vc12win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)CHECKED_x86.dll.pdb</ProgramDatabaseFile>
diff --git a/APEX_1.4/compiler/vc12win64-PhysX_3.4/ApexFramework.vcxproj b/APEX_1.4/compiler/vc12win64-PhysX_3.4/ApexFramework.vcxproj
index 86ac1122..1fe58f49 100644
--- a/APEX_1.4/compiler/vc12win64-PhysX_3.4/ApexFramework.vcxproj
+++ b/APEX_1.4/compiler/vc12win64-PhysX_3.4/ApexFramework.vcxproj
@@ -122,7 +122,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x64 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonDEBUG_x64.lib;PxCudaContextManagerDEBUG_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonDEBUG_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)DEBUG_x64.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc12win64;../../../PhysX_3.4/Lib/vc12win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)DEBUG_x64.dll.pdb</ProgramDatabaseFile>
@@ -163,7 +163,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x64 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3Common_x64.lib;PxCudaContextManager_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3Common_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)_x64.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc12win64;../../../PhysX_3.4/Lib/vc12win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)_x64.dll.pdb</ProgramDatabaseFile>
@@ -204,7 +204,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x64 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonPROFILE_x64.lib;PxCudaContextManagerPROFILE_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonPROFILE_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)PROFILE_x64.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc12win64;../../../PhysX_3.4/Lib/vc12win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)PROFILE_x64.dll.pdb</ProgramDatabaseFile>
@@ -245,7 +245,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x64 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonCHECKED_x64.lib;PxCudaContextManagerCHECKED_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonCHECKED_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)CHECKED_x64.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc12win64;../../../PhysX_3.4/Lib/vc12win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)CHECKED_x64.dll.pdb</ProgramDatabaseFile>
diff --git a/APEX_1.4/compiler/vc14win32-PhysX_3.4/ApexFramework.vcxproj b/APEX_1.4/compiler/vc14win32-PhysX_3.4/ApexFramework.vcxproj
index eb1e59e1..40326e24 100644
--- a/APEX_1.4/compiler/vc14win32-PhysX_3.4/ApexFramework.vcxproj
+++ b/APEX_1.4/compiler/vc14win32-PhysX_3.4/ApexFramework.vcxproj
@@ -123,7 +123,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x86 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonDEBUG_x86.lib;PxCudaContextManagerDEBUG_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonDEBUG_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)DEBUG_x86.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc14win32;../../../PhysX_3.4/Lib/vc14win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)DEBUG_x86.dll.pdb</ProgramDatabaseFile>
@@ -165,7 +165,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x86 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3Common_x86.lib;PxCudaContextManager_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3Common_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)_x86.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc14win32;../../../PhysX_3.4/Lib/vc14win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)_x86.dll.pdb</ProgramDatabaseFile>
@@ -207,7 +207,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x86 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonPROFILE_x86.lib;PxCudaContextManagerPROFILE_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonPROFILE_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)PROFILE_x86.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc14win32;../../../PhysX_3.4/Lib/vc14win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)PROFILE_x86.dll.pdb</ProgramDatabaseFile>
@@ -249,7 +249,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x86 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonCHECKED_x86.lib;PxCudaContextManagerCHECKED_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/win32/nvToolsExt32_1.lib;PhysX3CommonCHECKED_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)CHECKED_x86.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc14win32;../../../PhysX_3.4/Lib/vc14win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)CHECKED_x86.dll.pdb</ProgramDatabaseFile>
diff --git a/APEX_1.4/compiler/vc14win64-PhysX_3.4/ApexFramework.vcxproj b/APEX_1.4/compiler/vc14win64-PhysX_3.4/ApexFramework.vcxproj
index 253140fb..504530cd 100644
--- a/APEX_1.4/compiler/vc14win64-PhysX_3.4/ApexFramework.vcxproj
+++ b/APEX_1.4/compiler/vc14win64-PhysX_3.4/ApexFramework.vcxproj
@@ -122,7 +122,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x64 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonDEBUG_x64.lib;PxCudaContextManagerDEBUG_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonDEBUG_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)DEBUG_x64.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc14win64;../../../PhysX_3.4/Lib/vc14win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)DEBUG_x64.dll.pdb</ProgramDatabaseFile>
@@ -163,7 +163,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x64 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3Common_x64.lib;PxCudaContextManager_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3Common_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)_x64.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc14win64;../../../PhysX_3.4/Lib/vc14win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)_x64.dll.pdb</ProgramDatabaseFile>
@@ -204,7 +204,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x64 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonPROFILE_x64.lib;PxCudaContextManagerPROFILE_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonPROFILE_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)PROFILE_x64.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc14win64;../../../PhysX_3.4/Lib/vc14win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)PROFILE_x64.dll.pdb</ProgramDatabaseFile>
@@ -245,7 +245,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/MACHINE:x64 /INCREMENTAL:NO</AdditionalOptions>
-      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonCHECKED_x64.lib;PxCudaContextManagerCHECKED_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>./../../../Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib;PhysX3CommonCHECKED_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)CHECKED_x64.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../PxShared/lib/vc14win64;../../../PhysX_3.4/Lib/vc14win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)/$(ProjectName)CHECKED_x64.dll.pdb</ProgramDatabaseFile>