[Libreoffice-commits] .: solenv/gbuild

Noel Power noelp at kemper.freedesktop.org
Thu Mar 8 08:02:34 PST 2012


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

New commits:
commit c3d806be7d30a437607d924a4d33f13fe20dd1ba
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

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index dc661d1..91d2be7 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -366,7 +366,9 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(if $(filter-out StaticLibrary,$(TARGETTYPE)),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
 
 


More information about the Libreoffice-commits mailing list