From 0d98500984b411367789f7ae35fc2a027fcdf739 Mon Sep 17 00:00:00 2001 From: Jehan Date: Mon, 24 Feb 2025 18:37:58 +0100 Subject: [PATCH] Issue #12789: make sure gimp-debug-tool is correctly found on Windows. --- app/errors.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/errors.c b/app/errors.c index d29ea01643..3139ea24f1 100644 --- a/app/errors.c +++ b/app/errors.c @@ -328,12 +328,17 @@ gimp_eek (const gchar *reason, * takes precedence over the command line argument. */ #ifdef G_OS_WIN32 - const gchar *gimpdebug = "gimp-debug-tool-" GIMP_TOOL_VERSION ".exe"; +#ifdef ENABLE_RELOCATABLE_RESOURCES + const gchar *gimpdebug = g_build_filename (gimp_installation_directory (), "bin", + "gimp-debug-tool-" GIMP_TOOL_VERSION ".exe", NULL); +#else + const gchar *gimpdebug = BINDIR "/gimp-debug-tool-" GIMP_TOOL_VERSION ".exe"; +#endif #elif defined (PLATFORM_OSX) const gchar *gimpdebug = "gimp-debug-tool-" GIMP_TOOL_VERSION; #elif !defined (G_OS_WIN32) && !defined (PLATFORM_OSX) && defined ENABLE_RELOCATABLE_RESOURCES const gchar *gimpdebug = g_build_filename (gimp_installation_directory (), - "libexec", "gimp-debug-tool-" GIMP_TOOL_VERSION, NULL); + "libexec", "gimp-debug-tool-" GIMP_TOOL_VERSION, NULL); #else const gchar *gimpdebug = LIBEXECDIR "/gimp-debug-tool-" GIMP_TOOL_VERSION; #endif