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/util | |
| parent | Bin a couple of duplicated and unneeded lines (diff) | |
| download | core-94fb4e55c8f83442e79c99515b8cdf33997f56c4.tar.gz core-94fb4e55c8f83442e79c99515b8cdf33997f56c4.zip | |
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/util')
| -rw-r--r-- | embedserv/util/makefile.mk | 8 |
1 files changed, 7 insertions, 1 deletions
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" |