From 1a163bdb8b4878f456fb04b33978a92f3fcd8e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Thu, 11 Aug 2022 11:36:31 +0200 Subject: Resolve a few issues with MSYS2 cross-builds - Fix launching of subprocesses (missing gspawn helpers). - Discard unused GSettings schemas. - Make the program find its user guide. - Bundle a somewhat suboptimal version of ExifTool. --- meson.build | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meson.build') diff --git a/meson.build b/meson.build index d646a2a..93c982c 100644 --- a/meson.build +++ b/meson.build @@ -77,6 +77,10 @@ conf.set_quoted('PROJECT_NAME', meson.project_name()) conf.set_quoted('PROJECT_VERSION', meson.project_version()) conf.set_quoted('PROJECT_NS', application_ns) conf.set_quoted('PROJECT_DOCDIR', get_option('prefix') / docdir) +if host_machine.system() == 'windows' + conf.set_quoted('PROJECT_DOCDIR', docdir) +endif + conf.set('HAVE_JPEG_QS', libjpegqs.found()) conf.set('HAVE_LCMS2', lcms2.found()) conf.set('HAVE_LIBRAW', libraw.found()) @@ -86,6 +90,7 @@ conf.set('HAVE_XCURSOR', xcursor.found()) conf.set('HAVE_LIBHEIF', libheif.found()) conf.set('HAVE_LIBTIFF', libtiff.found()) conf.set('HAVE_GDKPIXBUF', gdkpixbuf.found()) + configure_file( output : 'config.h', configuration : conf, -- cgit v1.2.3