PhysX 3.4 / APEX 1.4 release candidate @21506124

18 files changed, 23 insertions, 24 deletions

diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile b/PhysX_3.4/Source/compiler/make_osx64/Makefile
index 2af81fe3..82a30599 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile
@@ -1,5 +1,5 @@
 #!/usr/bin/make
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 
 DEPSDIR = .deps
 APPLE_DEV_ROOT := $(shell xcode-select -print-path)
@@ -28,7 +28,7 @@ else
   OBJDUMP   = 
   OBJCOPY   = 
 endif
--include Makedefs.osx64.mk
+-include Makedefs.OSX64.mk
 
 all: checked debug profile release 
 
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevel.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevel.mk
index 22e7600a..57746ee9 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevel.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevel.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = LowLevel
 LowLevel_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelAABB.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelAABB.mk
index cf896848..5b88a1e8 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelAABB.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelAABB.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = LowLevelAABB
 LowLevelAABB_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelCloth.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelCloth.mk
index 93532ae0..593232bc 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelCloth.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelCloth.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = LowLevelCloth
 LowLevelCloth_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelDynamics.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelDynamics.mk
index 772c6d05..d6d98234 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelDynamics.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelDynamics.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = LowLevelDynamics
 LowLevelDynamics_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelParticles.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelParticles.mk
index 7f17ce39..37394c97 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelParticles.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.LowLevelParticles.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = LowLevelParticles
 LowLevelParticles_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysX.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysX.mk
index 9e548d9e..1b49fed1 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysX.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysX.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = PhysX
 PhysX_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCharacterKinematic.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCharacterKinematic.mk
index f339ec30..2350913d 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCharacterKinematic.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCharacterKinematic.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = PhysXCharacterKinematic
 PhysXCharacterKinematic_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCommon.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCommon.mk
index c2f5e03f..529e26c6 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCommon.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCommon.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = PhysXCommon
 PhysXCommon_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
@@ -15,7 +15,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/make_osx64/Makefile.PhysXCooking.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCooking.mk
index 185715e4..5aacd169 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCooking.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXCooking.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = PhysXCooking
 PhysXCooking_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXExtensions.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXExtensions.mk
index e893b5bd..b7d1caf0 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXExtensions.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXExtensions.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = PhysXExtensions
 PhysXExtensions_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
@@ -116,7 +116,7 @@ PhysXExtensions_debug_hpaths    += ./../../PhysX/src
 PhysXExtensions_debug_lpaths    := 
 PhysXExtensions_debug_lpaths    += ./../../../../PxShared/lib/osx64
 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
@@ -238,7 +238,7 @@ PhysXExtensions_checked_hpaths    += ./../../PhysX/src
 PhysXExtensions_checked_lpaths    := 
 PhysXExtensions_checked_lpaths    += ./../../../../PxShared/lib/osx64
 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
@@ -359,7 +359,7 @@ PhysXExtensions_profile_hpaths    += ./../../PhysX/src
 PhysXExtensions_profile_lpaths    := 
 PhysXExtensions_profile_lpaths    += ./../../../../PxShared/lib/osx64
 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
@@ -480,7 +480,7 @@ PhysXExtensions_release_hpaths    += ./../../PhysX/src
 PhysXExtensions_release_lpaths    := 
 PhysXExtensions_release_lpaths    += ./../../../../PxShared/lib/osx64
 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/make_osx64/Makefile.PhysXVehicle.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXVehicle.mk
index 9d4f30ce..e245de19 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXVehicle.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PhysXVehicle.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = PhysXVehicle
 PhysXVehicle_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PsFastXml.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PsFastXml.mk
index cea590eb..3a61b078 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PsFastXml.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PsFastXml.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = PsFastXml
 PsFastXml_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxFoundation.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxFoundation.mk
index a010b06f..1c3cf6f9 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxFoundation.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxFoundation.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = PxFoundation
 PxFoundation_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxPvdSDK.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxPvdSDK.mk
index 4081acfa..e403d684 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxPvdSDK.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxPvdSDK.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = PxPvdSDK
 PxPvdSDK_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxTask.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxTask.mk
index a0ecf54e..34c5a2dd 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxTask.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.PxTask.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = PxTask
 PxTask_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.SceneQuery.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.SceneQuery.mk
index a3d92acf..ec9a2135 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.SceneQuery.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.SceneQuery.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = SceneQuery
 SceneQuery_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)
diff --git a/PhysX_3.4/Source/compiler/make_osx64/Makefile.SimulationController.mk b/PhysX_3.4/Source/compiler/make_osx64/Makefile.SimulationController.mk
index b4e9972d..4b58ba4d 100644
--- a/PhysX_3.4/Source/compiler/make_osx64/Makefile.SimulationController.mk
+++ b/PhysX_3.4/Source/compiler/make_osx64/Makefile.SimulationController.mk
@@ -1,4 +1,4 @@
-# Makefile generated by XPJ for osx64
+# Makefile generated by XPJ for OSX64
 -include Makefile.custom
 ProjectName = SimulationController
 SimulationController_custom_cflags := -isysroot $(APPLE_OSX_SDK_CURRENT_VERSION)