Browse Source

temporarily revert dx9 sdk change

David Rose 16 years ago
parent
commit
764585f43a
3 changed files with 5 additions and 6 deletions
  1. 1 1
      dtool/Config.pp
  2. 1 1
      panda/src/dxgsg9/config_dxgsg9.cxx
  3. 3 4
      panda/src/dxgsg9/dxgsg9base.h

+ 1 - 1
dtool/Config.pp

@@ -732,7 +732,7 @@
 // Is DirectX9 available, and should we try to build with it?
 // Is DirectX9 available, and should we try to build with it?
 #define DX9_IPATH
 #define DX9_IPATH
 #define DX9_LPATH
 #define DX9_LPATH
-#define DX9_LIBS d3d9.lib d3dx9.lib dxerr.lib
+#define DX9_LIBS d3d9.lib d3dx9.lib dxerr9.lib
 #defer HAVE_DX9 $[libtest $[DX9_LPATH],$[DX9_LIBS]]
 #defer HAVE_DX9 $[libtest $[DX9_LPATH],$[DX9_LIBS]]
 
 
 // Is OpenCV installed, and where?
 // Is OpenCV installed, and where?

+ 1 - 1
panda/src/dxgsg9/config_dxgsg9.cxx

@@ -28,7 +28,7 @@
 
 
 #include "dconfig.h"
 #include "dconfig.h"
 
 
-DToolConfigure(config_dxgsg9);
+Configure(config_dxgsg9);
 NotifyCategoryDef(dxgsg9, ":display:gsg");
 NotifyCategoryDef(dxgsg9, ":display:gsg");
 NotifyCategoryDef(wdxdisplay9, "display");
 NotifyCategoryDef(wdxdisplay9, "display");
 
 

+ 3 - 4
panda/src/dxgsg9/dxgsg9base.h

@@ -29,10 +29,9 @@
 
 
 #define D3D_OVERLOADS   //  get D3DVECTOR '+' operator, etc from d3dtypes.h
 #define D3D_OVERLOADS   //  get D3DVECTOR '+' operator, etc from d3dtypes.h
 //#define D3D_DEBUG_INFO
 //#define D3D_DEBUG_INFO
-#undef Configure
 #include <d3d9.h>
 #include <d3d9.h>
 #include <d3dx9.h>
 #include <d3dx9.h>
-#include <dxerr.h>
+#include <dxerr9.h>
 #undef WIN32_LEAN_AND_MEAN
 #undef WIN32_LEAN_AND_MEAN
 
 
 #if (D3D_SDK_VERSION & 0xffff) < 32
 #if (D3D_SDK_VERSION & 0xffff) < 32
@@ -41,9 +40,9 @@
 
 
 #ifndef D3DERRORSTRING
 #ifndef D3DERRORSTRING
 #ifdef NDEBUG
 #ifdef NDEBUG
-#define D3DERRORSTRING(HRESULT) " at (" << __FILE__ << ":" << __LINE__ << "), hr=" <<  DXGetErrorString(HRESULT) << endl  // leave out descriptions to shrink release build
+#define D3DERRORSTRING(HRESULT) " at (" << __FILE__ << ":" << __LINE__ << "), hr=" <<  DXGetErrorString9(HRESULT) << endl  // leave out descriptions to shrink release build
 #else
 #else
-#define D3DERRORSTRING(HRESULT) " at (" << __FILE__ << ":" << __LINE__ << "), hr=" <<  DXGetErrorString(HRESULT) << ": " << DXGetErrorDescription(HRESULT) << endl
+#define D3DERRORSTRING(HRESULT) " at (" << __FILE__ << ":" << __LINE__ << "), hr=" <<  DXGetErrorString9(HRESULT) << ": " << DXGetErrorDescription9(HRESULT) << endl
 #endif
 #endif
 #endif
 #endif