From 7bc602870ddc37ebc0b015cc6d82197cee897343 Mon Sep 17 00:00:00 2001 From: Christian Walther Date: Tue, 31 Dec 2013 16:21:33 +0100 Subject: [PATCH] Build 918 chunk 17: Define EAX_SDK_AVAILABLE MarkD: My thought was for the long term was to put most of the differences in the project and solution configurations, so there would be less differences in the sources. EAX is a good example - I put the #define for EAX_SDK_AVAILABLE in the projects that used it with the thinking that the fans would create new projects that would not have EAX_SDK_AVAILABLE and would create and use a different configuration in the AllClient solution. Cyan would use the "Release" config and the fans use something like "Release-ou" to build with. But maybe there are just too many differences. --- .../MsDevProjects/Plasma/Apps/plClient/plClient.vcproj | 6 +++--- .../Plasma/Apps/plPageOptimizer/plPageOptimizer.vcproj | 4 ++-- .../Plasma/FeatureLib/pfAudio/pfAudio.vcproj | 4 ++-- .../Plasma/FeatureLib/pfConsole/pfConsole.vcproj | 4 ++-- .../Plasma/FeatureLib/pfPython/pfPython.vcproj | 4 ++-- .../Plasma/PubUtilLib/plAudible/plAudible.vcproj | 4 ++-- .../Plasma/PubUtilLib/plAudio/plAudio.vcproj | 8 ++++---- .../Plasma/PubUtilLib/plAvatar/plAvatar.vcproj | 4 ++-- .../Plasma/PubUtilLib/plInputCore/plInputCore.vcproj | 4 ++-- .../Plasma/PubUtilLib/plModifier/plModifier.vcproj | 4 ++-- .../Plasma/PubUtilLib/plPhysical/plPhysical.vcproj | 4 ++-- .../MsDevProjects/Tools/MaxComponent/MaxComponent.vcproj | 4 ++-- .../Plasma20/MsDevProjects/Tools/MaxMain/MaxMain.vcproj | 8 ++++---- .../Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp | 5 +++++ 14 files changed, 36 insertions(+), 31 deletions(-) diff --git a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plClient/plClient.vcproj b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plClient/plClient.vcproj index 93ee7865..3571c6a8 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plClient/plClient.vcproj +++ b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plClient/plClient.vcproj @@ -22,7 +22,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""../../../../SDKs/XPlatform/Cypython-2.3.3/Include";"../../../../SDKs/XPlatform/Cypython-2.3.3/PC";../../../../../StaticSDKs/Win32/HawkVoice/src;../../../../../StaticSDKs/Win32/HawkVoice/Release;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib;../../../../Sources/Plasma/FeatureLib/inc;"../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static";../../../../../StaticSDKs/Win32/PlatformSDK/Include;../../../../../StaticSDKs/Win32/OpenSSL/include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;EAX_SDK_AVAILABLE" BasicRuntimeChecks="3" RuntimeLibrary="3" BufferSecurityCheck="TRUE" @@ -106,7 +106,7 @@ xcopy /Y ..\..\..\..\Sources\Plasma\Apps\plClient\external\resource.dat ..\..\.. Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories=""../../../../SDKs/XPlatform/Cypython-2.3.3/Include";"../../../../SDKs/XPlatform/Cypython-2.3.3/PC";../../../../../StaticSDKs/Win32/HawkVoice/src;../../../../../StaticSDKs/Win32/HawkVoice/Release;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib;../../../../Sources/Plasma/FeatureLib/inc;"../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static";../../../../../StaticSDKs/Win32/PlatformSDK/Include;../../../../../StaticSDKs/Win32/OpenSSL/include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EAX_SDK_AVAILABLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -128,7 +128,7 @@ xcopy /Y ..\..\..\..\Sources\Plasma\Apps\plClient\external\resource.dat ..\..\.. OutputFile=".\Release/plClient.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories=""..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32";"..\..\..\..\..\StaticSDKs\Win32\speex-1.0.1\Win32\libspeex\Release";..\..\..\..\..\StaticSDKs\Win32\eax\lib;..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;..\..\..\..\..\STATICSDKS\XPLATFORM\STLPORT\lib;..\..\..\..\..\StaticSDKs\Win32\WMSDK\lib;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86;..\..\..\..\..\StaticSDKs\Win32\PhysX\lib\win32;"..\..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32";..\..\..\..\..\StaticSDKs\Win32\PlatformSDK\Lib;"..\..\..\..\..\StaticSDKs\XPlatform\jpeg-8c-rgba";..\..\..\..\..\StaticSDKs\XPlatform\png\lib" + AdditionalLibraryDirectories=""..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32";"..\..\..\..\..\StaticSDKs\Win32\speex-1.0.1\Win32\libspeex\Release";..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;..\..\..\..\..\STATICSDKS\XPLATFORM\STLPORT\lib;..\..\..\..\..\StaticSDKs\Win32\WMSDK\lib;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86;..\..\..\..\..\StaticSDKs\Win32\PhysX\lib\win32;"..\..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32";..\..\..\..\..\StaticSDKs\Win32\PlatformSDK\Lib;"..\..\..\..\..\StaticSDKs\XPlatform\jpeg-8c-rgba";..\..\..\..\..\StaticSDKs\XPlatform\png\lib;..\..\..\..\..\StaticSDKs\Win32\EAX\lib" IgnoreDefaultLibraryNames="libc.lib,libci.lib,libcmt.lib" GenerateDebugInformation="TRUE" AssemblyDebug="1" diff --git a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plPageOptimizer/plPageOptimizer.vcproj b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plPageOptimizer/plPageOptimizer.vcproj index 3b5103d0..8c10d661 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plPageOptimizer/plPageOptimizer.vcproj +++ b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plPageOptimizer/plPageOptimizer.vcproj @@ -20,7 +20,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib/inc;"../../../../SDKs/XPlatform/Cypython-2.3.3/Include";"../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static";../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../../StaticSDKs/Win32/OpenSSL/include" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;EAX_SDK_AVAILABLE" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -72,7 +72,7 @@ + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MAXPLUGINCODE;$(NoInherit);EAX_SDK_AVAILABLE"/> @@ -219,7 +219,7 @@ copy "$(TargetPath)" "$(maxr7dir)"\plugins Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;MAXPLUGINCODE;$(NoInherit)" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;MAXPLUGINCODE;$(NoInherit);EAX_SDK_AVAILABLE" BasicRuntimeChecks="3"/> diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp index d33b9cab..f8cb7ae1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp @@ -46,6 +46,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // ////////////////////////////////////////////////////////////////////////////// + +#ifdef EAX_SDK_AVAILABLE +# pragma message("==>Compiling with EAX_SDK") +#endif // EAX_SDK_AVAILABLE + #include "hsTypes.h" #include "hsThread.h" #ifndef EAX_SDK_AVAILABLE