[Libreoffice-commits] core.git: solenv/gbuild

[Peter Foley]

 solenv/gbuild/platform/com_MSC_class.mk |    1 +
 solenv/gbuild/platform/com_MSC_defs.mk  |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit acc4ed5c4b116fe6b5104833341cc044f77e0374
Author: Peter Foley <pefol...@verizon.net>
Date:   Tue Mar 5 19:11:12 2013 -0500

    avoid -manifest warning for StaticLibraries
    
    Change-Id: I13f0286e532ede2ebd9a9f9d28e71d6ec376549b

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 89be027..99ac77c 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -224,6 +224,7 @@ gb_Windows_PE_TARGETTYPEFLAGS := \
        -debug \
        -nxcompat \
        -dynamicbase \
+       -manifest
 
 # Library class
 
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 5824a9a..6027c94 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -250,7 +250,6 @@ gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := 
$(gb_LinkTarget_NOEXCEPTIONFLAGS)
 
 gb_LinkTarget_LDFLAGS := \
        $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-nologo,) \
-       -MANIFEST \
        $(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst 
\,/,$(ILIB))))) \
 
 gb_DEBUG_CFLAGS := -Zi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits