[Libreoffice-commits] .: odk/source

[David Tardon]

 odk/source/unowinreg/win/makefile.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b8c046acfc235cbfb09d598b502a66922045cabc
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 8 07:43:31 2012 +0200

    only add -manifest:no for msc--mingw's ldd chokes on it
    
    Change-Id: I3be2e72e5d4fbe879318e0cef48bfe0852f8bbbc

diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk
index 5ca5907..6f7ab74 100644
--- a/odk/source/unowinreg/win/makefile.mk
+++ b/odk/source/unowinreg/win/makefile.mk
@@ -79,7 +79,6 @@ $(BIN)$/unowinreg.dll : $(TARFILE_LOCATION)/185d60944ea767075d27247c3162b3bc-uno
 
 # --- Files --------------------------------------------------------
 
-LINKFLAGS+=-MANIFEST:NO
 SLOFILES = \
     $(SLO)$/unowinreg.obj
 SHL1TARGET=$(TARGET)
@@ -93,6 +92,8 @@ SHL1STDLIBS += -lstdc++
 SHL1STDLIBS += -lgcc_eh
 .ENDIF
 SHL1STDLIBS += -lgcc -lmingw32 -lmoldname -lmsvcrt
+.ELSE
+LINKFLAGS+=-MANIFEST:NO
 .ENDIF
 
 SHL1STDLIBS +=\