summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2016-02-21 08:17:11 -0800
committerNorbert Thiebaud <nthiebaud@gmail.com>2016-02-21 22:42:55 +0000
commit133610669b8707a278d9b3b0af025779044fd8c5 (patch)
tree7cd9ab244882c528a7a88ae9f93944dbd851cb06 /solenv
parent3b1d7027de241ff02d7c72d2688a5e1acc25d5be (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>
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 836b89baa5be..dbe46b69419d 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) \
ifeq ($(CPUNAME),X86_64)