From 419e13d0acaabf5e1e02e9b64a07648bce822b2f Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Fri, 30 May 2008 23:10:22 +0000
Subject: [PATCH] fix wassert symbol problem, copied from cmake branch
---
indra/newview/llappviewerwin32.cpp | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 53cc1d3e178..dee36fa3c31 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.
--
GitLab