summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
Diffstat (limited to 'pango')
-rw-r--r--pango/Makefile.am2
-rw-r--r--pango/meson.build4
2 files changed, 4 insertions, 2 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 0ce84357..b360533d 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -393,7 +393,7 @@ libpangowin32_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
libpangowin32_1_0_la_LIBADD = \
libpango-$(PANGO_API_VERSION).la \
$(GLIB_LIBS) \
- -lgdi32 -lusp10
+ -lusp10 -lgdi32
libpangowin32_1_0_la_DEPENDENCIES = \
libpango-$(PANGO_API_VERSION).la
libpangowin32_1_0_la_SOURCES = \
diff --git a/pango/meson.build b/pango/meson.build
index 3312d72d..25b939f7 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -304,10 +304,12 @@ if host_system == 'windows'
'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('gdi32'),
cc.find_library('usp10'),
+ cc.find_library('gdi32'),
]
pangowin32_rc = configure_file(