[Libreoffice-commits] .: 2 commits - connectivity/Library_mozabdrv.mk shell/Library_ooofilt.mk shell/Library_propertyhdl.mk shell/Library_shlxthdl.mk

[David Tardon]

 connectivity/Library_mozabdrv.mk |    4 ----
 shell/Library_ooofilt.mk         |    1 +
 shell/Library_propertyhdl.mk     |    1 +
 shell/Library_shlxthdl.mk        |    1 +
 4 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 0f53247fa0c302b6794222fa4b104c6215cf7803
Author: David Tardon <dtardon at redhat.com>
Date:   Wed May 30 11:31:58 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: Ia7d9eec8dcbc9cbeb64f121f95c0b83d192bab20

diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index af30efb..62c18ed 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 4d701cd..5ca9e91 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 b8df8a9..e4794cf 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,\
commit 796f1146ea886c7aa2e7de0d7d88c30351bca238
Author: David Tardon <dtardon at redhat.com>
Date:   Wed May 30 12:47:55 2012 +0200

    throw away useless dependency
    
    Change-Id: I5988eccb675b9cb481161077a5b5310efb011389

diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk
index e33e762..5448487 100644
--- a/connectivity/Library_mozabdrv.mk
+++ b/connectivity/Library_mozabdrv.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,mozabdrv))
 
-$(eval $(call gb_Library_use_packages,calc,\
-	connectivity_generated \
-))
-
 $(eval $(call gb_Library_set_include,mozabdrv,\
 	-I$(SRCDIR)/connectivity/source/drivers/mozab/bootstrap \
 	-I$(SRCDIR)/connectivity/source/drivers/mozab/mozillasrc \