summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2016-02-21 08:17:11 -0800
committerMichael Stahl <mstahl@redhat.com>2016-02-22 17:21:21 +0100
commitfec29598507e03fb2008b5afd5507cb47b070435 (patch)
treea7ab7493cae555909c978c3de856aab6c63077b1 /solenv
parenta90a5b1157be7b0459a223a69ea8d0c09b0d8dd2 (diff)
windows: silence new warning for now
Change-Id: I10b3269e3ac81f0c7e3fa60229e2b1e3fcab512b Reviewed-on: https://gerrit.libreoffice.org/22590 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 133610669b8707a278d9b3b0af025779044fd8c5) Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/com_MSC_defs.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 93756d2069dd..5005b1286cdb 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -164,6 +164,7 @@ gb_CFLAGS := \
-wd4706 \
-wd4800 \
-Zc:wchar_t- \
+ $(if $(filter-out 120,$(VCVER)), -Wv:18) \
gb_CXXFLAGS := \
-Gd \
@@ -195,7 +196,7 @@ gb_CXXFLAGS := \
-wd4800 \
-wd4913 \
-Zc:wchar_t- \
-
+ $(if $(filter-out 120,$(VCVER)), -Wv:18) \
ifneq ($(ENABLE_LTO),)