From 6654f41dceb99d4d2dcc3f177ebb7afc755ed797 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Sun, 5 Feb 2012 14:38:18 -0800 Subject: [PATCH] Fix a DirectX/VS/MinGW problem. --- Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp index 16d89a6b..094b8def 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp @@ -62,6 +62,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef DXGetErrorString9 #define DXGetErrorString9 DXGetErrorString #endif + #ifdef __MINGW32__ // UGH! + #define DXGetErrorString DXGetErrorString9 + #endif #else #include #endif @@ -11834,7 +11837,7 @@ void plDXPipeline::ISetErrorMessage( char *errStr ) // Convert the last D3D error code to a string (probably "Conflicting Render State"). void plDXPipeline::IGetD3DError() { - sprintf( fSettings.fErrorStr, "D3DError : %s", (char *)DXGetErrorString9( fSettings.fDXError ) ); + sprintf( fSettings.fErrorStr, "D3DError : %s", (char *)DXGetErrorString( fSettings.fDXError ) ); } // IShowErrorMessage /////////////////////////////////////////////////////////////