Skip to content

Commit 3de392c

Browse files
committed
oop, don't overwrite resources
1 parent 518d858 commit 3de392c

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/meson.build

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ resources = gnome.compile_resources(
1010
source_dir: 'gtk',
1111
)
1212

13+
if target_machine.system() == 'windows'
14+
windows = import('windows')
15+
# this picks up the windres binary from the WINDRES env var
16+
resources += windows.compile_resources('vipsdisp.rc', args: '-O coff', depend_files: 'vipsdisp.ico')
17+
endif
18+
1319
headers = files (
1420
'displaybar.h',
1521
'fuzzy.h',
@@ -56,19 +62,11 @@ enumtypes = gnome.mkenums(
5662
c_template: 'enumtypes.c.in',
5763
)
5864

59-
resources = []
60-
if target_machine.system() == 'windows'
61-
windows = import('windows')
62-
# this picks up windres from the WINDRES env var
63-
resources += windows.compile_resources('vipsdisp.rc', args: '-O coff', depend_files: 'vipsdisp.ico')
64-
endif
65-
6665
executable('vipsdisp', [
6766
enumtypes,
6867
marshal,
6968
resources,
7069
sources,
71-
resources,
7270
],
7371
dependencies: vipsdisp_deps,
7472
win_subsystem: 'windows',

0 commit comments

Comments
 (0)