Merge 7c24cc3 into 2f556c3

meson.build

@@ -34,13 +34,12 @@ if cpp.get_id() == 'msvc'
       '/wd4305', # truncating type conversion (e.g. double -> float)
       cpp.get_supported_arguments(['/utf-8']), # set the input encoding to utf-8
   ]
-  add_project_arguments(msvc_args, language : 'c')
-  add_project_arguments(msvc_args, language : 'cpp')
+  add_project_arguments(msvc_args, language : ['c', 'cpp'])
   # Disable SAFESEH with MSVC for libs that use external deps that are built with MinGW
   # noseh_link_args = ['/SAFESEH:NO']
 endif
 
-add_global_arguments(cpp.get_supported_arguments([
+add_project_arguments(cpp.get_supported_arguments([
   '-fno-rtti',
   '-fno-exceptions',
   '-fno-threadsafe-statics',
@@ -49,7 +48,7 @@ add_global_arguments(cpp.get_supported_arguments([
 
 if host_machine.cpu_family() == 'arm' and cpp.alignment('struct { char c; }') != 1
   if cpp.has_argument('-mstructure-size-boundary=8')
-    add_global_arguments('-mstructure-size-boundary=8', language : 'cpp')
+    add_project_arguments('-mstructure-size-boundary=8', language : 'cpp')
   endif
 endif
 
@@ -145,13 +144,14 @@ deps = []
 
 conf = configuration_data()
 incconfig = include_directories('.')
-cpp_args = ['-DHAVE_CONFIG_H']
+
+add_project_arguments('-DHAVE_CONFIG_H', language: ['c', 'cpp'])
 
 warn_cflags = [
   '-Wno-non-virtual-dtor',
 ]
 
-cpp_args += cpp.get_supported_arguments(warn_cflags)
+cpp_args = cpp.get_supported_arguments(warn_cflags)
 
 if m_dep.found()
   deps += [m_dep]

test/api/meson.build

@@ -45,10 +45,9 @@ if conf.get('HAVE_GLIB', 0) == 1
     opts = test_data.length() > 1 ? test_data[1] : {}
     extra_c_args = opts.get('c_args', [])
 
-
-
     test_name = fname.split('.')[0].underscorify()
     exe = executable(test_name, fname,
+      c_args: extra_c_args,
       cpp_args: cpp_args + extra_c_args,
       include_directories: [incconfig, incsrc],
       dependencies: deps,