PhysX 3.4 / APEX 1.4 release candidate @21506124

18 files changed, 23 insertions, 24 deletions

diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile b/PhysX_3.4/Source/compiler/linux64/Makefile
index 51154ddf..455b917b 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile
@@ -1,5 +1,5 @@
 #!/usr/bin/make
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 
 DEPSDIR = .deps
 #default defines
@@ -14,7 +14,7 @@ AR		 = ar
 STRIP     = strip
 OBJDUMP   = objdump
 OBJCOPY   = objcopy
--include Makedefs.linux64.mk
+-include Makedefs.LINUX64.mk
 
 all: checked debug profile release 
 
diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevel.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevel.mk
index 068397ab..7db76889 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevel.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevel.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -include Makefile.custom
 ProjectName = LowLevel
 LowLevel_cppfiles   += ./../../LowLevel/API/src/px_globals.cpp
diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelAABB.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelAABB.mk
index d1c1f3e6..384e877f 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelAABB.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelAABB.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -include Makefile.custom
 ProjectName = LowLevelAABB
 LowLevelAABB_cppfiles   += ./../../LowLevelAABB/src/BpBroadPhase.cpp
diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelCloth.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelCloth.mk
index 322d7982..5d5a6761 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelCloth.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelCloth.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -include Makefile.custom
 ProjectName = LowLevelCloth
 LowLevelCloth_cppfiles   += ./../../LowLevelCloth/src/Allocator.cpp
diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelDynamics.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelDynamics.mk
index de1fa776..3a21e174 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelDynamics.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelDynamics.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -include Makefile.custom
 ProjectName = LowLevelDynamics
 LowLevelDynamics_cppfiles   += ./../../LowLevelDynamics/src/DyArticulation.cpp
diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelParticles.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelParticles.mk
index 63911197..6b2f71d9 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelParticles.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.LowLevelParticles.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -include Makefile.custom
 ProjectName = LowLevelParticles
 LowLevelParticles_cppfiles   += ./../../LowLevelParticles/src/PtBatcher.cpp
diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile.PhysX.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.PhysX.mk
index eb212f45..270f6c0c 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.PhysX.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.PhysX.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -include Makefile.custom
 ProjectName = PhysX
 PhysX_cppfiles   += ./../../PhysX/src/gpu/NpPhysicsGpu.cpp
diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXCharacterKinematic.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXCharacterKinematic.mk
index 4d27e31b..683fc9bf 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXCharacterKinematic.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXCharacterKinematic.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -include Makefile.custom
 ProjectName = PhysXCharacterKinematic
 PhysXCharacterKinematic_cppfiles   += ./../../PhysXCharacterKinematic/src/CctBoxController.cpp
diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXCommon.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXCommon.mk
index b162a335..863131bf 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXCommon.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXCommon.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -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/linux64/Makefile.PhysXCooking.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXCooking.mk
index a6846abd..12c62cb7 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXCooking.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXCooking.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -include Makefile.custom
 ProjectName = PhysXCooking
 PhysXCooking_cppfiles   += ./../../PhysXCooking/src/Adjacencies.cpp
diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXExtensions.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXExtensions.mk
index 409e6051..b7278007 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXExtensions.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXExtensions.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -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/linux64
 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/linux64
 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/linux64
 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/linux64
 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/linux64/Makefile.PhysXVehicle.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXVehicle.mk
index 15845baf..cb7c559e 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXVehicle.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.PhysXVehicle.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -include Makefile.custom
 ProjectName = PhysXVehicle
 PhysXVehicle_cppfiles   += ./../../PhysXVehicle/src/PxVehicleComponents.cpp
diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile.PsFastXml.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.PsFastXml.mk
index 7169b18d..013093a4 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.PsFastXml.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.PsFastXml.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -include Makefile.custom
 ProjectName = PsFastXml
 PsFastXml_cppfiles   += ./../../../../PxShared/src/fastxml/src/PsFastXml.cpp
diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile.PxFoundation.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.PxFoundation.mk
index 5be23da2..ff472d36 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.PxFoundation.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.PxFoundation.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -include Makefile.custom
 ProjectName = PxFoundation
 PxFoundation_cppfiles   += ./../../../../PxShared/src/foundation/src/PsAllocator.cpp
diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile.PxPvdSDK.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.PxPvdSDK.mk
index b622a7b3..902e9a7c 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.PxPvdSDK.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.PxPvdSDK.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -include Makefile.custom
 ProjectName = PxPvdSDK
 PxPvdSDK_cppfiles   += ./../../../../PxShared/src/pvd/src/PxProfileEventImpl.cpp
diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile.PxTask.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.PxTask.mk
index 88605167..736aa61c 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.PxTask.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.PxTask.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -include Makefile.custom
 ProjectName = PxTask
 PxTask_cppfiles   += ./../../../../PxShared/src/task/src/TaskManager.cpp
diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile.SceneQuery.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.SceneQuery.mk
index 29cc9802..5b1a313b 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.SceneQuery.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.SceneQuery.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -include Makefile.custom
 ProjectName = SceneQuery
 SceneQuery_cppfiles   += ./../../SceneQuery/src/SqAABBPruner.cpp
diff --git a/PhysX_3.4/Source/compiler/linux64/Makefile.SimulationController.mk b/PhysX_3.4/Source/compiler/linux64/Makefile.SimulationController.mk
index f153ed70..9948ce56 100644
--- a/PhysX_3.4/Source/compiler/linux64/Makefile.SimulationController.mk
+++ b/PhysX_3.4/Source/compiler/linux64/Makefile.SimulationController.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for linux64
+# Makefile generated by XPJ for LINUX64
 -include Makefile.custom
 ProjectName = SimulationController
 SimulationController_cppfiles   += ./../../SimulationController/src/ScActorCore.cpp