1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-19 19:59:09 +00:00

Fixed compile for DirectX SDK June 2010 + Windows SDK 7.0A + Visual Studio 2010. Hope this doesn't break the stone age build systems!

This commit is contained in:
2011-04-10 23:01:19 -04:00
parent 4b17c0d28a
commit e58e390778
12 changed files with 114 additions and 20 deletions

View File

@ -4,6 +4,8 @@ include_directories("../../NucleusLib/inc")
include_directories("../../NucleusLib")
include_directories("../../PubUtilLib")
include_directories(${DirectX_INCLUDE_DIR})
set(plPipeline_SOURCES
hsG3DDeviceSelector.cpp
hsGColorizer.cpp
@ -84,4 +86,4 @@ add_library(plPipeline STATIC ${plPipeline_SOURCES} ${plPipeline_HEADERS} ${plPi
source_group("Source Files" FILES ${plPipeline_SOURCES})
source_group("Header Files" FILES ${plPipeline_HEADERS})
source_group("DeviceRefs" FILES ${plPipeline_DEVICEREFS})
source_group("DeviceRefs" FILES ${plPipeline_DEVICEREFS})

View File

@ -41,7 +41,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <d3d9.h>
#include <ddraw.h>
#include <d3dx9mesh.h>
#include <dxerr9.h>
#ifdef DX_OLD_SDK
#include <dxerr9.h>
#define DXGetErrorString9 DXGetErrorString
#else
#include <dxerr.h>
#endif
#include "hsWinRef.h"
@ -11806,7 +11812,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 /////////////////////////////////////////////////////////////