ccode, compiler: Include compat headers for MSVC

The generated code include unistd.h and utime.h, so include the compat
headers in $(srcroot)/msvc to cover for those.

diff --git a/ccode/meson.build b/ccode/meson.build
index 099851ac89bbd5ac68dc073085897f74f81e9b10..e1e251b4db10d432521d7bf837fbfd723b8b8481 100644 (file)
--- a/ccode/meson.build
+++ b/ccode/meson.build
@@ -57,10 +57,17 @@ valaccode_sources = files(
        'valaccodewriter.vala'
 )
 
+extra_ccode_include_dirs = []
+
+if cc.get_argument_syntax() == 'msvc'
+       extra_ccode_include_dirs += include_directories('../msvc')
+endif
+
 valaccode_lib = static_library(
        'valaccode',
        valaccode_sources,
        dependencies: [gobject_dep, valagee_dep, valacore_dep],
+       include_directories: extra_ccode_include_dirs,
        install: false,
        vala_header: 'valaccode.h',
        vala_vapi: 'valaccode.vapi',

diff --git a/compiler/meson.build b/compiler/meson.build
index 25e934ee84695038dbcfdbbb93d223f69b52d2d0..d2761a44d432b2fec2008f42f2b98fca5a94c6c9 100644 (file)
--- a/compiler/meson.build
+++ b/compiler/meson.build
@@ -4,9 +4,16 @@ valac_sources = files(
 
 valac_name = 'valac@0@'.format(vala_version_suffix)
 
+extra_compiler_include_dirs = []
+
+if cc.get_argument_syntax() == 'msvc'
+       extra_compiler_include_dirs += include_directories('../msvc')
+endif
+
 valac_exe = executable(
        valac_name,
        valac_sources,
+       include_directories: extra_compiler_include_dirs,
        dependencies: [glib_dep, valacodegen_dep],
        install: true,
 )