[pango/wip/one-library] win32: Fix the build
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/wip/one-library] win32: Fix the build
- Date: Tue, 9 Jul 2019 23:18:53 +0000 (UTC)
commit c4780cdb84d228cea82e59f628d0538271cbeee0
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Jul 9 18:52:14 2019 -0400
win32: Fix the build
pango/meson.build | 94 +++++++++++++++++++++++++++++--------------------------
1 file changed, 50 insertions(+), 44 deletions(-)
---
diff --git a/pango/meson.build b/pango/meson.build
index be651aec..e3416a93 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -58,6 +58,22 @@ pango_headers = [
install_headers(pango_headers, subdir: pango_api_path)
+# Features header
+pango_features_conf = configuration_data()
+pango_features_conf.set('PANGO_VERSION_MAJOR', pango_major_version)
+pango_features_conf.set('PANGO_VERSION_MINOR', pango_minor_version)
+pango_features_conf.set('PANGO_VERSION_MICRO', pango_micro_version)
+pango_features_conf.set('PANGO_API_VERSION', pango_api_version)
+pango_features_conf.set('PANGO_CURRENT_MINUS_AGE', '0')
+
+configure_file(
+ input: 'pango-features.h.meson',
+ output: 'pango-features.h',
+ configuration: pango_features_conf,
+ install: true,
+ install_dir: join_paths(pango_includedir, pango_api_path),
+)
+
# FreeType
if build_pangoft2
pangoft2_headers = [
@@ -140,21 +156,40 @@ if cairo_dep.found()
pango_sources += pangocairo_sources
endif
-# Features header
-pango_features_conf = configuration_data()
-pango_features_conf.set('PANGO_VERSION_MAJOR', pango_major_version)
-pango_features_conf.set('PANGO_VERSION_MINOR', pango_minor_version)
-pango_features_conf.set('PANGO_VERSION_MICRO', pango_micro_version)
-pango_features_conf.set('PANGO_API_VERSION', pango_api_version)
-pango_features_conf.set('PANGO_CURRENT_MINUS_AGE', '0')
+# Win32
+if host_system == 'windows'
+ pangowin32_headers = [
+ 'pangowin32.h',
+ ]
-configure_file(
- input: 'pango-features.h.meson',
- output: 'pango-features.h',
- configuration: pango_features_conf,
- install: true,
- install_dir: join_paths(pango_includedir, pango_api_path),
-)
+ pangowin32_sources = [
+ 'pangowin32.c',
+ 'pangowin32-fontcache.c',
+ 'pangowin32-fontmap.c',
+ 'pangowin32-shape.c',
+ ]
+
+ # usp10 needs to be before gdi32
+ # see https://bugzilla.gnome.org/show_bug.cgi?id=795045#c0
+ pangowin32_deps = [
+ libpango_dep,
+ cc.find_library('usp10'),
+ cc.find_library('gdi32'),
+ ]
+
+ pangowin32_rc = configure_file(
+ input: 'pangowin32.rc.in',
+ output: 'pangowin32.rc',
+ configuration: pango_features_conf,
+ )
+ pangowin32_res = import('windows').compile_resources(pangowin32_rc)
+ pangowin32_sources += pangowin32_res
+
+ install_headers(pangowin32_headers, subdir: pango_api_path)
+
+ pango_sources += pangowin32_sources
+ pango_deps += pangowin32_deps
+endif
# Enumerations for GType
pango_enums = gnome.mkenums(
@@ -377,38 +412,9 @@ endif
# Win32
if host_system == 'windows'
- pangowin32_headers = [
- 'pangowin32.h',
- ]
-
- pangowin32_sources = [
- 'pangowin32.c',
- 'pangowin32-fontcache.c',
- 'pangowin32-fontmap.c',
- 'pangowin32-shape.c',
- ]
-
- # usp10 needs to be before gdi32
- # see https://bugzilla.gnome.org/show_bug.cgi?id=795045#c0
- pangowin32_deps = pango_deps + [
- libpango_dep,
- cc.find_library('usp10'),
- cc.find_library('gdi32'),
- ]
-
- pangowin32_rc = configure_file(
- input: 'pangowin32.rc.in',
- output: 'pangowin32.rc',
- configuration: pango_features_conf,
- )
- pangowin32_res = import('windows').compile_resources(pangowin32_rc)
- pangowin32_sources += pangowin32_res
-
- install_headers(pangowin32_headers, subdir: pango_api_path)
-
libpangowin32 = library(
'pangowin32-@0@'.format(pango_api_version),
- sources: pangowin32_sources,
+ sources: [],
version: pango_libversion,
soversion: pango_soversion,
install: true,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]