mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 05:39:30 +08:00
112 lines
5.0 KiB
Diff
112 lines
5.0 KiB
Diff
diff --git a/subprojects/gst-plugins-bad/ext/dts/meson.build b/subprojects/gst-plugins-bad/ext/dts/meson.build
|
|
index c4868a4..6b34cb7 100644
|
|
--- a/subprojects/gst-plugins-bad/ext/dts/meson.build
|
|
+++ b/subprojects/gst-plugins-bad/ext/dts/meson.build
|
|
@@ -20,7 +20,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/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build
|
|
index 160080a..6acf110 100644
|
|
--- a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build
|
|
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build
|
|
@@ -158,7 +158,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/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build
|
|
index 84eeb17..1743f41 100644
|
|
--- a/subprojects/gst-plugins-bad/meson.build
|
|
+++ b/subprojects/gst-plugins-bad/meson.build
|
|
@@ -54,7 +54,7 @@ endif
|
|
|
|
cdata = configuration_data()
|
|
cdata.set('ENABLE_NLS', 1)
|
|
|
|
-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/subprojects/gst-plugins-bad/sys/asio/meson.build b/subprojects/gst-plugins-bad/sys/asio/meson.build
|
|
index c61ad4e..b30793c 100644
|
|
--- a/subprojects/gst-plugins-bad/sys/asio/meson.build
|
|
+++ b/subprojects/gst-plugins-bad/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/subprojects/gst-plugins-bad/sys/d3d11/meson.build b/subprojects/gst-plugins-bad/sys/d3d11/meson.build
|
|
index 1368b79..8dd3b30 100644
|
|
--- a/subprojects/gst-plugins-bad/sys/d3d11/meson.build
|
|
+++ b/subprojects/gst-plugins-bad/sys/d3d11/meson.build
|
|
@@ -96,7 +96,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/subprojects/gst-plugins-bad/sys/decklink/meson.build b/subprojects/gst-plugins-bad/sys/decklink/meson.build
|
|
index d869e79a4..c7b37a7c6 100644
|
|
--- a/subprojects/gst-plugins-bad/sys/decklink/meson.build
|
|
+++ b/subprojects/gst-plugins-bad/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/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build b/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build
|
|
index 6b9a059..40713ce 100644
|
|
--- a/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build
|
|
+++ b/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build
|
|
@@ -54,7 +54,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/subprojects/gst-plugins-bad/sys/msdk/meson.build b/subprojects/gst-plugins-bad/sys/msdk/meson.build
|
|
index 659b96c..92e6bc4 100644
|
|
--- a/subprojects/gst-plugins-bad/sys/msdk/meson.build
|
|
+++ b/subprojects/gst-plugins-bad/sys/msdk/meson.build
|
|
@@ -176,12 +176,12 @@ if use_onevpl and have_mfx_ver205
|
|
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'))
|
|
msdk_deps = declare_dependency(dependencies: [gstd3d11_dep, legacy_stdio_dep])
|
|
- msdk_deps_found = gstd3d11_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
|
|
libdl_dep = cc.find_library('dl', required: get_option('msdk'))
|
|
libgudev_dep = dependency('gudev-1.0', required: get_option('msdk'))
|