OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-19 03:39:08 +00:00
Code Releases Activity

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

Browse Source
This commit is contained in:
Adam Johnson
2011-04-10 23:01:19 -04:00
parent 4b17c0d28a
commit e58e390778
12 changed files with 114 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt
View File

@ -189,20 +189,17 @@ target_link_libraries(plClient ${Speex_LIBRARY})
target_link_libraries(plClient ${PHYSX_LIBRARIES})
target_link_libraries(plClient ${Ogg_LIBRARIES})
target_link_libraries(plClient ${Vorbis_LIBRARIES})
target_link_libraries(plClient ws2_32)
target_link_libraries(plClient winhttp)
target_link_libraries(plClient version)
target_link_libraries(plClient rpcrt4)
target_link_libraries(plClient vfw32)
target_link_libraries(plClient d3d9)
target_link_libraries(plClient d3dx9)
target_link_libraries(plClient ddraw)
target_link_libraries(plClient dinput8)
target_link_libraries(plClient dsound)
target_link_libraries(plClient dxerr9)
target_link_libraries(plClient dxguid)
target_link_libraries(plClient ${DirectX_LIBRARIES})
target_link_libraries(plClient strmiids)
if (WIN32)
target_link_libraries(plClient Rpcrt4.lib)
target_link_libraries(plClient Winhttp)
target_link_libraries(plClient Version.lib)
target_link_libraries(plClient Vfw32.lib)
target_link_libraries(plClient Ws2_32.lib)
endif(WIN32)
source_group("Source Files" FILES ${plClient_SOURCES})
source_group("Header Files" FILES ${plClient_HEADERS})
source_group("Text" FILES ${plClient_TEXT})

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/CMakeLists.txt
View File

@ -52,13 +52,13 @@ target_link_libraries(plUruLauncher pnTimer)
target_link_libraries(plUruLauncher pnUtils)
target_link_libraries(plUruLauncher pnUtilsExe)
target_link_libraries(plUruLauncher ${DirectX_LIBRARIES})
target_link_libraries(plUruLauncher ${OPENSSL_LIBRARIES})
target_link_libraries(plUruLauncher ${Ogg_LIBRARIES})
target_link_libraries(plUruLauncher ${Vorbis_LIBRARIES})
target_link_libraries(plUruLauncher ws2_32)
target_link_libraries(plUruLauncher winhttp)
target_link_libraries(plUruLauncher rpcrt4)
target_link_libraries(plUruLauncher dxerr9)
target_link_libraries(plUruLauncher comctl32)
source_group("Source Files" FILES ${plUruLauncher_SOURCES})

3
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt
View File

@ -6,6 +6,7 @@ include_directories("../../PubUtilLib")
#TODO: This should probably be an external dependancy
include_directories("../../../../SDKs/Win32/HawkVoice/src")
include_directories(${DirectX_INCLUDE_DIR})
include_directories(${OPENAL_INCLUDE_DIR})
include_directories(${Speex_INCLUDE_DIR})
@ -47,4 +48,4 @@ set(plAudio_HEADERS
add_library(plAudio STATIC ${plAudio_SOURCES} ${plAudio_HEADERS})
source_group("Source Files" FILES ${plAudio_SOURCES})
source_group("Header Files" FILES ${plAudio_HEADERS})
source_group("Header Files" FILES ${plAudio_HEADERS})

7
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp
View File

@ -44,7 +44,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plAudioSystem.h"
#include <al.h>
#include <dxerr9.h>
#ifdef DX_OLD_SDK
#include <dxerr9.h>
#else
#include <dxerr.h>
#endif
#ifdef EAX_SDK_AVAILABLE
#include <eax.h>
#include <eax-util.h>

1
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt
View File

@ -3,6 +3,7 @@ include_directories("../../NucleusLib/inc")
include_directories("../../NucleusLib")
include_directories("../../PubUtilLib")
include_directories(${DirectX_INCLUDE_DIR})
include_directories(${Ogg_INCLUDE_DIR})
include_directories(${Vorbis_INCLUDE_DIR})

7
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp
View File

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

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/CMakeLists.txt
View File

@ -44,4 +44,4 @@ set(plGImage_HEADERS
add_library(plGImage STATIC ${plGImage_SOURCES} ${plGImage_HEADERS})
source_group("Source Files" FILES ${plGImage_SOURCES})
source_group("Header Files" FILES ${plGImage_HEADERS})
source_group("Header Files" FILES ${plGImage_HEADERS})

1
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt
View File

@ -3,6 +3,7 @@ include_directories("../../NucleusLib/inc")
include_directories("../../NucleusLib")
include_directories("../../PubUtilLib")
include_directories(${DirectX_INCLUDE_DIR})
include_directories(${OPENSSL_INCLUDE_DIR})
include_directories(${OPENAL_INCLUDE_DIR})

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt
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})

10
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
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 /////////////////////////////////////////////////////////////