diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-17 22:03:54 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-17 22:13:04 +0300 |
| commit | 94fb4e55c8f83442e79c99515b8cdf33997f56c4 (patch) | |
| tree | 7ca1d14323cc172407508bb1c808ded0d69750f2 /embedserv | |
| parent | 2e9c7ef2b065aff27f1f53ade9e5c9ba57b19f75 (diff) | |
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?
Diffstat (limited to 'embedserv')
| -rw-r--r-- | embedserv/source/embed/esdll.cxx | 3 | ||||
| -rw-r--r-- | embedserv/source/inc/embeddoc.hxx | 3 | ||||
| -rw-r--r-- | embedserv/source/inc/servprov.hxx | 4 | ||||
| -rw-r--r-- | embedserv/util/makefile.mk | 8 |
4 files changed, 7 insertions, 11 deletions
diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx index 56ee550c1e81..ab92a9728771 100644 --- a/embedserv/source/embed/esdll.cxx +++ b/embedserv/source/embed/esdll.cxx @@ -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 diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx index 40081abefb4b..fef44f1ff541 100644 --- a/embedserv/source/inc/embeddoc.hxx +++ b/embedserv/source/inc/embeddoc.hxx @@ -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 diff --git a/embedserv/source/inc/servprov.hxx b/embedserv/source/inc/servprov.hxx index cc861d2cc8d0..963170c39a92 100644 --- a/embedserv/source/inc/servprov.hxx +++ b/embedserv/source/inc/servprov.hxx @@ -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> diff --git a/embedserv/util/makefile.mk b/embedserv/util/makefile.mk index 0051d7a823c4..ce4b08b10f9f 100644 --- a/embedserv/util/makefile.mk +++ b/embedserv/util/makefile.mk @@ -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" |