diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-06-30 12:47:19 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-08-28 18:57:22 +0100 |
| commit | 2a5f7eb39f74453573f5030e4ce0b3fff21e2cd4 (patch) | |
| tree | b3e6c831c919511ed5d067ac7e4fa1661dc6c6a6 | |
| parent | f8366e96542a6448beb8d142dc32aec4a3704126 (diff) | |
meson: Add dependencies for hw/xwin/ resource compilation
Only has effect with meson >= 0.47.0
| -rw-r--r-- | hw/xwin/meson.build | 4 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/hw/xwin/meson.build b/hw/xwin/meson.build index f09c5a435..34efcb2aa 100644 --- a/hw/xwin/meson.build +++ b/hw/xwin/meson.build @@ -105,7 +105,7 @@ srcs_windows += [ ] convert = find_program('convert') -custom_target( +x_ico = custom_target( 'xlogo-icon', command: [convert, '-background', 'transparent', '-trim', '-define', 'icon:auto-resize', '@INPUT@', '@OUTPUT@'], input: 'X.svg', @@ -116,6 +116,8 @@ rsrc = windows.compile_resources( 'XWin.rc', args: ['--use-temp-file', '-DHOST="@0@-@1@"'.format(host_machine.system(), host_machine.cpu_family())], include_directories: [include_directories('.'), include_directories('../../include/')], + depend_files: ['XWin.exe.manifest'], + depends: x_ico, ) srcs_windows += rsrc diff --git a/meson.build b/meson.build index 057d91312..5a5a6a5e0 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project('xserver', 'c', 'c_std=gnu99', ], version: '1.20.0', - meson_version: '>= 0.42.0', + meson_version: '>= 0.47.0', ) add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c') cc = meson.get_compiler('c') |