Kaydet (Commit) 94fb4e55 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Fix MSVC build with debugging C/C++ runtime, i.e. with --enable-dbgutil

Whether this stuff actually works with the debugging runtime is
another question... The reason why the .cxx and .hxx files in this
commit explicitly undefined _DEBUG is unknown. As usual the old commit
message doesn't give any clue. Hamburg apparently didn't use the debug
runtime in their "dbgutil" a.k.a. "non-pro" builds?
üst 2e9c7ef2
......@@ -29,9 +29,6 @@
#define STRICT
#define _WIN32_WINNT 0x0400
#define _WIN32_DCOM
#if defined(_MSC_VER) && (_MSC_VER >= 1300)
#undef _DEBUG
#endif
#if defined(_MSC_VER) && (_MSC_VER > 1310)
#pragma warning(disable : 4917 4555)
#endif
......
......@@ -28,9 +28,6 @@
#ifndef _EMBEDDOC_HXX_
#define _EMBEDDOC_HXX_
#if defined(_MSC_VER) && (_MSC_VER >= 1300)
#undef _DEBUG
#endif
#if defined(_MSC_VER) && (_MSC_VER > 1310)
#pragma warning(disable : 4917 4555)
#endif
......
......@@ -29,10 +29,6 @@
#ifndef _SERVPROV_HXX
#define _SERVPROV_HXX
#if defined(_MSC_VER) && (_MSC_VER >= 1300)
#undef _DEBUG
#endif
#include "common.h"
#include <oleidl.h>
#include <com/sun/star/uno/Reference.h>
......
......@@ -69,8 +69,14 @@ SHL1STDLIBS=\
.IF "$(COM)"=="MSC"
SHL1STDLIBS+=\
$(ADVAPI32LIB) \
$(ADVAPI32LIB)
.IF "$(USE_DEBUG_RUNTIME)" == ""
SHL1STDLIBS+=\
$(ATL_LIB)$/atls.lib
.ELSE
SHL1STDLIBS+=\
$(ATL_LIB)$/atlsd.lib
.ENDIF
.ENDIF # "$(COM)"=="MSC"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment