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. --- fiv.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'fiv.c') diff --git a/fiv.c b/fiv.c index 92047bc..670661e 100644 --- a/fiv.c +++ b/fiv.c @@ -1166,7 +1166,13 @@ static void show_help_contents(void) { gchar *filename = g_strdup_printf("%s.html", PROJECT_NAME); +#ifdef G_OS_WIN32 + gchar *prefix = g_win32_get_package_installation_directory_of_module(NULL); + gchar *path = g_build_filename(prefix, PROJECT_DOCDIR, filename, NULL); + g_free(prefix); +#else gchar *path = g_build_filename(PROJECT_DOCDIR, filename, NULL); +#endif g_free(filename); GError *error = NULL; gchar *uri = g_filename_to_uri(path, NULL, &error); @@ -1945,7 +1951,7 @@ output_thumbnail(gchar **uris, gboolean extract, const char *size_arg) #ifdef G_OS_WIN32 _setmode(fileno(stdout), _O_BINARY); -#endif // G_OS_WIN32 +#endif GError *error = NULL; GFile *file = g_file_new_for_uri(uris[0]); -- cgit v1.2.3