diff --git a/cerbero/build/build.py b/cerbero/build/build.py index f115d17f6a7fa3b8fb010d55f25c52e53c03638b..7e01e93c1969e9478e05887c9a7d9248710c4ac3 100644 --- a/cerbero/build/build.py +++ b/cerbero/build/build.py @@ -848,8 +848,8 @@ class Meson (Build, ModifyEnvBase) : cc = build_env.pop('CC') cxx = build_env.pop('CXX') - objc = build_env.pop('OBJC', []) - objcxx = build_env.pop('OBJCXX', []) + objc = build_env.pop('OBJC', ['false']) + objcxx = build_env.pop('OBJCXX', ['false']) ar = build_env.pop('AR') # We currently don't set the pre-processor or the linker when building with meson build_env.pop('CPP', None) @@ -929,8 +929,8 @@ class Meson (Build, ModifyEnvBase) : cc = self.config.mingw_env_for_build_system['CC'] cxx = self.config.mingw_env_for_build_system['CXX'] ar = self.config.mingw_env_for_build_system['AR'] - objc = cc - objcxx = cxx + objc = false + objcxx = false elif self.config.platform == Platform.DARWIN: cc = ['clang'] cxx = ['clang++'] diff --git a/recipes/gst-plugins-bad-1.0.recipe b/recipes/gst-plugins-bad-1.0.recipe index bfe02ca35df88334da0caa2fcc2359bca756ec01..0daf973405b31aeed5bb04f431ac87b3f2a70ee3 100644 --- a/recipes/gst-plugins-bad-1.0.recipe +++ b/recipes/gst-plugins-bad-1.0.recipe @@ -485,7 +485,7 @@ class Recipe(custom.GStreamer): (self.config.target_platform == Platform.IOS and self.config.target_arch != Architecture.ARM64): self.disable_plugin('vulkan', 'vulkan', library_name='vulkan') - if self.using_msvc() or self.config.target_platform in (Platform.ANDROID, Platform.IOS): + if self.using_uwp() or self.config.target_platform in (Platform.ANDROID, Platform.IOS): self.disable_plugin('resindvd', 'dvd', dep='libdvdnav') # dtls plugin needs openssl, and we pick up the system openssl if on