solenv/gbuild/platform/com_MSC_defs.mk | 6 ++++++
solenv/gbuild/platform/windows.mk | 5 -----
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 686611019fee67e130452ad0b4abe50647d948fb
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 30 15:20:40 2015 +0200
move disabling of LNK4217
since it's Visual Studio specific, not Windows-specific
Change-Id: I740b392f1aa9ff9c534b0e2fe021de7f93495e4c
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index 478726a..6ff3880 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -262,6 +262,12 @@ gb_LinkTarget_LDFLAGS := \
$(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-nologo,) \
$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst
\,/,$(ILIB))))) \
+# Prevent warning spamming
+# Happens because of the way we link our unit tests with our libraries.
+gb_LinkTarget_LDFLAGS += \
+ /ignore:4217
+
+
gb_DEBUGINFO_FLAGS := -Zi
ifeq ($(VCVER),120)
diff --git a/solenv/gbuild/platform/windows.mk
b/solenv/gbuild/platform/windows.mk
index 42cb134..a2e621d 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -50,9 +50,4 @@ gb_Executable_LAYER := \
# empty to avoid --warn-undefined-functions
gb_Library__set_soversion_script_platform =
-# Prevent warning spamming
-# Happens because of the way we link our unit tests with our libraries.
-gb_LinkTarget_LDFLAGS += \
- /ignore:4217
-
# vim:set noexpandtab:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
