GNOME.org
 

[gimp/wip/wormnest/meson] WIP build: try to fix meson on Windows


commit d888ac046f5b98a65703594e6f9d6a8fd24d4be9
Author: Jacob Boerema <jgboerema gmail com>
Date:   Thu Sep 30 13:14:14 2021 -0400

    WIP build: try to fix meson on Windows

 app/meson.build                        | 4 +++-
 extensions/goat-exercises/meson.build  | 4 +++-
 plug-ins/file-bmp/meson.build          | 4 +++-
 plug-ins/file-dds/meson.build          | 4 +++-
 plug-ins/file-exr/meson.build          | 4 +++-
 plug-ins/file-faxg3/meson.build        | 4 +++-
 plug-ins/file-fits/meson.build         | 4 +++-
 plug-ins/file-fli/meson.build          | 4 +++-
 plug-ins/file-ico/meson.build          | 4 +++-
 plug-ins/file-jpeg/meson.build         | 4 +++-
 plug-ins/file-psd/meson.build          | 4 +++-
 plug-ins/file-sgi/meson.build          | 4 +++-
 plug-ins/file-tiff/meson.build         | 4 +++-
 plug-ins/file-webp/meson.build         | 4 +++-
 plug-ins/flame/meson.build             | 4 +++-
 plug-ins/fractal-explorer/meson.build  | 4 +++-
 plug-ins/gfig/meson.build              | 4 +++-
 plug-ins/gimpressionist/meson.build    | 4 +++-
 plug-ins/gradient-flare/meson.build    | 4 +++-
 plug-ins/help-browser/meson.build      | 4 +++-
 plug-ins/help/meson.build              | 4 +++-
 plug-ins/ifs-compose/meson.build       | 4 +++-
 plug-ins/imagemap/meson.build          | 4 +++-
 plug-ins/lighting/meson.build          | 4 +++-
 plug-ins/map-object/meson.build        | 4 +++-
 plug-ins/pagecurl/meson.build          | 4 +++-
 plug-ins/print/meson.build             | 4 +++-
 plug-ins/script-fu/meson.build         | 4 +++-
 plug-ins/selection-to-path/meson.build | 4 +++-
 plug-ins/twain/meson.build             | 4 +++-
 30 files changed, 90 insertions(+), 30 deletions(-)
---
diff --git a/app/meson.build b/app/meson.build
index 6f615c6e7c..84869ef57f 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -184,7 +184,9 @@ if platform_windows
     copy: true,
   )
   gui_rc_file = windows.compile_resources(
-    gimp_app_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(gui_rc_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(gui_rc_name),
diff --git a/extensions/goat-exercises/meson.build b/extensions/goat-exercises/meson.build
index d53b54847a..dcc24da041 100644
--- a/extensions/goat-exercises/meson.build
+++ b/extensions/goat-exercises/meson.build
@@ -9,7 +9,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plug_in_name + '-c.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plug_in_name),
diff --git a/plug-ins/file-bmp/meson.build b/plug-ins/file-bmp/meson.build
index d1ede2ca25..cfae3badc0 100644
--- a/plug-ins/file-bmp/meson.build
+++ b/plug-ins/file-bmp/meson.build
@@ -8,7 +8,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-dds/meson.build b/plug-ins/file-dds/meson.build
index da8b2fa67b..64045e745e 100644
--- a/plug-ins/file-dds/meson.build
+++ b/plug-ins/file-dds/meson.build
@@ -12,7 +12,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-exr/meson.build b/plug-ins/file-exr/meson.build
index 7ff9237797..1a60048f71 100644
--- a/plug-ins/file-exr/meson.build
+++ b/plug-ins/file-exr/meson.build
@@ -9,7 +9,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-faxg3/meson.build b/plug-ins/file-faxg3/meson.build
index 4642edbd74..5ee7548236 100644
--- a/plug-ins/file-faxg3/meson.build
+++ b/plug-ins/file-faxg3/meson.build
@@ -7,7 +7,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-fits/meson.build b/plug-ins/file-fits/meson.build
index 95ba044e53..959c8ec062 100644
--- a/plug-ins/file-fits/meson.build
+++ b/plug-ins/file-fits/meson.build
@@ -7,7 +7,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-fli/meson.build b/plug-ins/file-fli/meson.build
index ed4b3d8697..ad15a8b40a 100644
--- a/plug-ins/file-fli/meson.build
+++ b/plug-ins/file-fli/meson.build
@@ -7,7 +7,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-ico/meson.build b/plug-ins/file-ico/meson.build
index b657e16b38..9115dba387 100644
--- a/plug-ins/file-ico/meson.build
+++ b/plug-ins/file-ico/meson.build
@@ -9,7 +9,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-jpeg/meson.build b/plug-ins/file-jpeg/meson.build
index 7ba13bc082..4bc78d2226 100644
--- a/plug-ins/file-jpeg/meson.build
+++ b/plug-ins/file-jpeg/meson.build
@@ -11,7 +11,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-psd/meson.build b/plug-ins/file-psd/meson.build
index 9e13114c1b..68c63e4180 100644
--- a/plug-ins/file-psd/meson.build
+++ b/plug-ins/file-psd/meson.build
@@ -12,7 +12,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-sgi/meson.build b/plug-ins/file-sgi/meson.build
index 954923654e..39c56e3b10 100644
--- a/plug-ins/file-sgi/meson.build
+++ b/plug-ins/file-sgi/meson.build
@@ -7,7 +7,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-tiff/meson.build b/plug-ins/file-tiff/meson.build
index c3d3c51b5a..39d84fd95a 100644
--- a/plug-ins/file-tiff/meson.build
+++ b/plug-ins/file-tiff/meson.build
@@ -9,7 +9,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-webp/meson.build b/plug-ins/file-webp/meson.build
index 990e0d7e06..fefe9db41b 100644
--- a/plug-ins/file-webp/meson.build
+++ b/plug-ins/file-webp/meson.build
@@ -11,7 +11,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/flame/meson.build b/plug-ins/flame/meson.build
index 6dcd6ea676..652e7e8984 100644
--- a/plug-ins/flame/meson.build
+++ b/plug-ins/flame/meson.build
@@ -9,7 +9,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/fractal-explorer/meson.build b/plug-ins/fractal-explorer/meson.build
index 865d9ec288..054da9daec 100644
--- a/plug-ins/fractal-explorer/meson.build
+++ b/plug-ins/fractal-explorer/meson.build
@@ -9,7 +9,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/gfig/meson.build b/plug-ins/gfig/meson.build
index a77f321018..1dbe1911cb 100644
--- a/plug-ins/gfig/meson.build
+++ b/plug-ins/gfig/meson.build
@@ -25,7 +25,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/gimpressionist/meson.build b/plug-ins/gimpressionist/meson.build
index 8385ebdd91..e5ef0c8972 100644
--- a/plug-ins/gimpressionist/meson.build
+++ b/plug-ins/gimpressionist/meson.build
@@ -27,7 +27,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/gradient-flare/meson.build b/plug-ins/gradient-flare/meson.build
index b20f572667..841246c9d7 100644
--- a/plug-ins/gradient-flare/meson.build
+++ b/plug-ins/gradient-flare/meson.build
@@ -8,7 +8,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/help-browser/meson.build b/plug-ins/help-browser/meson.build
index a801f400ce..da47f70349 100644
--- a/plug-ins/help-browser/meson.build
+++ b/plug-ins/help-browser/meson.build
@@ -12,7 +12,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/help/meson.build b/plug-ins/help/meson.build
index 1f07710935..114216cfc5 100644
--- a/plug-ins/help/meson.build
+++ b/plug-ins/help/meson.build
@@ -11,7 +11,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/ifs-compose/meson.build b/plug-ins/ifs-compose/meson.build
index 2a74c6b362..7d4138750f 100644
--- a/plug-ins/ifs-compose/meson.build
+++ b/plug-ins/ifs-compose/meson.build
@@ -8,7 +8,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/imagemap/meson.build b/plug-ins/imagemap/meson.build
index 7b8868ac96..24ae06b957 100644
--- a/plug-ins/imagemap/meson.build
+++ b/plug-ins/imagemap/meson.build
@@ -71,7 +71,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/lighting/meson.build b/plug-ins/lighting/meson.build
index 2a4d756786..2274d55bbf 100644
--- a/plug-ins/lighting/meson.build
+++ b/plug-ins/lighting/meson.build
@@ -15,7 +15,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/map-object/meson.build b/plug-ins/map-object/meson.build
index a1b79b2eb6..bf0171e5ec 100644
--- a/plug-ins/map-object/meson.build
+++ b/plug-ins/map-object/meson.build
@@ -14,7 +14,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/pagecurl/meson.build b/plug-ins/pagecurl/meson.build
index f2df4fc605..c9c3ab5d04 100644
--- a/plug-ins/pagecurl/meson.build
+++ b/plug-ins/pagecurl/meson.build
@@ -39,7 +39,9 @@ plugin_sources += gnome.compile_resources(
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/print/meson.build b/plug-ins/print/meson.build
index 9e18589313..aeacea4991 100644
--- a/plug-ins/print/meson.build
+++ b/plug-ins/print/meson.build
@@ -15,7 +15,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/script-fu/meson.build b/plug-ins/script-fu/meson.build
index 1a2fb4ccb2..509590373b 100644
--- a/plug-ins/script-fu/meson.build
+++ b/plug-ins/script-fu/meson.build
@@ -25,7 +25,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/selection-to-path/meson.build b/plug-ins/selection-to-path/meson.build
index 1d008e9547..dd3ce82023 100644
--- a/plug-ins/selection-to-path/meson.build
+++ b/plug-ins/selection-to-path/meson.build
@@ -14,7 +14,9 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/twain/meson.build b/plug-ins/twain/meson.build
index bf75f25457..b10eaa279f 100644
--- a/plug-ins/twain/meson.build
+++ b/plug-ins/twain/meson.build
@@ -12,7 +12,9 @@ plugin_sources = [
 ]
 
 plugin_sources += windows.compile_resources(
-  gimp_plugins_rc,
+    depends: [
+      gimp_plugins_rc,
+    ],
   args: [
     '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
     '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]