From d3ffdd59f88dd99d09cbc2bfd8045eef9ac27b7c Mon Sep 17 00:00:00 2001 From: Melroy van den Berg Date: Sat, 26 Feb 2022 17:24:30 +0100 Subject: [PATCH] Add missing Windows libs for printing - win32. During cross-compiling --- configure.ac | 2 +- meson.build | 2 +- win32/gtkpc.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f99621d568..c28494fdaf 100644 --- a/configure.ac +++ b/configure.ac @@ -395,7 +395,7 @@ if test "$enable_win32_backend" = "yes"; then backend_immodules="$backend_immodules,ime" GDK_WINDOWING="$GDK_WINDOWING #define GDK_WINDOWING_WIN32" - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi -lsetupapi -lcfgmgr32" + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi -lsetupapi -lcfgmgr32 -lwinspool -lcomctl32 -lcomdlg32" AM_CONDITIONAL(USE_WIN32, true) PANGO_PACKAGES="pangowin32 pangocairo" else diff --git a/meson.build b/meson.build index 4f24ff025b..9e15331828 100644 --- a/meson.build +++ b/meson.build @@ -683,7 +683,7 @@ if win32_enabled else pc_gdk_extra_libs += ['-Wl,-luuid'] endif - pc_gdk_extra_libs += ['-lwinmm', '-ldwmapi', '-lsetupapi', '-lcfgmgr32', '-lhid'] + pc_gdk_extra_libs += ['-lwinmm', '-ldwmapi', '-lsetupapi', '-lcfgmgr32', '-lhid', '-lwinspool', '-lcomctl32', '-lcomdlg32'] backend_immodules += ['ime'] # Check whether libepoxy is built with EGL support on Windows diff --git a/win32/gtkpc.py b/win32/gtkpc.py index acdc279f0f..57ec2096eb 100644 --- a/win32/gtkpc.py +++ b/win32/gtkpc.py @@ -30,7 +30,7 @@ def main(argv): atk_min_ver = '2.15.1' cairo_min_ver = '1.14.0' gdk_pixbuf_min_ver = '2.30.0' - gdk_win32_sys_libs = '-lgdi32 -limm32 -lshell32 -lole32 -lwinmm -ldwmapi' + gdk_win32_sys_libs = '-lgdi32 -limm32 -lshell32 -lole32 -lwinmm -ldwmapi -lwinspool -lcomctl32 -lcomdlg32' cairo_libs = '-lcairo-gobject -lcairo ' glib_min_ver = '2.45.8'