From 87e60447dc0a2acbf481f1a3674f2e76e6bcfc26 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 13 Nov 2009 22:24:15 -0700 Subject: Force Imprudence to use the correst boost libraries, e.g: #pragma comment( lib, libboost_signals-vc80-mt-1_36.lib ) --- ChangeLog.txt | 6 ++++++ linden/indra/newview/llappviewerwin32.cpp | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index c0995e8..00c65ee 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -4,6 +4,12 @@ 2009-11-12 McCabe Maxsted + * Force Imprudence to use the correst boost libraries, e.g: + #pragma comment( lib, "libboost_signals-vc80-mt-1_36.lib" ) + + modified: linden/indra/newview/llappviewerwin32.cpp + + * Fixed linker error (onClickHome in llfloaterhtmlhelp.cpp). modified: linden/indra/newview/llfloaterhtmlhelp.cpp diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp index e1c9471..87be31a 100644 --- a/linden/indra/newview/llappviewerwin32.cpp +++ b/linden/indra/newview/llappviewerwin32.cpp @@ -78,6 +78,31 @@ extern "C" { #endif #endif +// Force Imprudence to link against the correct boost libraries -- McCabe +#if defined(_MSC_VER) +#if _MSC_VER >= 1500 +#ifdef LL_DEBUG +#pragma comment( lib, "libboost_signals-vc90-mt-gd-1_36.lib" ) +#pragma comment( lib, "libboost_regex-vc90-mt-gd-1_36.lib" ) +#pragma comment( lib, "libboost_program_options-vc90-mt-gd-1_36.lib" ) +#else +#pragma comment( lib, "libboost_signals-vc90-mt-1_36.lib" ) +#pragma comment( lib, "libboost_regex-vc90-mt-1_36.lib" ) +#pragma comment( lib, "libboost_program_options-vc90-mt-1_36.lib" ) +#endif +#elif _MSC_VER >= 1400 +#ifdef LL_DEBUG +#pragma comment( lib, "libboost_signals-vc80-mt-gd-1_36.lib" ) +#pragma comment( lib, "libboost_regex-vc80-mt-gd-1_36.lib" ) +#pragma comment( lib, "libboost_program_options-vc80-mt-gd-1_36.lib" ) +#else +#pragma comment( lib, "libboost_signals-vc80-mt-1_36.lib" ) +#pragma comment( lib, "libboost_regex-vc80-mt-1_36.lib" ) +#pragma comment( lib, "libboost_program_options-vc80-mt-1_36.lib" ) +#endif +#endif +#endif + const std::string LLAppViewerWin32::sWindowClass = "Second Life"; LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop) -- cgit v1.1