From 99b26789d2ff2874ec8adf760416f2434e3093ad Mon Sep 17 00:00:00 2001
From: Mathieu Duponchelle <mathieu@centricular.com>
Date: Thu, 17 May 2018 14:53:20 -0700
Subject: [PATCH] meson: more windows fixes

---
 src/meson.build  | 14 +++++++++---
 util/meson.build | 59 ++++++++++++++++++++++++++----------------------
 2 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/src/meson.build b/src/meson.build
index 0a0577c45..85d2121c2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -184,12 +184,17 @@ libharfbuzz = library('harfbuzz', hb_sources,
   include_directories: [incbase, incucdn],
   dependencies: deps,
   cpp_args: cpp_args,
-)
+  vs_module_defs: 'harfbuzz.def',
+  soversion: '0',
+  name_prefix: 'lib')
 
 libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources,
   include_directories: incbase,
   link_with: [libharfbuzz],
-  cpp_args: cpp_args)
+  cpp_args: cpp_args,
+  vs_module_defs: 'harfbuzz-subset.def',
+  soversion: '0',
+  name_prefix: 'lib')
 
 if conf.get('HAVE_GOBJECT', 0) == 1
   gnome = import('gnome')
@@ -233,5 +238,8 @@ if conf.get('HAVE_GOBJECT', 0) == 1
     include_directories: incbase,
     dependencies: deps,
     link_with: [libharfbuzz],
-    cpp_args: cpp_args)
+    cpp_args: cpp_args,
+    vs_module_defs: 'harfbuzz-gobject.def',
+    soversion: '0',
+    name_prefix: 'lib')
 endif
diff --git a/util/meson.build b/util/meson.build
index 483babb5b..0320127d8 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -22,30 +22,35 @@ hb_subset_cli_sources = [
   'options.cc',
 ]
 
-hb_view = executable('hb-view', hb_view_sources,
-  cpp_args: cpp_args,
-  include_directories: [incbase, incsrc],
-  dependencies: deps,
-  link_with: [libharfbuzz]
-)
-
-hb_shape = executable('hb-shape', hb_shape_sources,
-  cpp_args: cpp_args,
-  include_directories: [incbase, incsrc],
-  dependencies: deps,
-  link_with: [libharfbuzz]
-)
-
-hb_subset = executable('hb-subset', hb_subset_cli_sources,
-  cpp_args: cpp_args,
-  include_directories: [incbase, incsrc],
-  dependencies: deps,
-  link_with: [libharfbuzz, libharfbuzz_subset]
-)
-
-hb_ot_shape_closure = executable('hb-ot-shape-closure', hb_ot_shape_closure_sources,
-  cpp_args: cpp_args,
-  include_directories: [incbase, incsrc],
-  dependencies: deps,
-  link_with: [libharfbuzz]
-)
+if conf.get('HAVE_GLIB', 0) == 1
+  if conf.get('HAVE_FREETYPE', 0) == 1 and conf.get('HAVE_CAIRO_FT', 0) == 1
+
+    hb_view = executable('hb-view', hb_view_sources,
+      cpp_args: cpp_args,
+      include_directories: [incbase, incsrc],
+      dependencies: deps,
+      link_with: [libharfbuzz]
+    )
+  endif
+
+  hb_shape = executable('hb-shape', hb_shape_sources,
+    cpp_args: cpp_args,
+    include_directories: [incbase, incsrc],
+    dependencies: deps,
+    link_with: [libharfbuzz]
+  )
+
+  hb_subset = executable('hb-subset', hb_subset_cli_sources,
+    cpp_args: cpp_args,
+    include_directories: [incbase, incsrc],
+    dependencies: deps,
+    link_with: [libharfbuzz, libharfbuzz_subset]
+  )
+
+  hb_ot_shape_closure = executable('hb-ot-shape-closure', hb_ot_shape_closure_sources,
+    cpp_args: cpp_args,
+    include_directories: [incbase, incsrc],
+    dependencies: deps,
+    link_with: [libharfbuzz]
+  )
+endif
\ No newline at end of file