[Libreoffice-commits] .: shell/Library_ooofilt_x64.mk shell/Library_propertyhdl_x64.mk shell/Library_shlxthdl_x64.mk

[David Tardon]

 shell/Library_ooofilt_x64.mk     |    1 +
 shell/Library_propertyhdl_x64.mk |    1 +
 shell/Library_shlxthdl_x64.mk    |    1 +
 3 files changed, 3 insertions(+)

New commits:
commit 44863e68c1a517fb2179ab8d7f3fe29d68325633
Author: David Tardon <dtardon at redhat.com>
Date:   Wed May 30 10:50:00 2012 +0200

    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

diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index 265672a..3ddaeec 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 46d24ff..323335f 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 f5c8c7c..2b5555a 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,\