Merge branch 'wip/smcv/issue3564' into 'main'

girepository: Correct --c-include arguments for GIO Unix/Windows headers

Closes #3564

See merge request GNOME/glib!4439
This commit is contained in:
Philip Withnall 2024-12-16 13:44:24 +00:00
commit 2e48a3ffc7

View File

@ -242,14 +242,14 @@ gio_gir_args = [
if host_system == 'windows'
gio_gir_sources += [ gio_win32_include_headers, win32_sources ]
foreach h: gio_win32_include_headers
gio_gir_args += '--c-include=' + h.full_path()
gio_gir_args += '--c-include=gio/' + fs.name(h)
endforeach
gio_gir_packages += 'gio-windows-2.0'
gio_gir_args += '--pkg=gio-windows-2.0'
else
gio_gir_sources += [ gio_unix_include_headers, unix_sources ]
foreach h: gio_unix_include_headers
gio_gir_args += '--c-include=' + h.full_path()
gio_gir_args += '--c-include=gio/' + fs.name(h)
endforeach
gio_gir_packages += 'gio-unix-2.0'
gio_gir_args += '--pkg=gio-unix-2.0'
@ -278,7 +278,7 @@ gio_gir = gnome.generate_gir(libgio,
if host_system == 'windows'
gio_win32_gir_c_includes = []
foreach h: gio_win32_include_headers
gio_win32_gir_c_includes += '--c-include=' + h.full_path()
gio_win32_gir_c_includes += '--c-include=gio/' + fs.name(h)
endforeach
gio_win32_gir = gnome.generate_gir(libgio,
@ -308,7 +308,7 @@ if host_system == 'windows'
else
gio_unix_gir_c_includes = []
foreach h: gio_unix_include_headers
gio_unix_gir_c_includes += '--c-include=' + h.full_path()
gio_unix_gir_c_includes += '--c-include=gio/' + fs.name(h)
endforeach
gio_unix_gir = gnome.generate_gir(libgio,