PhysX 3.4.1, APEX 1.4.1 Release @22845541v3.4.1

4 files changed, 56 insertions, 56 deletions

diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.PhysX.mk b/PhysX_3.4/Source/compiler/android16/Makefile.PhysX.mk
index 0de75336..7fc13d87 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.PhysX.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.PhysX.mk
@@ -114,8 +114,8 @@ PhysX_release_hpaths    += ./../../PhysXCooking/src/convex
 PhysX_release_hpaths    += ./../../SceneQuery/include
 PhysX_release_hpaths    += ./../../PhysXMetaData/core/include
 PhysX_release_lpaths    := 
-PhysX_release_lpaths    += ./../../../Lib/android16
 PhysX_release_lpaths    += ./../../../../PxShared/lib/android16
+PhysX_release_lpaths    += ./../../../Lib/android16
 PhysX_release_defines   := $(PhysX_custom_defines)
 PhysX_release_defines   += ANDROID
 PhysX_release_defines   += GLES2
@@ -128,17 +128,17 @@ PhysX_release_defines   += PX_PHYSX_STATIC_LIB
 PhysX_release_defines   += NDEBUG
 PhysX_release_defines   += PX_SUPPORT_PVD=0
 PhysX_release_libraries := 
+PhysX_release_libraries += PxPvdSDK
+PhysX_release_libraries += PxFoundation
+PhysX_release_libraries += PhysX3Common
 PhysX_release_libraries += LowLevel
 PhysX_release_libraries += LowLevelAABB
-PhysX_release_libraries += LowLevelCloth
 PhysX_release_libraries += LowLevelDynamics
+PhysX_release_libraries += LowLevelCloth
 PhysX_release_libraries += LowLevelParticles
-PhysX_release_libraries += PhysX3Common
-PhysX_release_libraries += PxFoundation
-PhysX_release_libraries += PxPvdSDK
-PhysX_release_libraries += PxTask
 PhysX_release_libraries += SceneQuery
 PhysX_release_libraries += SimulationController
+PhysX_release_libraries += PxTask
 PhysX_release_common_cflags	:= $(PhysX_custom_cflags)
 PhysX_release_common_cflags    += -MMD
 PhysX_release_common_cflags    += $(addprefix -D, $(PhysX_release_defines))
@@ -180,9 +180,9 @@ postbuild_PhysX_release: mainbuild_PhysX_release
 mainbuild_PhysX_release: prebuild_PhysX_release $(PhysX_release_bin)
 prebuild_PhysX_release:
 
-$(PhysX_release_bin): $(LowLevel_release_obj) $(LowLevelAABB_release_obj) $(LowLevelCloth_release_obj) $(LowLevelDynamics_release_obj) $(LowLevelParticles_release_obj) $(PhysXCommon_release_obj) $(PxTask_release_obj) $(SceneQuery_release_obj) $(SimulationController_release_obj) $(PhysX_release_obj) build_LowLevel_release build_LowLevelAABB_release build_LowLevelCloth_release build_LowLevelDynamics_release build_LowLevelParticles_release build_PhysXCommon_release build_PxFoundation_release build_PxPvdSDK_release build_PxTask_release build_SceneQuery_release build_SimulationController_release 
+$(PhysX_release_bin): $(PhysXCommon_release_obj) $(LowLevel_release_obj) $(LowLevelAABB_release_obj) $(LowLevelDynamics_release_obj) $(LowLevelCloth_release_obj) $(LowLevelParticles_release_obj) $(SceneQuery_release_obj) $(SimulationController_release_obj) $(PxTask_release_obj) $(PhysX_release_obj) build_PxPvdSDK_release build_PxFoundation_release build_PhysXCommon_release build_LowLevel_release build_LowLevelAABB_release build_LowLevelDynamics_release build_LowLevelCloth_release build_LowLevelParticles_release build_SceneQuery_release build_SimulationController_release build_PxTask_release 
 	mkdir -p `dirname ./../../../Lib/android16/libPhysX3.a`
-	@$(AR) rcs $(PhysX_release_bin) $(LowLevel_release_obj) $(LowLevelAABB_release_obj) $(LowLevelCloth_release_obj) $(LowLevelDynamics_release_obj) $(LowLevelParticles_release_obj) $(PhysXCommon_release_obj) $(PxTask_release_obj) $(SceneQuery_release_obj) $(SimulationController_release_obj) $(PhysX_release_obj)
+	@$(AR) rcs $(PhysX_release_bin) $(PhysXCommon_release_obj) $(LowLevel_release_obj) $(LowLevelAABB_release_obj) $(LowLevelDynamics_release_obj) $(LowLevelCloth_release_obj) $(LowLevelParticles_release_obj) $(SceneQuery_release_obj) $(SimulationController_release_obj) $(PxTask_release_obj) $(PhysX_release_obj)
 	$(ECHO) building $@ complete!
 
 PhysX_release_DEPDIR = $(dir $(@))/$(*F)
@@ -266,8 +266,8 @@ PhysX_debug_hpaths    += ./../../PhysXCooking/src/convex
 PhysX_debug_hpaths    += ./../../SceneQuery/include
 PhysX_debug_hpaths    += ./../../PhysXMetaData/core/include
 PhysX_debug_lpaths    := 
-PhysX_debug_lpaths    += ./../../../Lib/android16
 PhysX_debug_lpaths    += ./../../../../PxShared/lib/android16
+PhysX_debug_lpaths    += ./../../../Lib/android16
 PhysX_debug_defines   := $(PhysX_custom_defines)
 PhysX_debug_defines   += ANDROID
 PhysX_debug_defines   += GLES2
@@ -283,17 +283,17 @@ PhysX_debug_defines   += PX_CHECKED=1
 PhysX_debug_defines   += PX_SUPPORT_PVD=1
 PhysX_debug_defines   += PX_NVTX=1
 PhysX_debug_libraries := 
+PhysX_debug_libraries += PxPvdSDKDEBUG
+PhysX_debug_libraries += PxFoundationDEBUG
+PhysX_debug_libraries += PhysX3CommonDEBUG
 PhysX_debug_libraries += LowLevelDEBUG
 PhysX_debug_libraries += LowLevelAABBDEBUG
-PhysX_debug_libraries += LowLevelClothDEBUG
 PhysX_debug_libraries += LowLevelDynamicsDEBUG
+PhysX_debug_libraries += LowLevelClothDEBUG
 PhysX_debug_libraries += LowLevelParticlesDEBUG
-PhysX_debug_libraries += PhysX3CommonDEBUG
-PhysX_debug_libraries += PxFoundationDEBUG
-PhysX_debug_libraries += PxPvdSDKDEBUG
-PhysX_debug_libraries += PxTaskDEBUG
 PhysX_debug_libraries += SceneQueryDEBUG
 PhysX_debug_libraries += SimulationControllerDEBUG
+PhysX_debug_libraries += PxTaskDEBUG
 PhysX_debug_common_cflags	:= $(PhysX_custom_cflags)
 PhysX_debug_common_cflags    += -MMD
 PhysX_debug_common_cflags    += $(addprefix -D, $(PhysX_debug_defines))
@@ -333,9 +333,9 @@ postbuild_PhysX_debug: mainbuild_PhysX_debug
 mainbuild_PhysX_debug: prebuild_PhysX_debug $(PhysX_debug_bin)
 prebuild_PhysX_debug:
 
-$(PhysX_debug_bin): $(LowLevel_debug_obj) $(LowLevelAABB_debug_obj) $(LowLevelCloth_debug_obj) $(LowLevelDynamics_debug_obj) $(LowLevelParticles_debug_obj) $(PhysXCommon_debug_obj) $(PxTask_debug_obj) $(SceneQuery_debug_obj) $(SimulationController_debug_obj) $(PhysX_debug_obj) build_LowLevel_debug build_LowLevelAABB_debug build_LowLevelCloth_debug build_LowLevelDynamics_debug build_LowLevelParticles_debug build_PhysXCommon_debug build_PxFoundation_debug build_PxPvdSDK_debug build_PxTask_debug build_SceneQuery_debug build_SimulationController_debug 
+$(PhysX_debug_bin): $(PhysXCommon_debug_obj) $(LowLevel_debug_obj) $(LowLevelAABB_debug_obj) $(LowLevelDynamics_debug_obj) $(LowLevelCloth_debug_obj) $(LowLevelParticles_debug_obj) $(SceneQuery_debug_obj) $(SimulationController_debug_obj) $(PxTask_debug_obj) $(PhysX_debug_obj) build_PxPvdSDK_debug build_PxFoundation_debug build_PhysXCommon_debug build_LowLevel_debug build_LowLevelAABB_debug build_LowLevelDynamics_debug build_LowLevelCloth_debug build_LowLevelParticles_debug build_SceneQuery_debug build_SimulationController_debug build_PxTask_debug 
 	mkdir -p `dirname ./../../../Lib/android16/libPhysX3DEBUG.a`
-	@$(AR) rcs $(PhysX_debug_bin) $(LowLevel_debug_obj) $(LowLevelAABB_debug_obj) $(LowLevelCloth_debug_obj) $(LowLevelDynamics_debug_obj) $(LowLevelParticles_debug_obj) $(PhysXCommon_debug_obj) $(PxTask_debug_obj) $(SceneQuery_debug_obj) $(SimulationController_debug_obj) $(PhysX_debug_obj)
+	@$(AR) rcs $(PhysX_debug_bin) $(PhysXCommon_debug_obj) $(LowLevel_debug_obj) $(LowLevelAABB_debug_obj) $(LowLevelDynamics_debug_obj) $(LowLevelCloth_debug_obj) $(LowLevelParticles_debug_obj) $(SceneQuery_debug_obj) $(SimulationController_debug_obj) $(PxTask_debug_obj) $(PhysX_debug_obj)
 	$(ECHO) building $@ complete!
 
 PhysX_debug_DEPDIR = $(dir $(@))/$(*F)
@@ -419,8 +419,8 @@ PhysX_checked_hpaths    += ./../../PhysXCooking/src/convex
 PhysX_checked_hpaths    += ./../../SceneQuery/include
 PhysX_checked_hpaths    += ./../../PhysXMetaData/core/include
 PhysX_checked_lpaths    := 
-PhysX_checked_lpaths    += ./../../../Lib/android16
 PhysX_checked_lpaths    += ./../../../../PxShared/lib/android16
+PhysX_checked_lpaths    += ./../../../Lib/android16
 PhysX_checked_defines   := $(PhysX_custom_defines)
 PhysX_checked_defines   += ANDROID
 PhysX_checked_defines   += GLES2
@@ -435,17 +435,17 @@ PhysX_checked_defines   += PX_CHECKED=1
 PhysX_checked_defines   += PX_SUPPORT_PVD=1
 PhysX_checked_defines   += PX_NVTX=1
 PhysX_checked_libraries := 
+PhysX_checked_libraries += PxPvdSDKCHECKED
+PhysX_checked_libraries += PxFoundationCHECKED
+PhysX_checked_libraries += PhysX3CommonCHECKED
 PhysX_checked_libraries += LowLevelCHECKED
 PhysX_checked_libraries += LowLevelAABBCHECKED
-PhysX_checked_libraries += LowLevelClothCHECKED
 PhysX_checked_libraries += LowLevelDynamicsCHECKED
+PhysX_checked_libraries += LowLevelClothCHECKED
 PhysX_checked_libraries += LowLevelParticlesCHECKED
-PhysX_checked_libraries += PhysX3CommonCHECKED
-PhysX_checked_libraries += PxFoundationCHECKED
-PhysX_checked_libraries += PxPvdSDKCHECKED
-PhysX_checked_libraries += PxTaskCHECKED
 PhysX_checked_libraries += SceneQueryCHECKED
 PhysX_checked_libraries += SimulationControllerCHECKED
+PhysX_checked_libraries += PxTaskCHECKED
 PhysX_checked_common_cflags	:= $(PhysX_custom_cflags)
 PhysX_checked_common_cflags    += -MMD
 PhysX_checked_common_cflags    += $(addprefix -D, $(PhysX_checked_defines))
@@ -487,9 +487,9 @@ postbuild_PhysX_checked: mainbuild_PhysX_checked
 mainbuild_PhysX_checked: prebuild_PhysX_checked $(PhysX_checked_bin)
 prebuild_PhysX_checked:
 
-$(PhysX_checked_bin): $(LowLevel_checked_obj) $(LowLevelAABB_checked_obj) $(LowLevelCloth_checked_obj) $(LowLevelDynamics_checked_obj) $(LowLevelParticles_checked_obj) $(PhysXCommon_checked_obj) $(PxTask_checked_obj) $(SceneQuery_checked_obj) $(SimulationController_checked_obj) $(PhysX_checked_obj) build_LowLevel_checked build_LowLevelAABB_checked build_LowLevelCloth_checked build_LowLevelDynamics_checked build_LowLevelParticles_checked build_PhysXCommon_checked build_PxFoundation_checked build_PxPvdSDK_checked build_PxTask_checked build_SceneQuery_checked build_SimulationController_checked 
+$(PhysX_checked_bin): $(PhysXCommon_checked_obj) $(LowLevel_checked_obj) $(LowLevelAABB_checked_obj) $(LowLevelDynamics_checked_obj) $(LowLevelCloth_checked_obj) $(LowLevelParticles_checked_obj) $(SceneQuery_checked_obj) $(SimulationController_checked_obj) $(PxTask_checked_obj) $(PhysX_checked_obj) build_PxPvdSDK_checked build_PxFoundation_checked build_PhysXCommon_checked build_LowLevel_checked build_LowLevelAABB_checked build_LowLevelDynamics_checked build_LowLevelCloth_checked build_LowLevelParticles_checked build_SceneQuery_checked build_SimulationController_checked build_PxTask_checked 
 	mkdir -p `dirname ./../../../Lib/android16/libPhysX3CHECKED.a`
-	@$(AR) rcs $(PhysX_checked_bin) $(LowLevel_checked_obj) $(LowLevelAABB_checked_obj) $(LowLevelCloth_checked_obj) $(LowLevelDynamics_checked_obj) $(LowLevelParticles_checked_obj) $(PhysXCommon_checked_obj) $(PxTask_checked_obj) $(SceneQuery_checked_obj) $(SimulationController_checked_obj) $(PhysX_checked_obj)
+	@$(AR) rcs $(PhysX_checked_bin) $(PhysXCommon_checked_obj) $(LowLevel_checked_obj) $(LowLevelAABB_checked_obj) $(LowLevelDynamics_checked_obj) $(LowLevelCloth_checked_obj) $(LowLevelParticles_checked_obj) $(SceneQuery_checked_obj) $(SimulationController_checked_obj) $(PxTask_checked_obj) $(PhysX_checked_obj)
 	$(ECHO) building $@ complete!
 
 PhysX_checked_DEPDIR = $(dir $(@))/$(*F)
@@ -573,8 +573,8 @@ PhysX_profile_hpaths    += ./../../PhysXCooking/src/convex
 PhysX_profile_hpaths    += ./../../SceneQuery/include
 PhysX_profile_hpaths    += ./../../PhysXMetaData/core/include
 PhysX_profile_lpaths    := 
-PhysX_profile_lpaths    += ./../../../Lib/android16
 PhysX_profile_lpaths    += ./../../../../PxShared/lib/android16
+PhysX_profile_lpaths    += ./../../../Lib/android16
 PhysX_profile_defines   := $(PhysX_custom_defines)
 PhysX_profile_defines   += ANDROID
 PhysX_profile_defines   += GLES2
@@ -589,17 +589,17 @@ PhysX_profile_defines   += PX_PROFILE=1
 PhysX_profile_defines   += PX_SUPPORT_PVD=1
 PhysX_profile_defines   += PX_NVTX=1
 PhysX_profile_libraries := 
+PhysX_profile_libraries += PxPvdSDKPROFILE
+PhysX_profile_libraries += PxFoundationPROFILE
+PhysX_profile_libraries += PhysX3CommonPROFILE
 PhysX_profile_libraries += LowLevelPROFILE
 PhysX_profile_libraries += LowLevelAABBPROFILE
-PhysX_profile_libraries += LowLevelClothPROFILE
 PhysX_profile_libraries += LowLevelDynamicsPROFILE
+PhysX_profile_libraries += LowLevelClothPROFILE
 PhysX_profile_libraries += LowLevelParticlesPROFILE
-PhysX_profile_libraries += PhysX3CommonPROFILE
-PhysX_profile_libraries += PxFoundationPROFILE
-PhysX_profile_libraries += PxPvdSDKPROFILE
-PhysX_profile_libraries += PxTaskPROFILE
 PhysX_profile_libraries += SceneQueryPROFILE
 PhysX_profile_libraries += SimulationControllerPROFILE
+PhysX_profile_libraries += PxTaskPROFILE
 PhysX_profile_common_cflags	:= $(PhysX_custom_cflags)
 PhysX_profile_common_cflags    += -MMD
 PhysX_profile_common_cflags    += $(addprefix -D, $(PhysX_profile_defines))
@@ -641,9 +641,9 @@ postbuild_PhysX_profile: mainbuild_PhysX_profile
 mainbuild_PhysX_profile: prebuild_PhysX_profile $(PhysX_profile_bin)
 prebuild_PhysX_profile:
 
-$(PhysX_profile_bin): $(LowLevel_profile_obj) $(LowLevelAABB_profile_obj) $(LowLevelCloth_profile_obj) $(LowLevelDynamics_profile_obj) $(LowLevelParticles_profile_obj) $(PhysXCommon_profile_obj) $(PxTask_profile_obj) $(SceneQuery_profile_obj) $(SimulationController_profile_obj) $(PhysX_profile_obj) build_LowLevel_profile build_LowLevelAABB_profile build_LowLevelCloth_profile build_LowLevelDynamics_profile build_LowLevelParticles_profile build_PhysXCommon_profile build_PxFoundation_profile build_PxPvdSDK_profile build_PxTask_profile build_SceneQuery_profile build_SimulationController_profile 
+$(PhysX_profile_bin): $(PhysXCommon_profile_obj) $(LowLevel_profile_obj) $(LowLevelAABB_profile_obj) $(LowLevelDynamics_profile_obj) $(LowLevelCloth_profile_obj) $(LowLevelParticles_profile_obj) $(SceneQuery_profile_obj) $(SimulationController_profile_obj) $(PxTask_profile_obj) $(PhysX_profile_obj) build_PxPvdSDK_profile build_PxFoundation_profile build_PhysXCommon_profile build_LowLevel_profile build_LowLevelAABB_profile build_LowLevelDynamics_profile build_LowLevelCloth_profile build_LowLevelParticles_profile build_SceneQuery_profile build_SimulationController_profile build_PxTask_profile 
 	mkdir -p `dirname ./../../../Lib/android16/libPhysX3PROFILE.a`
-	@$(AR) rcs $(PhysX_profile_bin) $(LowLevel_profile_obj) $(LowLevelAABB_profile_obj) $(LowLevelCloth_profile_obj) $(LowLevelDynamics_profile_obj) $(LowLevelParticles_profile_obj) $(PhysXCommon_profile_obj) $(PxTask_profile_obj) $(SceneQuery_profile_obj) $(SimulationController_profile_obj) $(PhysX_profile_obj)
+	@$(AR) rcs $(PhysX_profile_bin) $(PhysXCommon_profile_obj) $(LowLevel_profile_obj) $(LowLevelAABB_profile_obj) $(LowLevelDynamics_profile_obj) $(LowLevelCloth_profile_obj) $(LowLevelParticles_profile_obj) $(SceneQuery_profile_obj) $(SimulationController_profile_obj) $(PxTask_profile_obj) $(PhysX_profile_obj)
 	$(ECHO) building $@ complete!
 
 PhysX_profile_DEPDIR = $(dir $(@))/$(*F)
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCharacterKinematic.mk b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCharacterKinematic.mk
index e8cc8907..a7eefc3e 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCharacterKinematic.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCharacterKinematic.mk
@@ -74,9 +74,9 @@ PhysXCharacterKinematic_debug_defines   += PX_CHECKED=1
 PhysXCharacterKinematic_debug_defines   += PX_SUPPORT_PVD=1
 PhysXCharacterKinematic_debug_defines   += PX_NVTX=1
 PhysXCharacterKinematic_debug_libraries := 
-PhysXCharacterKinematic_debug_libraries += PhysX3CommonDEBUG
 PhysXCharacterKinematic_debug_libraries += PhysX3ExtensionsDEBUG
 PhysXCharacterKinematic_debug_libraries += PxFoundationDEBUG
+PhysXCharacterKinematic_debug_libraries += PhysX3CommonDEBUG
 PhysXCharacterKinematic_debug_common_cflags	:= $(PhysXCharacterKinematic_custom_cflags)
 PhysXCharacterKinematic_debug_common_cflags    += -MMD
 PhysXCharacterKinematic_debug_common_cflags    += $(addprefix -D, $(PhysXCharacterKinematic_debug_defines))
@@ -116,7 +116,7 @@ postbuild_PhysXCharacterKinematic_debug: mainbuild_PhysXCharacterKinematic_debug
 mainbuild_PhysXCharacterKinematic_debug: prebuild_PhysXCharacterKinematic_debug $(PhysXCharacterKinematic_debug_bin)
 prebuild_PhysXCharacterKinematic_debug:
 
-$(PhysXCharacterKinematic_debug_bin): $(PhysXCharacterKinematic_debug_obj) build_PhysXCommon_debug build_PhysXExtensions_debug build_PxFoundation_debug 
+$(PhysXCharacterKinematic_debug_bin): $(PhysXCharacterKinematic_debug_obj) build_PhysXExtensions_debug build_PxFoundation_debug build_PhysXCommon_debug 
 	mkdir -p `dirname ./../../../Lib/android16/libPhysX3CharacterKinematicDEBUG.a`
 	@$(AR) rcs $(PhysXCharacterKinematic_debug_bin) $(PhysXCharacterKinematic_debug_obj)
 	$(ECHO) building $@ complete!
@@ -193,9 +193,9 @@ PhysXCharacterKinematic_checked_defines   += PX_CHECKED=1
 PhysXCharacterKinematic_checked_defines   += PX_SUPPORT_PVD=1
 PhysXCharacterKinematic_checked_defines   += PX_NVTX=1
 PhysXCharacterKinematic_checked_libraries := 
-PhysXCharacterKinematic_checked_libraries += PhysX3CommonCHECKED
 PhysXCharacterKinematic_checked_libraries += PhysX3ExtensionsCHECKED
 PhysXCharacterKinematic_checked_libraries += PxFoundationCHECKED
+PhysXCharacterKinematic_checked_libraries += PhysX3CommonCHECKED
 PhysXCharacterKinematic_checked_common_cflags	:= $(PhysXCharacterKinematic_custom_cflags)
 PhysXCharacterKinematic_checked_common_cflags    += -MMD
 PhysXCharacterKinematic_checked_common_cflags    += $(addprefix -D, $(PhysXCharacterKinematic_checked_defines))
@@ -237,7 +237,7 @@ postbuild_PhysXCharacterKinematic_checked: mainbuild_PhysXCharacterKinematic_che
 mainbuild_PhysXCharacterKinematic_checked: prebuild_PhysXCharacterKinematic_checked $(PhysXCharacterKinematic_checked_bin)
 prebuild_PhysXCharacterKinematic_checked:
 
-$(PhysXCharacterKinematic_checked_bin): $(PhysXCharacterKinematic_checked_obj) build_PhysXCommon_checked build_PhysXExtensions_checked build_PxFoundation_checked 
+$(PhysXCharacterKinematic_checked_bin): $(PhysXCharacterKinematic_checked_obj) build_PhysXExtensions_checked build_PxFoundation_checked build_PhysXCommon_checked 
 	mkdir -p `dirname ./../../../Lib/android16/libPhysX3CharacterKinematicCHECKED.a`
 	@$(AR) rcs $(PhysXCharacterKinematic_checked_bin) $(PhysXCharacterKinematic_checked_obj)
 	$(ECHO) building $@ complete!
@@ -314,9 +314,9 @@ PhysXCharacterKinematic_profile_defines   += PX_PROFILE=1
 PhysXCharacterKinematic_profile_defines   += PX_SUPPORT_PVD=1
 PhysXCharacterKinematic_profile_defines   += PX_NVTX=1
 PhysXCharacterKinematic_profile_libraries := 
-PhysXCharacterKinematic_profile_libraries += PhysX3CommonPROFILE
 PhysXCharacterKinematic_profile_libraries += PhysX3ExtensionsPROFILE
 PhysXCharacterKinematic_profile_libraries += PxFoundationPROFILE
+PhysXCharacterKinematic_profile_libraries += PhysX3CommonPROFILE
 PhysXCharacterKinematic_profile_common_cflags	:= $(PhysXCharacterKinematic_custom_cflags)
 PhysXCharacterKinematic_profile_common_cflags    += -MMD
 PhysXCharacterKinematic_profile_common_cflags    += $(addprefix -D, $(PhysXCharacterKinematic_profile_defines))
@@ -358,7 +358,7 @@ postbuild_PhysXCharacterKinematic_profile: mainbuild_PhysXCharacterKinematic_pro
 mainbuild_PhysXCharacterKinematic_profile: prebuild_PhysXCharacterKinematic_profile $(PhysXCharacterKinematic_profile_bin)
 prebuild_PhysXCharacterKinematic_profile:
 
-$(PhysXCharacterKinematic_profile_bin): $(PhysXCharacterKinematic_profile_obj) build_PhysXCommon_profile build_PhysXExtensions_profile build_PxFoundation_profile 
+$(PhysXCharacterKinematic_profile_bin): $(PhysXCharacterKinematic_profile_obj) build_PhysXExtensions_profile build_PxFoundation_profile build_PhysXCommon_profile 
 	mkdir -p `dirname ./../../../Lib/android16/libPhysX3CharacterKinematicPROFILE.a`
 	@$(AR) rcs $(PhysXCharacterKinematic_profile_bin) $(PhysXCharacterKinematic_profile_obj)
 	$(ECHO) building $@ complete!
@@ -433,9 +433,9 @@ PhysXCharacterKinematic_release_defines   += PX_PHYSX_STATIC_LIB
 PhysXCharacterKinematic_release_defines   += NDEBUG
 PhysXCharacterKinematic_release_defines   += PX_SUPPORT_PVD=0
 PhysXCharacterKinematic_release_libraries := 
-PhysXCharacterKinematic_release_libraries += PhysX3Common
 PhysXCharacterKinematic_release_libraries += PhysX3Extensions
 PhysXCharacterKinematic_release_libraries += PxFoundation
+PhysXCharacterKinematic_release_libraries += PhysX3Common
 PhysXCharacterKinematic_release_common_cflags	:= $(PhysXCharacterKinematic_custom_cflags)
 PhysXCharacterKinematic_release_common_cflags    += -MMD
 PhysXCharacterKinematic_release_common_cflags    += $(addprefix -D, $(PhysXCharacterKinematic_release_defines))
@@ -477,7 +477,7 @@ postbuild_PhysXCharacterKinematic_release: mainbuild_PhysXCharacterKinematic_rel
 mainbuild_PhysXCharacterKinematic_release: prebuild_PhysXCharacterKinematic_release $(PhysXCharacterKinematic_release_bin)
 prebuild_PhysXCharacterKinematic_release:
 
-$(PhysXCharacterKinematic_release_bin): $(PhysXCharacterKinematic_release_obj) build_PhysXCommon_release build_PhysXExtensions_release build_PxFoundation_release 
+$(PhysXCharacterKinematic_release_bin): $(PhysXCharacterKinematic_release_obj) build_PhysXExtensions_release build_PxFoundation_release build_PhysXCommon_release 
 	mkdir -p `dirname ./../../../Lib/android16/libPhysX3CharacterKinematic.a`
 	@$(AR) rcs $(PhysXCharacterKinematic_release_bin) $(PhysXCharacterKinematic_release_obj)
 	$(ECHO) building $@ complete!
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCooking.mk b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCooking.mk
index de81dc7d..5a394a24 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCooking.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCooking.mk
@@ -75,8 +75,8 @@ PhysXCooking_release_hpaths    += ./../../PhysXCooking/src/convex
 PhysXCooking_release_hpaths    += ./../../PhysXExtensions/src
 PhysXCooking_release_hpaths    += ./../../PhysXGpu/include
 PhysXCooking_release_lpaths    := 
-PhysXCooking_release_lpaths    += ./../../../Lib/android16
 PhysXCooking_release_lpaths    += ./../../../../PxShared/lib/android16
+PhysXCooking_release_lpaths    += ./../../../Lib/android16
 PhysXCooking_release_defines   := $(PhysXCooking_custom_defines)
 PhysXCooking_release_defines   += ANDROID
 PhysXCooking_release_defines   += GLES2
@@ -90,9 +90,9 @@ PhysXCooking_release_defines   += PX_COOKING
 PhysXCooking_release_defines   += NDEBUG
 PhysXCooking_release_defines   += PX_SUPPORT_PVD=0
 PhysXCooking_release_libraries := 
+PhysXCooking_release_libraries += PxFoundation
 PhysXCooking_release_libraries += PhysX3Common
 PhysXCooking_release_libraries += PhysX3Extensions
-PhysXCooking_release_libraries += PxFoundation
 PhysXCooking_release_common_cflags	:= $(PhysXCooking_custom_cflags)
 PhysXCooking_release_common_cflags    += -MMD
 PhysXCooking_release_common_cflags    += $(addprefix -D, $(PhysXCooking_release_defines))
@@ -134,7 +134,7 @@ postbuild_PhysXCooking_release: mainbuild_PhysXCooking_release
 mainbuild_PhysXCooking_release: prebuild_PhysXCooking_release $(PhysXCooking_release_bin)
 prebuild_PhysXCooking_release:
 
-$(PhysXCooking_release_bin): $(PhysXCooking_release_obj) build_PhysXCommon_release build_PhysXExtensions_release build_PxFoundation_release 
+$(PhysXCooking_release_bin): $(PhysXCooking_release_obj) build_PxFoundation_release build_PhysXCommon_release build_PhysXExtensions_release 
 	mkdir -p `dirname ./../../../Lib/android16/libPhysX3Cooking.a`
 	@$(AR) rcs $(PhysXCooking_release_bin) $(PhysXCooking_release_obj)
 	$(ECHO) building $@ complete!
@@ -204,8 +204,8 @@ PhysXCooking_debug_hpaths    += ./../../PhysXCooking/src/convex
 PhysXCooking_debug_hpaths    += ./../../PhysXExtensions/src
 PhysXCooking_debug_hpaths    += ./../../PhysXGpu/include
 PhysXCooking_debug_lpaths    := 
-PhysXCooking_debug_lpaths    += ./../../../Lib/android16
 PhysXCooking_debug_lpaths    += ./../../../../PxShared/lib/android16
+PhysXCooking_debug_lpaths    += ./../../../Lib/android16
 PhysXCooking_debug_defines   := $(PhysXCooking_custom_defines)
 PhysXCooking_debug_defines   += ANDROID
 PhysXCooking_debug_defines   += GLES2
@@ -222,9 +222,9 @@ PhysXCooking_debug_defines   += PX_CHECKED=1
 PhysXCooking_debug_defines   += PX_SUPPORT_PVD=1
 PhysXCooking_debug_defines   += PX_NVTX=1
 PhysXCooking_debug_libraries := 
+PhysXCooking_debug_libraries += PxFoundationDEBUG
 PhysXCooking_debug_libraries += PhysX3CommonDEBUG
 PhysXCooking_debug_libraries += PhysX3ExtensionsDEBUG
-PhysXCooking_debug_libraries += PxFoundationDEBUG
 PhysXCooking_debug_common_cflags	:= $(PhysXCooking_custom_cflags)
 PhysXCooking_debug_common_cflags    += -MMD
 PhysXCooking_debug_common_cflags    += $(addprefix -D, $(PhysXCooking_debug_defines))
@@ -264,7 +264,7 @@ postbuild_PhysXCooking_debug: mainbuild_PhysXCooking_debug
 mainbuild_PhysXCooking_debug: prebuild_PhysXCooking_debug $(PhysXCooking_debug_bin)
 prebuild_PhysXCooking_debug:
 
-$(PhysXCooking_debug_bin): $(PhysXCooking_debug_obj) build_PhysXCommon_debug build_PhysXExtensions_debug build_PxFoundation_debug 
+$(PhysXCooking_debug_bin): $(PhysXCooking_debug_obj) build_PxFoundation_debug build_PhysXCommon_debug build_PhysXExtensions_debug 
 	mkdir -p `dirname ./../../../Lib/android16/libPhysX3CookingDEBUG.a`
 	@$(AR) rcs $(PhysXCooking_debug_bin) $(PhysXCooking_debug_obj)
 	$(ECHO) building $@ complete!
@@ -334,8 +334,8 @@ PhysXCooking_checked_hpaths    += ./../../PhysXCooking/src/convex
 PhysXCooking_checked_hpaths    += ./../../PhysXExtensions/src
 PhysXCooking_checked_hpaths    += ./../../PhysXGpu/include
 PhysXCooking_checked_lpaths    := 
-PhysXCooking_checked_lpaths    += ./../../../Lib/android16
 PhysXCooking_checked_lpaths    += ./../../../../PxShared/lib/android16
+PhysXCooking_checked_lpaths    += ./../../../Lib/android16
 PhysXCooking_checked_defines   := $(PhysXCooking_custom_defines)
 PhysXCooking_checked_defines   += ANDROID
 PhysXCooking_checked_defines   += GLES2
@@ -351,9 +351,9 @@ PhysXCooking_checked_defines   += PX_CHECKED=1
 PhysXCooking_checked_defines   += PX_SUPPORT_PVD=1
 PhysXCooking_checked_defines   += PX_NVTX=1
 PhysXCooking_checked_libraries := 
+PhysXCooking_checked_libraries += PxFoundationCHECKED
 PhysXCooking_checked_libraries += PhysX3CommonCHECKED
 PhysXCooking_checked_libraries += PhysX3ExtensionsCHECKED
-PhysXCooking_checked_libraries += PxFoundationCHECKED
 PhysXCooking_checked_common_cflags	:= $(PhysXCooking_custom_cflags)
 PhysXCooking_checked_common_cflags    += -MMD
 PhysXCooking_checked_common_cflags    += $(addprefix -D, $(PhysXCooking_checked_defines))
@@ -395,7 +395,7 @@ postbuild_PhysXCooking_checked: mainbuild_PhysXCooking_checked
 mainbuild_PhysXCooking_checked: prebuild_PhysXCooking_checked $(PhysXCooking_checked_bin)
 prebuild_PhysXCooking_checked:
 
-$(PhysXCooking_checked_bin): $(PhysXCooking_checked_obj) build_PhysXCommon_checked build_PhysXExtensions_checked build_PxFoundation_checked 
+$(PhysXCooking_checked_bin): $(PhysXCooking_checked_obj) build_PxFoundation_checked build_PhysXCommon_checked build_PhysXExtensions_checked 
 	mkdir -p `dirname ./../../../Lib/android16/libPhysX3CookingCHECKED.a`
 	@$(AR) rcs $(PhysXCooking_checked_bin) $(PhysXCooking_checked_obj)
 	$(ECHO) building $@ complete!
@@ -465,8 +465,8 @@ PhysXCooking_profile_hpaths    += ./../../PhysXCooking/src/convex
 PhysXCooking_profile_hpaths    += ./../../PhysXExtensions/src
 PhysXCooking_profile_hpaths    += ./../../PhysXGpu/include
 PhysXCooking_profile_lpaths    := 
-PhysXCooking_profile_lpaths    += ./../../../Lib/android16
 PhysXCooking_profile_lpaths    += ./../../../../PxShared/lib/android16
+PhysXCooking_profile_lpaths    += ./../../../Lib/android16
 PhysXCooking_profile_defines   := $(PhysXCooking_custom_defines)
 PhysXCooking_profile_defines   += ANDROID
 PhysXCooking_profile_defines   += GLES2
@@ -482,9 +482,9 @@ PhysXCooking_profile_defines   += PX_PROFILE=1
 PhysXCooking_profile_defines   += PX_SUPPORT_PVD=1
 PhysXCooking_profile_defines   += PX_NVTX=1
 PhysXCooking_profile_libraries := 
+PhysXCooking_profile_libraries += PxFoundationPROFILE
 PhysXCooking_profile_libraries += PhysX3CommonPROFILE
 PhysXCooking_profile_libraries += PhysX3ExtensionsPROFILE
-PhysXCooking_profile_libraries += PxFoundationPROFILE
 PhysXCooking_profile_common_cflags	:= $(PhysXCooking_custom_cflags)
 PhysXCooking_profile_common_cflags    += -MMD
 PhysXCooking_profile_common_cflags    += $(addprefix -D, $(PhysXCooking_profile_defines))
@@ -526,7 +526,7 @@ postbuild_PhysXCooking_profile: mainbuild_PhysXCooking_profile
 mainbuild_PhysXCooking_profile: prebuild_PhysXCooking_profile $(PhysXCooking_profile_bin)
 prebuild_PhysXCooking_profile:
 
-$(PhysXCooking_profile_bin): $(PhysXCooking_profile_obj) build_PhysXCommon_profile build_PhysXExtensions_profile build_PxFoundation_profile 
+$(PhysXCooking_profile_bin): $(PhysXCooking_profile_obj) build_PxFoundation_profile build_PhysXCommon_profile build_PhysXExtensions_profile 
 	mkdir -p `dirname ./../../../Lib/android16/libPhysX3CookingPROFILE.a`
 	@$(AR) rcs $(PhysXCooking_profile_bin) $(PhysXCooking_profile_obj)
 	$(ECHO) building $@ complete!
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXExtensions.mk b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXExtensions.mk
index 0d10fb85..c36757b7 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXExtensions.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXExtensions.mk
@@ -116,7 +116,7 @@ PhysXExtensions_debug_hpaths    += ./../../PhysX/src
 PhysXExtensions_debug_lpaths    := 
 PhysXExtensions_debug_lpaths    += ./../../../../PxShared/lib/android16
 PhysXExtensions_debug_defines   := $(PhysXExtensions_custom_defines)
-PhysXExtensions_debug_defines   += PX_BUILD_NUMBER=22121302
+PhysXExtensions_debug_defines   += PX_BUILD_NUMBER=22845541
 PhysXExtensions_debug_defines   += ANDROID
 PhysXExtensions_debug_defines   += GLES2
 PhysXExtensions_debug_defines   += __STDC_LIMIT_MACROS
@@ -247,7 +247,7 @@ PhysXExtensions_checked_hpaths    += ./../../PhysX/src
 PhysXExtensions_checked_lpaths    := 
 PhysXExtensions_checked_lpaths    += ./../../../../PxShared/lib/android16
 PhysXExtensions_checked_defines   := $(PhysXExtensions_custom_defines)
-PhysXExtensions_checked_defines   += PX_BUILD_NUMBER=22121302
+PhysXExtensions_checked_defines   += PX_BUILD_NUMBER=22845541
 PhysXExtensions_checked_defines   += ANDROID
 PhysXExtensions_checked_defines   += GLES2
 PhysXExtensions_checked_defines   += __STDC_LIMIT_MACROS
@@ -379,7 +379,7 @@ PhysXExtensions_profile_hpaths    += ./../../PhysX/src
 PhysXExtensions_profile_lpaths    := 
 PhysXExtensions_profile_lpaths    += ./../../../../PxShared/lib/android16
 PhysXExtensions_profile_defines   := $(PhysXExtensions_custom_defines)
-PhysXExtensions_profile_defines   += PX_BUILD_NUMBER=22121302
+PhysXExtensions_profile_defines   += PX_BUILD_NUMBER=22845541
 PhysXExtensions_profile_defines   += ANDROID
 PhysXExtensions_profile_defines   += GLES2
 PhysXExtensions_profile_defines   += __STDC_LIMIT_MACROS
@@ -511,7 +511,7 @@ PhysXExtensions_release_hpaths    += ./../../PhysX/src
 PhysXExtensions_release_lpaths    := 
 PhysXExtensions_release_lpaths    += ./../../../../PxShared/lib/android16
 PhysXExtensions_release_defines   := $(PhysXExtensions_custom_defines)
-PhysXExtensions_release_defines   += PX_BUILD_NUMBER=22121302
+PhysXExtensions_release_defines   += PX_BUILD_NUMBER=22845541
 PhysXExtensions_release_defines   += ANDROID
 PhysXExtensions_release_defines   += GLES2
 PhysXExtensions_release_defines   += __STDC_LIMIT_MACROS