[dia: 57/105] #19: Some Windows build fixes (still not working ATM).
- From: Zander <zbrown src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia: 57/105] #19: Some Windows build fixes (still not working ATM).
- Date: Mon, 28 Jan 2019 19:24:07 +0000 (UTC)
commit 73f5d711139c985d36c6cd9ccc9be77b2ed32bc8
Author: Eduard Nicodei <eddnicodei gmail com>
Date: Wed Jan 2 18:32:04 2019 +0000
#19: Some Windows build fixes (still not working ATM).
- Make libc optional: assuming any c compiler will either have it
explicit or, if not, then still have it implicit.
- freedep version < 22.0.0 - version 22 caused undef refs:
`pango_ft2_get_context` in font.c and `pango_ft2_render_layout` in
diagdkrenderer.c.
- Define PREFIX in config.h.
meson.build | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index c04f50f7..9ce9a783 100644
--- a/meson.build
+++ b/meson.build
@@ -20,10 +20,10 @@ libzlib_dep = dependency('zlib')
#TODO: this is optional. Should it be a disabler?
libcairo_dep = dependency('cairo')
libm_dep = cc.find_library('m')
-libc_dep = cc.find_library('c')
+libc_dep = cc.find_library('c', required : false)
# Optional deps
-freetype_dep = dependency('freetype2', version: '>= 11.0.5', required: false)
+freetype_dep = dependency('freetype2', version: ['>= 11.0.5', '< 22.0.0'], required: false)
conf.set('HAVE_FREETYPE', freetype_dep.found())
libpoppler_dep = dependency('poppler', version: '<= 0.62.0', required: false)
conf.set('HAVE_POPPLER', libpoppler_dep.found())
@@ -49,6 +49,7 @@ dialibdir = join_paths(get_option('prefix'),
# Specify a header configuration file
conf.set_quoted('VERSION', meson.project_version())
conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+conf.set_quoted('PREFIX', get_option('prefix'))
conf.set_quoted('DATADIR', datadir)
conf.set_quoted('PKGDATADIR', pkgdatadir)
conf.set_quoted('DIALIBDIR', dialibdir)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]