From 5a10e2095ab4895b7a3c1a9ed9fc6f0f39dc96ac Mon Sep 17 00:00:00 2001 From: Christian Walther Date: Wed, 1 Jan 2014 23:36:09 +0100 Subject: [PATCH] Link eax.lib and eaxguid.lib using #pragma comment(lib) rather than naming them in the linker options (brought back by e7bb0959f189). This is evil, but in the absence of more appropriate features (vsprops) in VS 2003 allows us to avoid separate projects or configurations for the cases with/without EAX and all the duplication that would bring with it. Needs testing by someone who has EAX. --- .../MsDevProjects/Plasma/Apps/plClient/plClient.vcproj | 4 ++-- .../Plasma/Apps/plPageOptimizer/plPageOptimizer.vcproj | 4 ++-- .../Plasma20/MsDevProjects/Tools/MaxMain/MaxMain.vcproj | 4 ++-- .../Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp | 7 +++++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plClient/plClient.vcproj b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plClient/plClient.vcproj index 0ca8028d..73f6b6de 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plClient/plClient.vcproj +++ b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plClient/plClient.vcproj @@ -39,7 +39,7 @@ Name="VCCustomBuildTool"/> Compiling with EAX_SDK") +#if defined(_MSC_VER) && _MSC_VER < 1400 +// name EAX libraries here rather than in the projects so that we don't try to +// link them unless EAX_SDK_AVAILABLE (avoids the need for separate projects +// or configurations for the cases with/without EAX) +#pragma comment(lib, "eax.lib") +#pragma comment(lib, "eaxguid.lib") +#endif // _MSC_VER < 1400 #endif // EAX_SDK_AVAILABLE #include "hsTypes.h"