From 806a0be71e3ccc655cd05f6fb36890b49fa3cdea Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 26 Jan 2022 13:08:46 +0800 Subject: [PATCH] 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. --- ccode/meson.build | 7 +++++++ compiler/meson.build | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/ccode/meson.build b/ccode/meson.build index 099851ac8..e1e251b4d 100644 --- 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 25e934ee8..d2761a44d 100644 --- 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, ) -- 2.47.2