diff --git a/ext/dts/meson.build b/ext/dts/meson.build index 8ab3fc917..c19aa2264 100644 --- a/ext/dts/meson.build +++ b/ext/dts/meson.build @@ -15,7 +15,7 @@ if not dca_dep.found() endif no_warn_c_args = [] -if cc.get_id() != 'msvc' +if cc.get_argument_syntax() != 'msvc' # autotools didn't use the libdca pkg-config cflags, and they # can point to a non-existing location (/usr/include/dca) no_warn_c_args = ['-Wno-missing-include-dirs'] diff --git a/gst-libs/gst/d3d11/meson.build b/gst-libs/gst/d3d11/meson.build index 4a844ef75..cd97e8f7a 100644 --- a/gst-libs/gst/d3d11/meson.build +++ b/gst-libs/gst/d3d11/meson.build @@ -174,7 +174,7 @@ endif # MinGW 32bits compiler seems to be complaining about redundant-decls # when ComPtr is in use. Let's just disable the warning -if cc.get_id() != 'msvc' +if cc.get_argument_syntax() != 'msvc' extra_args = cc.get_supported_arguments([ '-Wno-redundant-decls', ]) diff --git a/meson.build b/meson.build index 7cab556e0..35531110b 100644 --- a/meson.build +++ b/meson.build @@ -45,7 +45,7 @@ endif cdata = configuration_data() -if cc.get_id() == 'msvc' +if cc.get_argument_syntax() == 'msvc' msvc_args = [ # Ignore several spurious warnings for things gstreamer does very commonly # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it diff --git a/sys/asio/meson.build b/sys/asio/meson.build index 3006d26ce..1afbd0022 100644 --- a/sys/asio/meson.build +++ b/sys/asio/meson.build @@ -15,7 +15,7 @@ endif # FIXME: non-msvc is not tested, and unlikely supported yet because of # tool-chain issue -if cxx.get_id() != 'msvc' +if cxx.get_argument_syntax() != 'msvc' if asio_option.enabled() error('asio plugin can only be built with MSVC') else diff --git a/sys/d3d11/meson.build b/sys/d3d11/meson.build index 43f213d9c..9c9e9b535 100644 --- a/sys/d3d11/meson.build +++ b/sys/d3d11/meson.build @@ -102,7 +102,7 @@ endif # MinGW 32bits compiler seems to be complaining about redundant-decls # when ComPtr is in use. Let's just disable the warning -if cc.get_id() != 'msvc' +if cc.get_argument_syntax() != 'msvc' extra_mingw_args = cc.get_supported_arguments([ '-Wno-redundant-decls', ]) diff --git a/sys/decklink/meson.build b/sys/decklink/meson.build index d869e79a4..c7b37a7c6 100644 --- a/sys/decklink/meson.build +++ b/sys/decklink/meson.build @@ -18,7 +18,7 @@ decklink_libs = [] if host_system == 'windows' decklink_sources += ['win/DeckLinkAPIDispatch.cpp', 'win/DeckLinkAPI_i.c'] - if cxx.get_id() == 'msvc' + if cxx.get_argument_syntax() == 'msvc' # FIXME: Use commsuppwd.lib for debug builds? comutil_dep = cxx.find_library('comsuppw', required : get_option('decklink')) if comutil_dep.found() diff --git a/sys/mediafoundation/meson.build b/sys/mediafoundation/meson.build index 828954909..af570f9ff 100644 --- a/sys/mediafoundation/meson.build +++ b/sys/mediafoundation/meson.build @@ -48,7 +48,7 @@ if host_system != 'windows' or mf_option.disabled() subdir_done() endif -if cc.get_id() != 'msvc' +if cc.get_argument_syntax() != 'msvc' if mf_option.enabled() error('mediafoundation plugin can only be built with MSVC') endif diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build index a77160049..7c834d8ed 100644 --- a/sys/msdk/meson.build +++ b/sys/msdk/meson.build @@ -139,13 +139,13 @@ if have_mfx_ver134 endif if host_machine.system() == 'windows' - if cc.get_id() != 'msvc' and msdk_option.enabled() + if cc.get_argument_syntax() != 'msvc' and msdk_option.enabled() error('msdk plugin can only be built with MSVC') endif legacy_stdio_dep = cc.find_library('legacy_stdio_definitions', required: get_option('msdk')) d3d11_dep = cc.find_library('d3d11', required: get_option('msdk')) msdk_deps = declare_dependency(dependencies: [d3d11_dep, legacy_stdio_dep]) - msdk_deps_found = d3d11_dep.found() and legacy_stdio_dep.found() and cc.get_id() == 'msvc' + msdk_deps_found = d3d11_dep.found() and legacy_stdio_dep.found() and cc.get_argument_syntax() == 'msvc' else libva_dep = dependency('libva', required: get_option('msdk')) libva_drm_dep = dependency('libva-drm', required: get_option('msdk'))