diff options
author | Christian Goetze <cg@lindenlab.com> | 2008-05-30 23:10:22 +0000 |
---|---|---|
committer | Christian Goetze <cg@lindenlab.com> | 2008-05-30 23:10:22 +0000 |
commit | 419e13d0acaabf5e1e02e9b64a07648bce822b2f (patch) | |
tree | 679e05703b14e90093e42674a5d03b00e9c4a9b5 /indra/newview/llappviewerwin32.cpp | |
parent | a2a3985f8eaf755c5fafd5996c04996bedfb5507 (diff) |
fix wassert symbol problem, copied from cmake branch
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rw-r--r-- | indra/newview/llappviewerwin32.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 53cc1d3e17..dee36fa3c3 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -58,6 +58,20 @@ #include "llcommandlineparser.h" +//*FIX:Mani - This hack is to fix a linker issue with libndofdev.lib +// The lib was compiled under VS2005 - in VS2003 we need to remap assert +#ifdef LL_DEBUG +#ifdef LL_MSVC7 +extern "C" { + void _wassert(const wchar_t * _Message, const wchar_t *_File, unsigned _Line) + { + llerrs << _Message << llendl; + } +} +#endif +#endif + + LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop) { // *NOTE:Mani - this code is stolen from LLApp, where its never actually used. |