From 67f5dd0df8b302a55e0247dfa37ea451927c6b6c Mon Sep 17 00:00:00 2001 From: Jehan Date: Mon, 26 Feb 2024 15:56:40 +0100 Subject: [PATCH] meson: pass the executable name to `gimp-data` to build gimp.ico. Note that the executables are not built yet at this point, but we just need to pass the name for configuration. The gimp.ico generation step is run manually anyway and requires a fully functional and installed GIMP. See commit gimp-data@40d4822. --- app/meson.build | 4 ++-- meson.build | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/meson.build b/app/meson.build index 21a45a33f1..045ab4e775 100644 --- a/app/meson.build +++ b/app/meson.build @@ -198,7 +198,7 @@ else endif if enable_console_bin - gimpconsole_exe = executable('gimp-console' + exec_ver, + gimpconsole_exe = executable(gimpconsole_exe_name, 'main.c', libapp_sources, console_rc_file, @@ -217,7 +217,7 @@ if enable_console_bin ) endif -gimpmain_exe = executable('gimp' + exec_ver, +gimpmain_exe = executable(gimpmain_exe_name, 'main.c', gui_rc_file, c_args: libapp_c_args, diff --git a/meson.build b/meson.build index 40c77b7220..ba6ab50948 100644 --- a/meson.build +++ b/meson.build @@ -104,6 +104,9 @@ prefix = get_option('prefix') buildtype = get_option('buildtype') exec_ver = '-' + gimp_app_version +gimpconsole_exe_name = 'gimp-console' + exec_ver +gimpmain_exe_name = 'gimp' + exec_ver + compiler_args = [] linker_args = [] @@ -1818,10 +1821,17 @@ subdir('etc') subdir('menus') subdir('themes') +if enable_console_bin + gimp_exe_name=gimpconsole_exe_name +else + gimp_exe_name=gimpmain_exe_name +endif + # Loading gimp-data subproject, the versions must be in sync. gimp_data = subproject('gimp-data', version: '=' + gimp_version, default_options: [ 'gimp-datadir=' + gimpdatadir, + 'gimp-exe=' + gimp_exe_name, ]) icons_imgs_sources = gimp_data.get_variable('icons_imgs_sources') icons_core_sources = gimp_data.get_variable('icons_core_sources')