diff options
author | David Tardon <dtardon@redhat.com> | 2012-05-30 10:50:00 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-05-30 10:52:39 +0200 |
commit | 44863e68c1a517fb2179ab8d7f3fe29d68325633 (patch) | |
tree | 8c93475784eeda6e24accabb0061fcc20cbdfd51 | |
parent | fix linking with gconf on release machine (diff) | |
download | core-44863e68c1a517fb2179ab8d7f3fe29d68325633.tar.gz core-44863e68c1a517fb2179ab8d7f3fe29d68325633.zip |
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: I54217859a7c4f6535eed5bca50ada68a8d5b095c
-rw-r--r-- | shell/Library_ooofilt_x64.mk | 1 | ||||
-rw-r--r-- | shell/Library_propertyhdl_x64.mk | 1 | ||||
-rw-r--r-- | shell/Library_shlxthdl_x64.mk | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index 265672aa090c..3ddaeec9d6c2 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -86,6 +86,7 @@ $(eval $(call gb_Library_add_ldflags,ooofilt_x64,\ /EXPORT:DllGetClassObject \ /EXPORT:DllRegisterServer \ /EXPORT:DllUnregisterServer \ + /NODEFAULTLIB:libcmt.lib \ )) $(eval $(call gb_Library_add_x64_generated_exception_objects,ooofilt_x64,\ diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index 46d24ff1c8d5..323335f55d64 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -85,6 +85,7 @@ $(eval $(call gb_Library_use_static_libraries,propertyhdl_x64,\ $(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\ /EXPORT:DllCanUnloadNow \ /EXPORT:DllGetClassObject \ + /NODEFAULTLIB:libcmt.lib \ )) $(eval $(call gb_Library_add_x64_generated_exception_objects,propertyhdl_x64,\ diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index f5c8c7c7b936..2b5555a7c715 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -88,6 +88,7 @@ $(eval $(call gb_Library_add_ldflags,shlxthdl_x64,\ /EXPORT:DllGetClassObject \ /EXPORT:DllRegisterServer \ /EXPORT:DllUnregisterServer \ + /NODEFAULTLIB:libcmt.lib \ )) $(eval $(call gb_Library_add_x64_generated_exception_objects,shlxthdl_x64,\ |