Run gst-indent through the files

[platform/upstream/gst-plugins-good.git] / meson.build

diff --git a/meson.build b/meson.build
index 22342a2..6d57205 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -40,6 +40,7 @@ if cc.get_id() == 'msvc'
       '/wd4146', # unary minus on unsigned (beware INT_MIN)
       '/wd4244', # lossy type conversion (e.g. double -> int)
       '/wd4305', # truncating type conversion (e.g. double -> float)
+      cc.get_supported_arguments(['/utf-8']), # set the input encoding to utf-8
       language : 'c')
   # Disable SAFESEH with MSVC for plugins and libs that use external deps that
   # are built with MinGW
@@ -307,7 +308,7 @@ endif
 zlib_dep = dependency('zlib', required : false)
 if not zlib_dep.found()
   zlib_dep = cc.find_library('z', required : false)
-  if not zlib_dep.found()
+  if not zlib_dep.found() or not cc.has_header('zlib.h')
     zlib_dep = subproject('zlib').get_variable('zlib_dep')
   endif
 endif