[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Michael Stahl]

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c6246139df005d6ac4627bc8f4665539effb6e94
Author: Noel Power <noel.power at novell.com>
Date:   Thu Mar 8 16:01:36 2012 +0000

    fix uno bootstrapping for .NET ( and perhaps c++ ) fdo#46832
    
    (cherry picked from commit c3d806be7d30a437607d924a4d33f13fe20dd1ba)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 11d2a1e..2cf856c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -368,7 +368,9 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(if $(gb_PRODUCT),,oldnames.lib $(if $(filter libcmtd,$(LINKED_LIBS)),,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) \
-	$(if $(filter Executable,$(TARGETTYPE)),; if [ -f $@.manifest ]; then mt.exe $(MTFLAGS) -manifest $@.manifest -outputresource:$@\;1; fi) ; exit $$RC)
+	$(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ]; then mt.exe $(MTFLAGS) -manifest $(DLLTARGET).manifest -outputresource:$(DLLTARGET)\;2; fi) \
+	$(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then mt.exe $(MTFLAGS) -manifest $(1).manifest -outputresource:$(1)\;1; fi) \
+	; exit $$RC)
 endef