meson: Really fix Broadway builds

We must also feed rawinflate.min.js into gen-c-array.py, so that the
windows really show up in the browser when running GTK programs using
broadway.

2 files changed, 7 insertions, 6 deletions

diff --git a/gdk/broadway/gen-c-array.py b/gdk/broadway/gen-c-array.py
index afffda34e5..70c0dc9fca 100644
--- a/gdk/broadway/gen-c-array.py
+++ b/gdk/broadway/gen-c-array.py
@@ -9,13 +9,14 @@ parser.add_argument('--output', metavar='FILE', help='Output file',
                     type=argparse.FileType('w'),
                     default=sys.stdout)
 parser.add_argument('input', metavar='FILE', help='The input file',
-                    type=argparse.FileType('r'))
+                    type=argparse.FileType('r'), nargs='+')
 
 args = parser.parse_args()
 
 args.output.write('static const char {}[] = {{\n'.format(args.array_name))
-for line in args.input:
-    for ch in line:
-        args.output.write('  0x{:02x},\n'.format(ord(ch)))
+for input in args.input:
+    for line in input:
+        for ch in line:
+            args.output.write('  0x{:02x},\n'.format(ord(ch)))
 
 args.output.write('};')
diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build
index 1e2e3044af..27dc52a872 100644
--- a/gdk/broadway/meson.build
+++ b/gdk/broadway/meson.build
@@ -45,13 +45,13 @@ clienthtml_h = custom_target('clienthtml.h',
 )
 
 broadwayjs_h = custom_target('broadwayjs.h',
-  input : ['broadway.js'],
+  input : ['broadway.js', 'rawinflate.min.js'],
   output : 'broadwayjs.h',
   command : [
     gen_c_array,
     '--array-name=broadway_js',
     '--output=@OUTPUT@',
-    '@INPUT0@',
+    '@INPUT0@','@INPUT1@',
   ],
 )