From 84ff404a173f860e2e54b2dc684481455d328d19 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 19 Mar 2018 16:53:57 +0800 Subject: [PATCH] Visual Studio builds: Fix .pc generation Since the Cairo build files for Visual Studio does not really generate the pkg-config files for us, and we stopped making makeshift ones in gobject-introspection, stop making the .pc files we generate here refer to the Cairo .pc's, and instead make them link directly to cairo-gobject.lib and cairo.lib. --- build/win32/gtkpc.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/build/win32/gtkpc.py b/build/win32/gtkpc.py index d5d7747fc2..acdc279f0f 100644 --- a/build/win32/gtkpc.py +++ b/build/win32/gtkpc.py @@ -31,9 +31,9 @@ def main(argv): cairo_min_ver = '1.14.0' gdk_pixbuf_min_ver = '2.30.0' gdk_win32_sys_libs = '-lgdi32 -limm32 -lshell32 -lole32 -lwinmm -ldwmapi' + cairo_libs = '-lcairo-gobject -lcairo ' glib_min_ver = '2.45.8' - cairo_backends = 'cairo-win32' gdk_backends = 'win32' gio_package = 'gio-2.0 >= ' + glib_min_ver broadway_extra_libs = '' @@ -43,20 +43,17 @@ def main(argv): # On Visual Studio, we link to zlib1.lib broadway_extra_libs = ' -lzlib1' gdk_backends += ' broadway' - cairo_backends += ' cairo' pkg_replace_items = {'@GTK_API_VERSION@': '3.0', '@GDK_BACKENDS@': gdk_backends} - pkg_required_packages = 'gdk-pixbuf-2.0 >= ' + gdk_pixbuf_min_ver + ' ' + \ - 'cairo >= ' + cairo_min_ver + ' ' + \ - 'cairo-gobject >= ' + cairo_min_ver + pkg_required_packages = 'gdk-pixbuf-2.0 >= ' + gdk_pixbuf_min_ver gdk_pc_replace_items = {'@GDK_PACKAGES@': gio_package + ' ' + \ 'pangowin32 pangocairo' + ' ' + \ pkg_required_packages, - '@GDK_PRIVATE_PACKAGES@': gio_package + ' ' + cairo_backends, - '@GDK_EXTRA_LIBS@': gdk_win32_sys_libs + broadway_extra_libs, + '@GDK_PRIVATE_PACKAGES@': gio_package, + '@GDK_EXTRA_LIBS@': cairo_libs + gdk_win32_sys_libs + broadway_extra_libs, '@GDK_EXTRA_CFLAGS@': '', 'gdk-3': 'gdk-3.0'}