Moving platform-specific defines from buildfiles to code.

makepanda/makepanda.py

@@ -413,7 +413,6 @@ if (COMPILER=="MSVC"):
             LibName(pkg, SDK[pkg] +  '/lib/paramblk2.lib')
     if (PkgSkip("PHYSX")==0):
         DefSymbol("PHYSX", SDK["PHYSXVERSION"], "1")
-        DefSymbol("PHYSX", "NX32", "1")
         LibName("PHYSX",      SDK["PHYSX"] + "/lib/Win32/PhysXLoader.lib")
         LibName("PHYSX",      SDK["PHYSX"] + "/lib/Win32/NxCharacter.lib")
         IncDirectory("PHYSX", SDK["PHYSX"] + "/Physics/include")
@@ -548,10 +547,6 @@ if (COMPILER=="LINUX"):
                 LibName(pkg, "-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
     if (PkgSkip("PHYSX")==0):
         DefSymbol("PHYSX", SDK["PHYSXVERSION"], "1")
-        DefSymbol("PHYSX", "LINUX", "1")
-        DefSymbol("PHYSX", "CORELIB", "1")
-        DefSymbol("PHYSX", "NX_DISABLE_FLUIDS", "1")
-        DefSymbol("PHYSX", "NX32", "1")
         IncDirectory("PHYSX", SDK["PHYSX"] + "/Physics/include")
         IncDirectory("PHYSX", SDK["PHYSX"] + "/PhysXLoader/include")
         IncDirectory("PHYSX", SDK["PHYSX"] + "/NxCharacter/include")

panda/metalibs/pandaphysx/Sources.pp

@@ -8,8 +8,6 @@
 #define BUILD_DIRECTORY $[HAVE_PHYSX]
 #define BUILDING_DLL BUILDING_PANDAPHYSX
 
-#define EXTRA_CDEFS NX32 $[if $[eq $[PLATFORM], Linux], LINUX CORELIB NX_DISABLE_FLUIDS]
-
 #define COMPONENT_LIBS physx
 #define LOCAL_LIBS linmath putil express
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \

panda/src/physx/NoMinMax.h

@@ -1,19 +0,0 @@
-// Filename: NoMinMax.h
-// Created by:  pratt (26Apr2006)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) Carnegie Mellon University.  All rights reserved.
-//
-// All use of this software is subject to the terms of the revised BSD
-// license.  You should have received a copy of this license along
-// with this source code in a file named "LICENSE."
-//
-////////////////////////////////////////////////////////////////////
-
-// This file exists explicitly for the purpose of undefining min and max
-// before NxPhysics.h is included in libphysx_igate.cxx
-
-#undef min
-#undef max

panda/src/physx/Sources.pp

@@ -4,8 +4,6 @@
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m prc:c
 
-#define EXTRA_CDEFS NX32 $[if $[eq $[PLATFORM], Linux], LINUX CORELIB NX_DISABLE_FLUIDS]
-
 #begin lib_target
   #define TARGET physx
   #define LOCAL_LIBS pgraph linmath grutil

panda/src/physx/physxActor.h

@@ -25,9 +25,7 @@
 #include "physxObject.h"
 #include "physxObjectCollection.h"
 #include "physxEnums.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxController;
 class PhysxScene;

panda/src/physx/physxActorDesc.h

@@ -19,8 +19,7 @@
 #include "lpoint3.h"
 #include "lmatrix.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxBodyDesc;
 class PhysxShapeDesc;

panda/src/physx/physxBodyDesc.h

@@ -20,9 +20,7 @@
 #include "lmatrix.h"
 
 #include "physxEnums.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxBodyDesc

panda/src/physx/physxBounds3.h

@@ -19,8 +19,7 @@
 #include "luse.h"
 
 #include "config_physx.h"
-
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxBounds3

panda/src/physx/physxBox.h

@@ -19,6 +19,7 @@
 #include "luse.h"
 
 #include "config_physx.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxBox

panda/src/physx/physxBoxController.h

@@ -19,8 +19,7 @@
 #include "lvector3.h"
 
 #include "physxController.h"
-
-#include "NxBoxController.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxBoxController

panda/src/physx/physxBoxControllerDesc.h

@@ -19,8 +19,7 @@
 #include "lvector3.h"
 
 #include "physxControllerDesc.h"
-
-#include "NxBoxController.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxBoxControllerDesc

panda/src/physx/physxBoxForceFieldShape.h

@@ -19,9 +19,7 @@
 #include "lvector3.h"
 
 #include "physxForceFieldShape.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxBoxForceFieldShapeDesc;
 

panda/src/physx/physxBoxForceFieldShapeDesc.h

@@ -19,9 +19,7 @@
 #include "lvector3.h"
 
 #include "physxForceFieldShapeDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxBoxForceFieldShapeDesc

panda/src/physx/physxBoxShape.h

@@ -19,9 +19,7 @@
 #include "lvector3.h"
 
 #include "physxShape.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxBoxShapeDesc;
 

panda/src/physx/physxBoxShapeDesc.h

@@ -19,9 +19,7 @@
 #include "lvector3.h"
 
 #include "physxShapeDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxBoxShapeDesc

panda/src/physx/physxCapsuleController.h

@@ -19,8 +19,7 @@
 #include "lvector3.h"
 
 #include "physxController.h"
-
-#include "NxCapsuleController.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxCapsuleController

panda/src/physx/physxCapsuleControllerDesc.h

@@ -18,8 +18,7 @@
 #include "pandabase.h"
 
 #include "physxControllerDesc.h"
-
-#include "NxCapsuleController.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxCapsuleControllerDesc

panda/src/physx/physxCapsuleForceFieldShape.h

@@ -19,9 +19,7 @@
 #include "lvector3.h"
 
 #include "physxForceFieldShape.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxCapsuleForceFieldShapeDesc;
 

panda/src/physx/physxCapsuleForceFieldShapeDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxForceFieldShapeDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxCapsuleForceFieldShapeDesc

panda/src/physx/physxCapsuleShape.h

@@ -19,9 +19,7 @@
 #include "lvector3.h"
 
 #include "physxShape.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxCapsuleShapeDesc;
 

panda/src/physx/physxCapsuleShapeDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxShapeDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxCapsuleShapeDesc

panda/src/physx/physxContactReport.h

@@ -17,9 +17,7 @@
 
 #include "pandabase.h"
 #include "pStatCollector.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxContactReport

panda/src/physx/physxController.h

@@ -23,8 +23,7 @@
 
 #include "physxObject.h"
 #include "physxEnums.h"
-
-#include "NxController.h"
+#include "physx_includes.h"
 
 class PhysxActor;
 

panda/src/physx/physxControllerDesc.h

@@ -18,7 +18,7 @@
 #include "pandabase.h"
 #include "lpoint3.h"
 
-#include "NxController.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxControllerDesc

panda/src/physx/physxControllerReport.h

@@ -18,7 +18,7 @@
 #include "pandabase.h"
 #include "pStatCollector.h"
 
-#include "NxController.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxControllerReport

panda/src/physx/physxConvexForceFieldShape.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxForceFieldShape.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxConvexForceFieldShapeDesc;
 

panda/src/physx/physxConvexForceFieldShapeDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxForceFieldShapeDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxConvexMesh;
 

panda/src/physx/physxConvexMesh.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxObject.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxConvexMesh

panda/src/physx/physxConvexMeshDesc.h

@@ -19,8 +19,7 @@
 #include "lpoint3.h"
 #include "nodePath.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxConvexMeshDesc

panda/src/physx/physxConvexShape.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxShape.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxConvexShapeDesc;
 

panda/src/physx/physxConvexShapeDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxShapeDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxConvexMesh;
 

panda/src/physx/physxCylindricalJoint.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJoint.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxCylindricalJointDesc;
 

panda/src/physx/physxCylindricalJointDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJointDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxCylindricalJointDesc

panda/src/physx/physxD6Joint.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJoint.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxD6JointDesc;
 

panda/src/physx/physxD6JointDesc.h

@@ -21,9 +21,7 @@
 #include "lquaternion.h"
 
 #include "physxJointDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxJointDriveDesc;
 class PhysxJointLimitSoftDesc;

panda/src/physx/physxDebugGeomNode.h

@@ -21,8 +21,7 @@
 #include "transformState.h"
 #include "lineSegs.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxScene;
 

panda/src/physx/physxDistanceJoint.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJoint.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxDistanceJointDesc;
 

panda/src/physx/physxDistanceJointDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJointDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxSpringDesc;
 

panda/src/physx/physxEnums.h

@@ -17,8 +17,7 @@
 
 #include "pandabase.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 #ifdef CPPPARSER
 

panda/src/physx/physxFileStream.h

@@ -17,8 +17,7 @@
 
 #include "pandabase.h"
 
-#include "NoMinMax.h"
-#include "NxStream.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxFileStream

panda/src/physx/physxFixedJoint.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJoint.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxFixedJointDesc;
 

panda/src/physx/physxFixedJointDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJointDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxFixedJointDesc

panda/src/physx/physxForceField.h

@@ -19,9 +19,7 @@
 #include "lvector3.h"
 
 #include "physxObject.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxScene;
 class PhysxForceFieldDesc;

panda/src/physx/physxForceFieldDesc.h

@@ -21,9 +21,7 @@
 #include "lmatrix.h"
 
 #include "physxEnums.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxActor;
 class PhysxForceFieldShapeDesc;

panda/src/physx/physxForceFieldShape.h

@@ -23,9 +23,7 @@
 
 #include "physxObject.h"
 #include "physxEnums.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxForceField;
 class PhysxForceFieldShapeGroup;

panda/src/physx/physxForceFieldShapeDesc.h

@@ -19,8 +19,7 @@
 #include "lpoint3.h"
 #include "lmatrix.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxForceFieldShapeDesc

panda/src/physx/physxForceFieldShapeGroup.h

@@ -20,8 +20,7 @@
 #include "physxObject.h"
 #include "physxEnums.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxScene;
 class PhysxForceField;

panda/src/physx/physxForceFieldShapeGroupDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxEnums.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxForceFieldShapeDesc;
 

panda/src/physx/physxGroupsMask.h

@@ -17,8 +17,7 @@
 
 #include "pandabase.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxGroupsMask

panda/src/physx/physxHeightField.h

@@ -22,9 +22,7 @@
 #include "physxContactReport.h"
 #include "physxControllerReport.h"
 #include "physxTriggerReport.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxHeightField

panda/src/physx/physxHeightFieldDesc.h

@@ -18,8 +18,7 @@
 #include "pandabase.h"
 #include "pnmImage.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxHeightFieldDesc

panda/src/physx/physxHeightFieldShape.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxShape.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxHeightFieldShapeDesc;
 

panda/src/physx/physxHeightFieldShapeDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxShapeDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxHeightField;
 

panda/src/physx/physxJoint.h

@@ -22,9 +22,7 @@
 
 #include "physxObject.h"
 #include "physxEnums.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxActor;
 class PhysxScene;

panda/src/physx/physxJointDesc.h

@@ -20,9 +20,7 @@
 #include "lvector3.h"
 
 #include "physxEnums.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxActor;
 

panda/src/physx/physxJointDriveDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxEnums.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxJointDriveDesc

panda/src/physx/physxJointLimitDesc.h

@@ -17,8 +17,7 @@
 
 #include "pandabase.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxJointLimitDesc

panda/src/physx/physxJointLimitSoftDesc.h

@@ -17,8 +17,7 @@
 
 #include "pandabase.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxJointLimitSoftDesc

panda/src/physx/physxKitchen.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 #include "filename.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
-#include "NxCooking.h"
+#include "physx_includes.h"
 
 class PhysxConvexMesh;
 class PhysxConvexMeshDesc;

panda/src/physx/physxManager.h

@@ -21,10 +21,7 @@
 
 #include "physxEnums.h"
 #include "physxObjectCollection.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
-#include "NxExtended.h"
+#include "physx_includes.h"
 
 class PhysxScene;
 class PhysxSceneDesc;

panda/src/physx/physxMask.h

@@ -17,8 +17,7 @@
 
 #include "pandabase.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxMask

panda/src/physx/physxMaterial.h

@@ -20,9 +20,7 @@
 
 #include "physxObject.h"
 #include "physxEnums.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxScene;
 class PhysxMaterialDesc;

panda/src/physx/physxMaterialDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxEnums.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxMaterialDesc

panda/src/physx/physxMemoryReadBuffer.h

@@ -17,8 +17,7 @@
 
 #include "pandabase.h"
 
-#include "NoMinMax.h"
-#include "NxStream.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxMemoryReadBuffer

panda/src/physx/physxMemoryWriteBuffer.h

@@ -17,8 +17,7 @@
 
 #include "pandabase.h"
 
-#include "NoMinMax.h"
-#include "NxStream.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxMemoryWriteBuffer

panda/src/physx/physxMeshPool.h

@@ -21,8 +21,7 @@
 #include "pmap.h"
 #include "filename.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxConvexMesh;
 class PhysxTriangleMesh;

panda/src/physx/physxMotorDesc.h

@@ -17,8 +17,7 @@
 
 #include "pandabase.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxMotorDesc

panda/src/physx/physxOverlapReport.h

@@ -20,6 +20,7 @@
 #include "pointerTo.h"
 
 #include "config_physx.h"
+#include "physx_includes.h"
 
 class PhysxShape;
 

panda/src/physx/physxPlaneShape.h

@@ -19,9 +19,7 @@
 #include "lvector3.h"
 
 #include "physxShape.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxPlaneShapeDesc;
 

panda/src/physx/physxPlaneShapeDesc.h

@@ -20,8 +20,7 @@
 
 #include "lvector3.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxPlaneShapeDesc

panda/src/physx/physxPointInPlaneJoint.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJoint.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxPointInPlaneJointDesc;
 

panda/src/physx/physxPointInPlaneJointDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJointDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxPointInPlaneJointDesc

panda/src/physx/physxPointOnLineJoint.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJoint.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxPointOnLineJointDesc;
 

panda/src/physx/physxPointOnLineJointDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJointDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxPointOnLineJointDesc

panda/src/physx/physxPrismaticJoint.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJoint.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxPrismaticJointDesc;
 

panda/src/physx/physxPrismaticJointDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJointDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxPrismaticJointDesc

panda/src/physx/physxPulleyJoint.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJoint.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxMotorDesc;
 class PhysxPulleyJointDesc;

panda/src/physx/physxPulleyJointDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJointDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxMotorDesc;
 

panda/src/physx/physxRevoluteJoint.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJoint.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxRevoluteJointDesc;
 class PhysxSpringDesc;

panda/src/physx/physxRevoluteJointDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJointDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxSpringDesc;
 class PhysxMotorDesc;

panda/src/physx/physxScene.h

@@ -27,10 +27,7 @@
 #include "physxOverlapReport.h"
 #include "physxMask.h"
 #include "physxGroupsMask.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
-#include "NxControllerManager.h"
+#include "physx_includes.h"
 
 class PhysxActor;
 class PhysxActorDesc;

panda/src/physx/physxSceneDesc.h

@@ -19,9 +19,7 @@
 #include "lvector3.h"
 
 #include "physxEnums.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxBounds3;
 

panda/src/physx/physxSceneStats2.h

@@ -17,8 +17,7 @@
 
 #include "pandabase.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxSceneStats2

panda/src/physx/physxShape.h

@@ -23,9 +23,7 @@
 
 #include "physxObject.h"
 #include "physxEnums.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxActor;
 class PhysxMaterial;

panda/src/physx/physxShapeDesc.h

@@ -20,9 +20,7 @@
 #include "lmatrix.h"
 
 #include "physxEnums.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxMaterial;
 

panda/src/physx/physxSphereForceFieldShape.h

@@ -19,9 +19,7 @@
 #include "lvector3.h"
 
 #include "physxForceFieldShape.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxSphereForceFieldShapeDesc;
 

panda/src/physx/physxSphereForceFieldShapeDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxForceFieldShapeDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxSphereForceFieldShapeDesc

panda/src/physx/physxSphereShape.h

@@ -19,9 +19,7 @@
 #include "lvector3.h"
 
 #include "physxShape.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxSphereShapeDesc;
 

panda/src/physx/physxSphereShapeDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxShapeDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxSphereShapeDesc

panda/src/physx/physxSphericalJoint.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJoint.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxSphericalJointDesc;
 

panda/src/physx/physxSphericalJointDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxJointDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxSpringDesc;
 class PhysxJointLimitDesc;

panda/src/physx/physxSpringDesc.h

@@ -17,8 +17,7 @@
 
 #include "pandabase.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxSpringDesc

panda/src/physx/physxTriangleMesh.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxObject.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxTriangleMesh

panda/src/physx/physxTriangleMeshDesc.h

@@ -19,8 +19,7 @@
 #include "lpoint3.h"
 #include "nodePath.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxTriangleMeshDesc

panda/src/physx/physxTriangleMeshShape.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxShape.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxTriangleMeshShapeDesc;
 

panda/src/physx/physxTriangleMeshShapeDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxShapeDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxTriangleMesh;
 

panda/src/physx/physxTriggerReport.h

@@ -18,8 +18,7 @@
 #include "pandabase.h"
 #include "pStatCollector.h"
 
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PhysxTriggerReport

panda/src/physx/physxWheelShape.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxShape.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxWheelShapeDesc;
 

panda/src/physx/physxWheelShapeDesc.h

@@ -18,9 +18,7 @@
 #include "pandabase.h"
 
 #include "physxShapeDesc.h"
-
-#include "NoMinMax.h"
-#include "NxPhysics.h"
+#include "physx_includes.h"
 
 class PhysxSpringDesc;
 

panda/src/physx/physx_includes.h

@@ -0,0 +1,51 @@
+// Filename: ode_includes.h
+// Created by:  joswilso (30Jan07)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) Carnegie Mellon University.  All rights reserved.
+//
+// All use of this software is subject to the terms of the revised BSD
+// license.  You should have received a copy of this license along
+// with this source code in a file named "LICENSE."
+//
+////////////////////////////////////////////////////////////////////
+
+#ifndef PHYSX_INCLUDES_H
+#define PHYSX_INCLUDES_H
+
+
+// Platform-specific defines
+#ifdef WIN32
+#define NX32
+#endif
+
+#ifdef IS_LINUX
+#define LINUX
+#define NX32
+#define CORELIB
+#define NX_DISABLE_FLUIDS
+#endif
+
+#ifdef IS_OSX
+#endif
+
+
+// Undefine min and max before ay PhysX headers get included
+#undef min
+#undef max
+
+
+// PhysX headers
+#include "NxPhysics.h"
+#include "NxExtended.h"
+#include "NxStream.h"
+#include "NxCooking.h"
+#include "NxController.h"
+#include "NxControllerManager.h"
+#include "NxBoxController.h"
+#include "NxCapsuleController.h"
+
+
+#endif // PHYSX_INCLUDES_H