[Libreoffice-commits] .: 2 commits - extensions/source solenv/gbuild

[Tor Lillqvist]

 extensions/source/activex/main/makefile.mk |   10 ++++++++--
 solenv/gbuild/platform/windows.mk          |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit c88b1843b11df9a678d74d4c0c3a67360877e903
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 25 09:00:14 2011 +0300

    Fix dbgutil build, do link also EXEs with the necessary libs

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index fbed875..73cfd3a 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -389,7 +389,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
 		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \
 		$(LIBS) \
-		$(if $(DLLTARGET),$(if $(gb_PRODUCT),,oldnames.lib msvcrtd.lib msvcprtd.lib kernel32.lib user32.lib)) \
+		$(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(if $(gb_PRODUCT),,oldnames.lib msvcrtd.lib msvcprtd.lib kernel32.lib user32.lib)) \
 		$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \
 	$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC)
 endef
commit 8b88940da2212ab1e45d316937f6bc8c06f48223
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 24 21:56:36 2011 +0300

    Fix _DEBUG build: Use atlsd.lib

diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk
index bdfe306..e609fe5 100644
--- a/extensions/source/activex/main/makefile.mk
+++ b/extensions/source/activex/main/makefile.mk
@@ -77,8 +77,10 @@ SHL1STDLIBS=\
     $(URLMONLIB) \
     $(SHLWAPILIB)
 
-.IF "$(COM)"!="GCC"
-.IF "$(CCNUMVER)" > "001300000000"
+.IF "$(COM)" == "MSC"
+.IF "$(USE_DEBUG_RUNTIME)" != ""
+    SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
+.ELSE
     SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
 .ENDIF
 .ENDIF
@@ -134,7 +136,11 @@ SHL1STDLIBS_X64+=\
 SHL1OBJS_X64=$(SLOFILES_X64)
 SHL1DEF_X64=$(TARGET).def
 
+.IF "$(USE_DEBUG_RUNTIME)" != ""
+SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atlsd.lib
+.ELSE
 SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atls.lib
+.ENDIF
 
 .ENDIF # "$(BUILD_X64)"!=""