PhysX 3.4 / APEX 1.4 release candidate @21506124

18 files changed, 24 insertions, 25 deletions

diff --git a/PhysX_3.4/Source/compiler/android16/Makefile b/PhysX_3.4/Source/compiler/android16/Makefile
index 45d24535..29a4f703 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile
+++ b/PhysX_3.4/Source/compiler/android16/Makefile
@@ -1,9 +1,9 @@
 #!/usr/bin/make
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 
 DEPSDIR = .deps
-NDKROOT = ./../../../../Externals/android-ndk-r9d
-NDK_BIN_DIR = ./../../../../Externals/android-ndk-r9d/toolchains/arm-linux-androideabi-4.8/prebuilt/windows/bin
+NDKROOT = ../../../../Externals/android-ndk-r9d
+NDK_BIN_DIR = ../../../../Externals/android-ndk-r9d/toolchains/arm-linux-androideabi-4.8/prebuilt/windows/bin
 NDK_PREFIX = arm-linux-androideabi-
 JAVA_HOME  = ./../../../../Externals/jdk
 ANT_TOOL = ./../../../../Externals/ant/apache-ant-1.8.2/bin/ant
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.LowLevel.mk b/PhysX_3.4/Source/compiler/android16/Makefile.LowLevel.mk
index 90a656fb..5dde485b 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.LowLevel.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.LowLevel.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = LowLevel
 LowLevel_cppfiles   += ./../../LowLevel/API/src/px_globals.cpp
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelAABB.mk b/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelAABB.mk
index fa759dcd..01679445 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelAABB.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelAABB.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = LowLevelAABB
 LowLevelAABB_cppfiles   += ./../../LowLevelAABB/src/BpBroadPhase.cpp
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelCloth.mk b/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelCloth.mk
index 26d0c5bf..48dce54c 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelCloth.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelCloth.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = LowLevelCloth
 LowLevelCloth_cppfiles   += ./../../LowLevelCloth/src/Allocator.cpp
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelDynamics.mk b/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelDynamics.mk
index 28da03d5..9b385874 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelDynamics.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelDynamics.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = LowLevelDynamics
 LowLevelDynamics_cppfiles   += ./../../LowLevelDynamics/src/DyArticulation.cpp
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelParticles.mk b/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelParticles.mk
index b10e84e6..a5dc422c 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelParticles.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.LowLevelParticles.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = LowLevelParticles
 LowLevelParticles_cppfiles   += ./../../LowLevelParticles/src/PtBatcher.cpp
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.PhysX.mk b/PhysX_3.4/Source/compiler/android16/Makefile.PhysX.mk
index ed7f987b..0de75336 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.PhysX.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.PhysX.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = PhysX
 PhysX_cppfiles   += ./../../PhysX/src/NpActor.cpp
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCharacterKinematic.mk b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCharacterKinematic.mk
index 343a0fae..e8cc8907 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCharacterKinematic.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCharacterKinematic.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = PhysXCharacterKinematic
 PhysXCharacterKinematic_cppfiles   += ./../../PhysXCharacterKinematic/src/CctBoxController.cpp
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCommon.mk b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCommon.mk
index e84b4c50..54734e29 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCommon.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCommon.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = PhysXCommon
 PhysXCommon_cfiles   += ./../../../../Externals/android-ndk-r9d/sources/android/cpufeatures/cpu-features.c
@@ -14,7 +14,6 @@ PhysXCommon_cppfiles   += ./../../GeomUtils/src/GuBounds.cpp
 PhysXCommon_cppfiles   += ./../../GeomUtils/src/GuBox.cpp
 PhysXCommon_cppfiles   += ./../../GeomUtils/src/GuCapsule.cpp
 PhysXCommon_cppfiles   += ./../../GeomUtils/src/GuCCTSweepTests.cpp
-PhysXCommon_cppfiles   += ./../../GeomUtils/src/GuDebug.cpp
 PhysXCommon_cppfiles   += ./../../GeomUtils/src/GuGeometryQuery.cpp
 PhysXCommon_cppfiles   += ./../../GeomUtils/src/GuGeometryUnion.cpp
 PhysXCommon_cppfiles   += ./../../GeomUtils/src/GuInternal.cpp
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCooking.mk b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCooking.mk
index ff179b07..de81dc7d 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCooking.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXCooking.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = PhysXCooking
 PhysXCooking_cppfiles   += ./../../PhysXCooking/src/Adjacencies.cpp
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXExtensions.mk b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXExtensions.mk
index c14290c0..1fc067a9 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXExtensions.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXExtensions.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = PhysXExtensions
 PhysXExtensions_cppfiles   += ./../../PhysXExtensions/src/ExtBroadPhase.cpp
@@ -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=21294896
+PhysXExtensions_debug_defines   += PX_BUILD_NUMBER=0
 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=21294896
+PhysXExtensions_checked_defines   += PX_BUILD_NUMBER=0
 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=21294896
+PhysXExtensions_profile_defines   += PX_BUILD_NUMBER=0
 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=21294896
+PhysXExtensions_release_defines   += PX_BUILD_NUMBER=0
 PhysXExtensions_release_defines   += ANDROID
 PhysXExtensions_release_defines   += GLES2
 PhysXExtensions_release_defines   += __STDC_LIMIT_MACROS
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXVehicle.mk b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXVehicle.mk
index 9b6cc0e4..0f36a483 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.PhysXVehicle.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.PhysXVehicle.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = PhysXVehicle
 PhysXVehicle_cppfiles   += ./../../PhysXVehicle/src/PxVehicleComponents.cpp
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.PsFastXml.mk b/PhysX_3.4/Source/compiler/android16/Makefile.PsFastXml.mk
index 4c69e59f..7f3dae95 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.PsFastXml.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.PsFastXml.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = PsFastXml
 PsFastXml_cppfiles   += ./../../../../PxShared/src/fastxml/src/PsFastXml.cpp
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.PxFoundation.mk b/PhysX_3.4/Source/compiler/android16/Makefile.PxFoundation.mk
index 1d7b8c2d..da85c8ab 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.PxFoundation.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.PxFoundation.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = PxFoundation
 PxFoundation_cppfiles   += ./../../../../PxShared/src/foundation/src/PsAllocator.cpp
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.PxPvdSDK.mk b/PhysX_3.4/Source/compiler/android16/Makefile.PxPvdSDK.mk
index 23fcbb88..5cd7ef33 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.PxPvdSDK.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.PxPvdSDK.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = PxPvdSDK
 PxPvdSDK_cppfiles   += ./../../../../PxShared/src/pvd/src/PxProfileEventImpl.cpp
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.PxTask.mk b/PhysX_3.4/Source/compiler/android16/Makefile.PxTask.mk
index 92ce6b65..43029545 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.PxTask.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.PxTask.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = PxTask
 PxTask_cppfiles   += ./../../../../PxShared/src/task/src/TaskManager.cpp
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.SceneQuery.mk b/PhysX_3.4/Source/compiler/android16/Makefile.SceneQuery.mk
index 8aaeccb5..481d254c 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.SceneQuery.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.SceneQuery.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = SceneQuery
 SceneQuery_cppfiles   += ./../../SceneQuery/src/SqAABBPruner.cpp
diff --git a/PhysX_3.4/Source/compiler/android16/Makefile.SimulationController.mk b/PhysX_3.4/Source/compiler/android16/Makefile.SimulationController.mk
index 513954c9..06f3f938 100644
--- a/PhysX_3.4/Source/compiler/android16/Makefile.SimulationController.mk
+++ b/PhysX_3.4/Source/compiler/android16/Makefile.SimulationController.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for android16
+# Makefile generated by XPJ for ANDROID16
 -include Makefile.custom
 ProjectName = SimulationController
 SimulationController_cppfiles   += ./../../SimulationController/src/ScActorCore.cpp