Browse Source

Code changes to build with VS2010 without patching.

This commit will follow the tag VS2003_FINAL which is the last commit
that will compile under VS2003 without changes.

This incorporates all source code changes known to be necessary to build
CWE with VS2010.
rarified/vs2010_default
rarified 4 years ago
parent
commit
26560983d2
  1. 3
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp
  2. 2
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp
  3. 4
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp

3
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp

@ -72,8 +72,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plAudioSystem.h" #include "plAudioSystem.h"
#include <al.h> #include <al.h>
#include <dmusici.h> #include <dxerr.h>
#include <dxerr9.h>
#ifdef EAX_SDK_AVAILABLE #ifdef EAX_SDK_AVAILABLE
#include <eax.h> #include <eax.h>
#include <eax-util.h> #include <eax-util.h>

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <stdio.h> #include <stdio.h>
#include "plWavFile.h" #include "plWavFile.h"
#include <dxerr9.h> #include <dxerr.h>
#include <dsound.h> #include <dsound.h>
#include <stdio.h> #include <stdio.h>

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp

@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <d3d9.h> #include <d3d9.h>
#include <ddraw.h> #include <ddraw.h>
#include <d3dx9mesh.h> #include <d3dx9mesh.h>
#include <dxerr9.h> #include <dxerr.h>
#include "hsWinRef.h" #include "hsWinRef.h"
@ -11837,7 +11837,7 @@ void plDXPipeline::ISetErrorMessage( char *errStr )
// Convert the last D3D error code to a string (probably "Conflicting Render State"). // Convert the last D3D error code to a string (probably "Conflicting Render State").
void plDXPipeline::IGetD3DError() void plDXPipeline::IGetD3DError()
{ {
sprintf( fSettings.fErrorStr, "D3DError : %s", (char *)DXGetErrorString9( fSettings.fDXError ) ); sprintf( fSettings.fErrorStr, "D3DError : %s", (char *)DXGetErrorString( fSettings.fDXError ) );
} }
// IShowErrorMessage ///////////////////////////////////////////////////////////// // IShowErrorMessage /////////////////////////////////////////////////////////////

Loading…
Cancel
Save