[gobject-introspection: 4/5] meson: also build gi-dump-types on Windows



commit 89c81712570e98e5ee411275c0fa467a6b61e977
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Tue May 19 19:39:34 2020 +0200

    meson: also build gi-dump-types on Windows

 girepository/gi-dump-types.c | 1 +
 girepository/meson.build     | 4 ++--
 meson.build                  | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/girepository/gi-dump-types.c b/girepository/gi-dump-types.c
index 8dae9c02..aeef774c 100644
--- a/girepository/gi-dump-types.c
+++ b/girepository/gi-dump-types.c
@@ -1,6 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #include "gdump.c"
 #ifdef G_OS_WIN32
+  #include <windows.h>
   #include <io.h>  /* For _get_osfhandle() */
   #include <gio/gwin32outputstream.h>
 #else
diff --git a/girepository/meson.build b/girepository/meson.build
index 6cd8fd30..c8ef6aa9 100644
--- a/girepository/meson.build
+++ b/girepository/meson.build
@@ -204,7 +204,7 @@ gthash_test = executable('gthash-test', 'gthash-test.c',
 
 test('gthash-test', gthash_test)
 
-if giounix_dep.found()
+if giounix_dep.found() or giowin_dep.found()
   executable('gi-dump-types', 'gi-dump-types.c',
-    dependencies: [girepo_dep, giounix_dep])
+    dependencies: [girepo_dep, giounix_dep, giowin_dep])
 endif
diff --git a/meson.build b/meson.build
index 6f3ba8c8..506757d2 100644
--- a/meson.build
+++ b/meson.build
@@ -144,12 +144,15 @@ gmodule_dep = dependency('gmodule-2.0', version : glib_version,
 if host_system != 'windows'
   giounix_dep = dependency('gio-unix-2.0', version : glib_version,
     fallback: ['glib', 'libgiounix_dep'])
+  giowin_dep = dependency('', required : false)
 else
   # Don't even try to look for gio-unix-2.0 on Windows because Meson will
   # fruitlessly try to find it in the glib subproject even when we don't want
   # it to look in the subproject at all. Just use a not-found dependency.
   giounix_dep = dependency('', required : false)
   # XXX: Autotools doesn't build girs for gio-win32-2.0, but maybe we should?
+  giowin_dep = dependency('gio-windows-2.0', version : glib_version,
+    fallback: ['glib', 'libgiowin32_dep'])
 endif
 libffi_dep = dependency('libffi',
   fallback : ['libffi', 'ffi_dep'])


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]