PhysX 3.4 / APEX 1.4 release candidate @21506124

18 files changed, 23 insertions, 24 deletions

diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile b/PhysX_3.4/Source/compiler/linux32/Makefile
index 933bf0da..2a316031 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile
@@ -1,5 +1,5 @@
 #!/usr/bin/make
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 
 DEPSDIR = .deps
 #default defines
@@ -14,7 +14,7 @@ AR		 = ar
 STRIP     = strip
 OBJDUMP   = objdump
 OBJCOPY   = objcopy
--include Makedefs.linux32.mk
+-include Makedefs.LINUX32.mk
 
 all: checked debug profile release 
 
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevel.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevel.mk
index 6a67b9d4..89f0cdfd 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevel.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevel.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = LowLevel
 LowLevel_cppfiles   += ./../../LowLevel/API/src/px_globals.cpp
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelAABB.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelAABB.mk
index 3106a999..b3441629 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelAABB.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelAABB.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = LowLevelAABB
 LowLevelAABB_cppfiles   += ./../../LowLevelAABB/src/BpBroadPhase.cpp
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelCloth.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelCloth.mk
index 110bade7..53afc6a1 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelCloth.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelCloth.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = LowLevelCloth
 LowLevelCloth_cppfiles   += ./../../LowLevelCloth/src/Allocator.cpp
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelDynamics.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelDynamics.mk
index 823ce012..057be091 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelDynamics.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelDynamics.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = LowLevelDynamics
 LowLevelDynamics_cppfiles   += ./../../LowLevelDynamics/src/DyArticulation.cpp
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelParticles.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelParticles.mk
index dbde4fec..b80587c6 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelParticles.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.LowLevelParticles.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = LowLevelParticles
 LowLevelParticles_cppfiles   += ./../../LowLevelParticles/src/PtBatcher.cpp
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.PhysX.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.PhysX.mk
index e4340556..6c391bf6 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.PhysX.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.PhysX.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = PhysX
 PhysX_cppfiles   += ./../../PhysX/src/NpActor.cpp
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXCharacterKinematic.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXCharacterKinematic.mk
index 71ef4c9d..62912933 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXCharacterKinematic.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXCharacterKinematic.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = PhysXCharacterKinematic
 PhysXCharacterKinematic_cppfiles   += ./../../PhysXCharacterKinematic/src/CctBoxController.cpp
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXCommon.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXCommon.mk
index 0cbebd8b..d2be8c5e 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXCommon.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXCommon.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = PhysXCommon
 PhysXCommon_cppfiles   += ./../../Common/src/CmBoxPruning.cpp
@@ -13,7 +13,6 @@ PhysXCommon_cppfiles   += ./../../GeomUtils/src/GuBounds.cpp
 PhysXCommon_cppfiles   += ./../../GeomUtils/src/GuBox.cpp
 PhysXCommon_cppfiles   += ./../../GeomUtils/src/GuCCTSweepTests.cpp
 PhysXCommon_cppfiles   += ./../../GeomUtils/src/GuCapsule.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/linux32/Makefile.PhysXCooking.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXCooking.mk
index be3c5d6d..33fb0c1e 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXCooking.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXCooking.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = PhysXCooking
 PhysXCooking_cppfiles   += ./../../PhysXCooking/src/Adjacencies.cpp
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXExtensions.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXExtensions.mk
index 99d1b731..db528460 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXExtensions.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXExtensions.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = PhysXExtensions
 PhysXExtensions_cppfiles   += ./../../PhysXExtensions/src/ExtBroadPhase.cpp
@@ -114,7 +114,7 @@ PhysXExtensions_debug_hpaths    += ./../../PhysX/src
 PhysXExtensions_debug_lpaths    := 
 PhysXExtensions_debug_lpaths    += ./../../../../PxShared/lib/linux32
 PhysXExtensions_debug_defines   := $(PhysXExtensions_custom_defines)
-PhysXExtensions_debug_defines   += PX_BUILD_NUMBER=21294896
+PhysXExtensions_debug_defines   += PX_BUILD_NUMBER=0
 PhysXExtensions_debug_defines   += PX_PHYSX_STATIC_LIB
 PhysXExtensions_debug_defines   += _DEBUG
 PhysXExtensions_debug_defines   += PX_DEBUG=1
@@ -231,7 +231,7 @@ PhysXExtensions_checked_hpaths    += ./../../PhysX/src
 PhysXExtensions_checked_lpaths    := 
 PhysXExtensions_checked_lpaths    += ./../../../../PxShared/lib/linux32
 PhysXExtensions_checked_defines   := $(PhysXExtensions_custom_defines)
-PhysXExtensions_checked_defines   += PX_BUILD_NUMBER=21294896
+PhysXExtensions_checked_defines   += PX_BUILD_NUMBER=0
 PhysXExtensions_checked_defines   += PX_PHYSX_STATIC_LIB
 PhysXExtensions_checked_defines   += NDEBUG
 PhysXExtensions_checked_defines   += PX_CHECKED=1
@@ -347,7 +347,7 @@ PhysXExtensions_profile_hpaths    += ./../../PhysX/src
 PhysXExtensions_profile_lpaths    := 
 PhysXExtensions_profile_lpaths    += ./../../../../PxShared/lib/linux32
 PhysXExtensions_profile_defines   := $(PhysXExtensions_custom_defines)
-PhysXExtensions_profile_defines   += PX_BUILD_NUMBER=21294896
+PhysXExtensions_profile_defines   += PX_BUILD_NUMBER=0
 PhysXExtensions_profile_defines   += PX_PHYSX_STATIC_LIB
 PhysXExtensions_profile_defines   += NDEBUG
 PhysXExtensions_profile_defines   += PX_PROFILE=1
@@ -463,7 +463,7 @@ PhysXExtensions_release_hpaths    += ./../../PhysX/src
 PhysXExtensions_release_lpaths    := 
 PhysXExtensions_release_lpaths    += ./../../../../PxShared/lib/linux32
 PhysXExtensions_release_defines   := $(PhysXExtensions_custom_defines)
-PhysXExtensions_release_defines   += PX_BUILD_NUMBER=21294896
+PhysXExtensions_release_defines   += PX_BUILD_NUMBER=0
 PhysXExtensions_release_defines   += PX_PHYSX_STATIC_LIB
 PhysXExtensions_release_defines   += NDEBUG
 PhysXExtensions_release_defines   += PX_SUPPORT_PVD=0
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXVehicle.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXVehicle.mk
index 911739cf..c5f01f63 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXVehicle.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.PhysXVehicle.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = PhysXVehicle
 PhysXVehicle_cppfiles   += ./../../PhysXVehicle/src/PxVehicleComponents.cpp
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.PsFastXml.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.PsFastXml.mk
index 157a8dda..efaa3d3c 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.PsFastXml.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.PsFastXml.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = PsFastXml
 PsFastXml_cppfiles   += ./../../../../PxShared/src/fastxml/src/PsFastXml.cpp
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.PxFoundation.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.PxFoundation.mk
index e8aec5c4..055ec4ab 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.PxFoundation.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.PxFoundation.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = PxFoundation
 PxFoundation_cppfiles   += ./../../../../PxShared/src/foundation/src/PsAllocator.cpp
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.PxPvdSDK.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.PxPvdSDK.mk
index 74984e92..0601af2d 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.PxPvdSDK.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.PxPvdSDK.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = PxPvdSDK
 PxPvdSDK_cppfiles   += ./../../../../PxShared/src/pvd/src/PxProfileEventImpl.cpp
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.PxTask.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.PxTask.mk
index 08cf0a08..eee04bc4 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.PxTask.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.PxTask.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = PxTask
 PxTask_cppfiles   += ./../../../../PxShared/src/task/src/TaskManager.cpp
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.SceneQuery.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.SceneQuery.mk
index 73a8f70e..c4600ca2 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.SceneQuery.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.SceneQuery.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = SceneQuery
 SceneQuery_cppfiles   += ./../../SceneQuery/src/SqAABBPruner.cpp
diff --git a/PhysX_3.4/Source/compiler/linux32/Makefile.SimulationController.mk b/PhysX_3.4/Source/compiler/linux32/Makefile.SimulationController.mk
index 333e0e42..b190441b 100644
--- a/PhysX_3.4/Source/compiler/linux32/Makefile.SimulationController.mk
+++ b/PhysX_3.4/Source/compiler/linux32/Makefile.SimulationController.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux32
+# Makefile generated by XPJ for LINUX32
 -include Makefile.custom
 ProjectName = SimulationController
 SimulationController_cppfiles   += ./../../SimulationController/src/ScActorCore.cpp