Fix MSVC build against debugging runtime

f3423eab · Tor Lillqvist · a50103a7 · f3423eab · f3423eab · f3423eab
Kaydet (Commit) f3423eab authored Agu 17, 2011 tarafından Tor Lillqvist
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 0 deletions

makefile.mk cli_ure/source/climaker/makefile.mk +5 -0

makefile.mk cli_ure/source/native/makefile.mk +5 -0

makefile.mk cli_ure/source/uno_bridge/makefile.mk +5 -0

No files found.
--- a/cli_ure/source/climaker/makefile.mk
+++ b/cli_ure/source/climaker/makefile.mk
@@ -96,8 +96,13 @@ APP1STDLIBS = \
    $(SALLIB)			\
    mscoree.lib

+.IF "$(USE_DEBUG_RUNTIME)" == ""
 APP1STDLIBS += \
    msvcmrt.lib
+.ELSE
+APP1STDLIBS += \
+    msvcmrtd.lib
+.ENDIF

 .ENDIF


--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -100,8 +100,13 @@ SHL1STDLIBS = \
    mscoree.lib \
    Advapi32.lib

+.IF "$(USE_DEBUG_RUNTIME)" == ""
 SHL1STDLIBS += \
    msvcmrt.lib
+.ELSE
+SHL1STDLIBS += \
+    msvcmrtd.lib
+.ENDIF

 SHL1VERSIONMAP = msvc.map


--- a/cli_ure/source/uno_bridge/makefile.mk
+++ b/cli_ure/source/uno_bridge/makefile.mk
@@ -65,8 +65,13 @@ SHL1STDLIBS = \
    $(SALLIB)			\
    mscoree.lib

+.IF "$(USE_DEBUG_RUNTIME)" == ""
 SHL1STDLIBS += \
    msvcmrt.lib
+.ELSE
+SHL1STDLIBS += \
+    msvcmrtd.lib
+.ENDIF

 SHL1VERSIONMAP = bridge_exports.map