diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-17 23:21:24 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-17 23:21:24 +0300 |
| commit | f3423eab7815827857149995e69d00c7b641282d (patch) | |
| tree | 24ba8f0f99ebdff14bbacb91a09071838301ec0f /cli_ure | |
| parent | a50103a7028254a2113c2e21b31cc372dfc77570 (diff) | |
Fix MSVC build against debugging runtime
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/source/climaker/makefile.mk | 5 | ||||
| -rw-r--r-- | cli_ure/source/native/makefile.mk | 5 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/makefile.mk | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/cli_ure/source/climaker/makefile.mk b/cli_ure/source/climaker/makefile.mk index 3362c6a239af..45dfc608ccc4 100644 --- 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 diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk index e912bffdef05..a4e2a5f84c6d 100644 --- 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 diff --git a/cli_ure/source/uno_bridge/makefile.mk b/cli_ure/source/uno_bridge/makefile.mk index 459d32b7f035..74ffa586982d 100644 --- 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 |