Merge branch 'master' into stlfixups

MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt

@@ -13,7 +13,8 @@ find_package(PHYSX REQUIRED)  #TODO: Not required if we aren't building the clie
 find_package(Ogg REQUIRED)    #TODO: Not required if we aren't building the client
 find_package(Vorbis REQUIRED) #TODO: Not required if we aren't building the client
 find_package(Speex REQUIRED)  #TODO: Not required if we aren't building the client
-#find_package(BINK REQUIRED)  #TODO: Find Bink, but don't require it if plPipeline isn't built...
+find_package(DirectX REQUIRED)
+find_package(Bink)            #TODO: Find Bink, but don't require it if plPipeline isn't built...
 #                                    Or better yet, just eliminate bink altogether
 
 option(PLASMA_EXTERNAL_RELEASE "Is this release intended for the general public?" OFF)

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt

@@ -7,6 +7,7 @@ include_directories("../../NucleusLib")
 include_directories("../../PubUtilLib/inc")
 include_directories("../../PubUtilLib")
 
+include_directories(${Bink_INCLUDE_DIR})
 include_directories(${OPENAL_INCLUDE_DIR})
 include_directories(${OPENSSL_INCLUDE_DIR})
 include_directories(${PYTHON_INCLUDE_DIR})
@@ -189,19 +190,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 ${DirectX_LIBRARIES})
-target_link_libraries(plClient winhttp)
+target_link_libraries(plClient ${Bink_LIBRARIES})
-target_link_libraries(plClient version)
+
-target_link_libraries(plClient rpcrt4)
+if (WIN32)
-target_link_libraries(plClient vfw32)
+	target_link_libraries(plClient Rpcrt4)
-target_link_libraries(plClient d3d9)
+	target_link_libraries(plClient Winhttp)
-target_link_libraries(plClient d3dx9)
+	target_link_libraries(plClient Version)
-target_link_libraries(plClient ddraw)
+	target_link_libraries(plClient Vfw32)
-target_link_libraries(plClient dinput8)
+	target_link_libraries(plClient Ws2_32)
-target_link_libraries(plClient dsound)
-target_link_libraries(plClient dxerr9)
-target_link_libraries(plClient dxguid)
 	target_link_libraries(plClient strmiids)
+endif(WIN32)
 
 source_group("Source Files" FILES ${plClient_SOURCES})
 source_group("Header Files" FILES ${plClient_HEADERS})

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/CMakeLists.txt

@@ -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})

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp

@@ -118,7 +118,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plScene/plPageTreeMgr.h"
 #include "plScene/plPostEffectMod.h"
 #include "pnMessage/plNodeRefMsg.h"
-//#include "../pnMessage/plWarpMsg.h"
+//#include "pnMessage/plWarpMsg.h"
 #include "hsResMgr.h"
 
 #include "plParticleSystem/plParticleSystem.h"

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt

@@ -190,7 +190,7 @@ set(pfPython_GLUE
 	cyMiscGlue.cpp
 	cyMiscGlue2.cpp
 	cyMiscGlue3.cpp
-	cyMiscglue4.cpp
+	cyMiscGlue4.cpp
 	cyParticleSysGlue.cpp
 	cyPhysicsGlue.cpp
 	plPythonSDLModifierGlue.cpp

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt

@@ -18,28 +18,28 @@ set(pnNetProtocol_PRIVATE
 )
 
 set(pnNetProtocol_PROTO_CLI2AUTH
-	Private/Protocols/CLi2Auth/pnNpCli2Auth.h
+	Private/Protocols/Cli2Auth/pnNpCli2Auth.h
-	Private/Protocols/CLi2Auth/pnNpCli2Auth.cpp
+	Private/Protocols/Cli2Auth/pnNpCli2Auth.cpp
 )
 
 set(pnNetProtocol_PROTO_CLI2CSR
-	Private/Protocols/CLi2Csr/pnNpCli2Csr.h
+	Private/Protocols/Cli2Csr/pnNpCli2Csr.h
-	Private/Protocols/CLi2Csr/pnNpCli2Csr.cpp
+	Private/Protocols/Cli2Csr/pnNpCli2Csr.cpp
 )
 
 set(pnNetProtocol_PROTO_CLI2FILE
-	Private/Protocols/CLi2File/pnNpCli2File.h
+	Private/Protocols/Cli2File/pnNpCli2File.h
-	Private/Protocols/CLi2File/pnNpCli2File.cpp
+	Private/Protocols/Cli2File/pnNpCli2File.cpp
 )
 
 set(pnNetProtocol_PROTO_CLI2GAME
-	Private/Protocols/CLi2Game/pnNpCli2Game.h
+	Private/Protocols/Cli2Game/pnNpCli2Game.h
-	Private/Protocols/CLi2Game/pnNpCli2Game.cpp
+	Private/Protocols/Cli2Game/pnNpCli2Game.cpp
 )
 
 set(pnNetProtocol_PROTO_CLI2GK
-	Private/Protocols/CLi2GateKeeper/pnNpCli2GateKeeper.h
+	Private/Protocols/Cli2GateKeeper/pnNpCli2GateKeeper.h
-	Private/Protocols/CLi2GateKeeper/pnNpCli2GateKeeper.cpp
+	Private/Protocols/Cli2GateKeeper/pnNpCli2GateKeeper.cpp
 )
 
 set(pnNetProtocol_PROTO_SRV2DB

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt

@@ -74,9 +74,9 @@ if(WIN32)
 	)
 else()
 	set(pnUtils_UNIX
-		Private/Unix/pnUteUxStr.cpp
+		Private/Unix/pnUtUxStr.cpp
-		Private/Unix/pnUteUxSync.cpp
+		Private/Unix/pnUtUxSync.cpp
-		Private/Unix/pnUteUxUuid.cpp
+		Private/Unix/pnUtUxUuid.cpp
 	)
 endif()
 

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt

@@ -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})
 

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

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

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt

@@ -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})
 

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp

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

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plFile/CMakeLists.txt

@@ -17,11 +17,11 @@ set(plFile_SOURCES
 if(WIN32)
 	set(plFile_SOURCES ${plFile_SOURCES} hsFiles_Win.cpp)
 elseif(APPLE)
-	set(plFile_SOURCES "${plFile_SOURCES} hsFiles_Mac.cpp")
+	set(plFile_SOURCES ${plFile_SOURCES} hsFiles_Mac.cpp)
 #elseif(PS2)
-#	set(plFile_SOURCES "${plFile_SOURCES} hsFiles_PS2.cpp")
+#	set(plFile_SOURCES ${plFile_SOURCES} hsFiles_PS2.cpp)
 else(WIN32)
-	set(plFile_SOURCES "${plFile_SOURCES} hsFiles_Unix.cpp")
+	set(plFile_SOURCES ${plFile_SOURCES} hsFiles_Unix.cpp)
 endif(WIN32)
 
 set(plFile_HEADERS

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt

@@ -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})
 

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt

@@ -4,6 +4,9 @@ include_directories("../../NucleusLib/inc")
 include_directories("../../NucleusLib")
 include_directories("../../PubUtilLib")
 
+include_directories(${Bink_INCLUDE_DIR})
+include_directories(${DirectX_INCLUDE_DIR})
+
 set(plPipeline_SOURCES
 	hsG3DDeviceSelector.cpp
 	hsGColorizer.cpp

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

@@ -41,7 +41,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <d3d9.h>
 #include <ddraw.h>
 #include <d3dx9mesh.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 /////////////////////////////////////////////////////////////

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt

@@ -3,6 +3,8 @@ include_directories("../../NucleusLib/inc")
 include_directories("../../NucleusLib")
 include_directories("../../PubUtilLib")
 
+include_directories(${Bink_INCLUDE_DIR})
+
 set(plSurface_SOURCES
 	hsGMaterial.cpp
 	plGrassShaderMod.cpp

MOULOpenSourceClientPlugin/Plasma20/cmake/FindBink.cmake

@@ -0,0 +1,15 @@
+option(Bink_SDK_AVAILABLE "Do we have the Bink SDK?" OFF)
+
+if(Bink_SDK_AVAILABLE)
+    add_definitions(-DBINK_SDK_AVAILABLE)
+endif(Bink_SDK_AVAILABLE)
+
+find_path(Bink_INCLUDE_DIR bink.h
+    C:/BinkW32
+)
+
+find_library(Bink_LIBRARY NAMES binkw32
+    PATHS C:/BinkW32
+)
+
+set(Bink_LIBRARIES ${Bink_LIBRARY})

MOULOpenSourceClientPlugin/Plasma20/cmake/FindDirectX.cmake

@@ -0,0 +1,77 @@
+option(DirectX_OLD_SDK "Is this an old (November 2008) version of the SDK?" OFF)
+
+if (DirectX_OLD_SDK)
+	add_definitions(-DDX_OLD_SDK)
+endif(DirectX_OLD_SDK)
+
+
+if(DirectX_INCLUDE_DIR AND DirectX_LIBRARY)
+	set(DirectX_FIND_QUIETLY TRUE)
+endif()
+
+
+find_path(DirectX_INCLUDE_DIR d3dx9.h
+          $ENV{DXSDK_DIR}/Include
+)
+
+find_library(DirectX_d3d9 NAMES d3d9
+             PATHS $ENV{DXSDK_DIR}/Lib/x86
+             PATHS $ENV{DXSDK_DIR}/Lib/x64
+)
+
+find_library(DirectX_d3dx9 NAMES d3dx9
+             PATHS $ENV{DXSDK_DIR}/Lib/x86
+             PATHS $ENV{DXSDK_DIR}/Lib/x64
+)
+
+find_library(DirectX_dinput8 NAMES dinput8
+             PATHS $ENV{DXSDK_DIR}/Lib/x86
+             PATHS $ENV{DXSDK_DIR}/Lib/x64
+)
+
+find_library(DirectX_dsound NAMES dsound
+             PATHS $ENV{DXSDK_DIR}/Lib/x86
+             PATHS $ENV{DXSDK_DIR}/Lib/x64
+)
+
+find_library(DirectX_dxguid NAMES dxguid
+             PATHS $ENV{DXSDK_DIR}/Lib/x86
+             PATHS $ENV{DXSDK_DIR}/Lib/x64
+)
+
+if (DirectX_OLD_SDK)
+    find_library(DirectX_dxerr NAMES dxerr9
+                 PATHS $ENV{DXSDK_DIR}/Lib/x86
+                 PATHS $ENV{DXSDK_DIR}/Lib/x64
+    )
+else()
+find_library(DirectX_dxerr NAMES DxErr
+             PATHS $ENV{DXSDK_DIR}/Lib/x86
+             PATHS $ENV{DXSDK_DIR}/Lib/x64
+)
+endif(DirectX_OLD_SDK)
+
+set(DirectX_LIBRARIES
+    ${DirectX_d3d9}
+    ${DirectX_d3dx9}
+    ${DirectX_dinput8}
+    ${DirectX_dsound}
+    ${DirectX_dxguid}
+    ${DirectX_dxerr}
+)
+
+
+if(DirectX_INCLUDE_DIR AND DirectX_d3d9 AND DirectX_d3dx9 AND DirectX_dinput8
+                       AND DirectX_dsound AND DirectX_dxguid AND DirectX_dxerr)
+	set(DirectX_FOUND TRUE)
+endif()
+
+if (DirectX_FOUND)
+	if(NOT DirectX_FIND_QUIETLY)
+		message(STATUS "Found DirectX SDK: ${DirectX_INCLUDE_DIR}")
+	endif()
+else()
+	if(DirectX_FIND_REQUIRED)
+		message(FATAL_ERROR "Could not find DirectX SDK")
+	endif()
+endif()