From 6f347b6754827d0924f8c5f351a2578bfd9852fb Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Sat, 2 Aug 2025 10:55:54 +0200 Subject: [PATCH 1/2] Meson: use `host_machine` rather than `target_machine` See: https://mesonbuild.com/Cross-compilation.html --- src/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meson.build b/src/meson.build index 8460bd8..d08e47f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -10,7 +10,7 @@ resources = gnome.compile_resources( source_dir: 'gtk', ) -if target_machine.system() == 'windows' +if host_machine.system() == 'windows' windows = import('windows') resources += windows.compile_resources('vipsdisp.rc', args: ['-O', 'coff'], From 894adc92b2fa4a2e972f9c00fcf8a8445b8d1140 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Sat, 2 Aug 2025 11:02:09 +0200 Subject: [PATCH 2/2] Meson: remove redundant `-O coff` args Meson already generates a COFF object by default when using windres. --- src/meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/meson.build b/src/meson.build index d08e47f..e01cd3a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -12,9 +12,10 @@ resources = gnome.compile_resources( if host_machine.system() == 'windows' windows = import('windows') - resources += windows.compile_resources('vipsdisp.rc', - args: ['-O', 'coff'], - depend_files: 'vipsdisp.ico') + resources += windows.compile_resources( + 'vipsdisp.rc', + depend_files: 'vipsdisp.ico', + ) endif headers = files (