summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2021-05-18 22:32:52 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2021-05-18 22:32:52 +0800
commit4c2f754f5161343cbff0a26cf8e804036ad2777c (patch)
tree0a9bb91e2ae6217feef1fc8c87a18d3cc80e786d
parentaa35dd4c7475a5ddfd40fadf78cd03015790fdbf (diff)
downloadsigc++-4c2f754f5161343cbff0a26cf8e804036ad2777c.tar.gz
Visual Studio build files: Some cleanups
Replace /wd4530 with /EHsc, as that is the more proper CXXFlag to use for C++ programs
-rw-r--r--MSVC_NMake/config-msvc.mak2
-rw-r--r--meson.build2
2 files changed, 2 insertions, 2 deletions
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 878fddb..86ee18b 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -16,7 +16,7 @@ DEBUG_SUFFIX =
LIBSIGCPP_DEFINES = /DSIGC_BUILD /D_WINDLL
-SIGCPP_BASE_CFLAGS = /I.. /I. /I..\untracked\MSVC_NMake /wd4530 /std:c++17 /EHsc $(CFLAGS)
+SIGCPP_BASE_CFLAGS = /I.. /I. /I..\untracked\MSVC_NMake /std:c++17 /EHsc $(CFLAGS)
LIBSIGC_INT_SOURCES = $(sigc_sources_cc:/=\)
LIBSIGC_INT_HDRS = $(sigc_public_h:/=\)
diff --git a/meson.build b/meson.build
index 038814e..fffe038 100644
--- a/meson.build
+++ b/meson.build
@@ -177,7 +177,7 @@ add_project_arguments(warning_flags, language: 'cpp')
# MSVC: Ignore warnings that aren't really harmful, but make those
# that should not be overlooked stand out.
if is_msvc
- foreach wd : ['/FImsvc_recommended_pragmas.h', '/wd4267', '/wd4530', '/utf-8']
+ foreach wd : ['/FImsvc_recommended_pragmas.h', '/EHsc', '/wd4267', '/utf-8']
disabled_warning = cpp_compiler.get_supported_arguments(wd)
add_project_arguments(disabled_warning, language: 'cpp')
endforeach