p
/
fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve native MSYS2 build compatibility

This commit is contained in:
Přemysl Eric Janouch 2023-06-21 18:38:01 +02:00
parent 0318424540
commit a4772ce319
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meson.build
View File

@ -139,7 +139,8 @@ if win32
'--width', size, '--height', size, '@INPUT@']) '--width', size, '--height', size, '@INPUT@'])
endforeach endforeach
icon_ico = custom_target(input : icon_png_list, output : 'fiv.ico', icon_ico = custom_target('fiv.ico',
output : 'fiv.ico', input : icon_png_list,
command : [icotool, '-c', '-o', '@OUTPUT@', '@INPUT@']) command : [icotool, '-c', '-o', '@OUTPUT@', '@INPUT@'])
rc += windows.compile_resources('fiv.rc', depends : icon_ico) rc += windows.compile_resources('fiv.rc', depends : icon_ico)
endif endif
@ -207,16 +208,21 @@ endforeach
# For the purposes of development: make the program find its GSettings schemas. # For the purposes of development: make the program find its GSettings schemas.
gnome.compile_schemas(depend_files : files(gsettings_schemas)) gnome.compile_schemas(depend_files : files(gsettings_schemas))
# Validate various files, if there are tools around to do it. # Meson is broken on Windows and removes the backslashes, so this ends up empty.
xmls = ['fiv.svg', 'fiv.manifest', 'resources/resources.gresource.xml'] + \ symbolics = run_command(find_program('sed', required : false, disabler : true),
gsettings_schemas '-n', 's@.*>\\([^<>]*[.]svg\\)<.*@resources/\\1@p',
xmls += run_command(find_program('sed', required : false, disabler : true),
'-n', 's@.*>\([^<>]*[.]svg\)<.*@resources/\\1@p',
configure_file( configure_file(
input : 'resources/resources.gresource.xml', input : 'resources/resources.gresource.xml',
output : 'resources.gresource.xml.stamp', output : 'resources.gresource.xml.stamp',
copy : true, copy : true,
), capture : true, check : true).stdout().strip().split('\n') ), capture : true, check : true).stdout().strip()
# Validate various files, if there are tools around to do it.
xmls = ['fiv.svg', 'fiv.manifest', 'resources/resources.gresource.xml'] + \
gsettings_schemas
if symbolics != ''
xmls += symbolics.split('\n')
endif
xmlwf = find_program('xmlwf', required : false, disabler : true) xmlwf = find_program('xmlwf', required : false, disabler : true)
xmllint = find_program('xmllint', required : false, disabler : true) xmllint = find_program('xmllint', required : false, disabler : true)