diff options
| author | David Tardon <dtardon@redhat.com> | 2012-05-30 11:31:58 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-30 13:44:14 +0200 |
| commit | 0f53247fa0c302b6794222fa4b104c6215cf7803 (patch) | |
| tree | f6f4fd348ba804581512ccb416553253f2871360 /shell | |
| parent | 796f1146ea886c7aa2e7de0d7d88c30351bca238 (diff) | |
do not link with cmt by default
It causes linker errors like:
libcmt.lib(crt0dat.obj) : error LNK2005: _amsg_exit already defined in msvcrt.lib(MSVCR90.dll)
Change-Id: Ia7d9eec8dcbc9cbeb64f121f95c0b83d192bab20
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Library_ooofilt.mk | 1 | ||||
| -rw-r--r-- | shell/Library_propertyhdl.mk | 1 | ||||
| -rw-r--r-- | shell/Library_shlxthdl.mk | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index af30efb7fd9b..62c18edf4a90 100644 --- a/shell/Library_ooofilt.mk +++ b/shell/Library_ooofilt.mk @@ -80,6 +80,7 @@ $(eval $(call gb_Library_add_ldflags,ooofilt,\ /EXPORT:DllGetClassObject \ /EXPORT:DllRegisterServer \ /EXPORT:DllUnregisterServer \ + /NODEFAULTLIB:libcmt.lib \ )) $(eval $(call gb_Library_add_exception_objects,ooofilt,\ diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk index 4d701cd781d8..5ca9e91d6732 100644 --- a/shell/Library_propertyhdl.mk +++ b/shell/Library_propertyhdl.mk @@ -76,6 +76,7 @@ $(eval $(call gb_Library_use_static_libraries,propertyhdl,\ $(eval $(call gb_Library_add_ldflags,propertyhdl,\ /EXPORT:DllCanUnloadNow \ /EXPORT:DllGetClassObject \ + /NODEFAULTLIB:libcmt.lib \ )) $(eval $(call gb_Library_add_exception_objects,propertyhdl,\ diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk index b8df8a93cbb5..e4794cf4312d 100644 --- a/shell/Library_shlxthdl.mk +++ b/shell/Library_shlxthdl.mk @@ -78,6 +78,7 @@ $(eval $(call gb_Library_add_ldflags,shlxthdl,\ /EXPORT:DllGetClassObject \ /EXPORT:DllRegisterServer \ /EXPORT:DllUnregisterServer \ + /NODEFAULTLIB:libcmt.lib \ )) $(eval $(call gb_Library_add_exception_objects,shlxthdl,\ |