luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 10:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-4159-win-pc-file-glib-2-80' into 'glib-2-80'

Browse Source 
Backport !4159 “introspection: Correct GIO-Windows pkg-config name” to glib-2-80

See merge request GNOME/glib!4160
This commit is contained in:
Michael Catanzaro 2024-07-19 05:08:51 +00:00
commit 5706816a44
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
girepository/introspection/meson.build
View File

@ -219,8 +219,8 @@ if host_system == 'windows'
foreach h: gio_win32_include_headers foreach h: gio_win32_include_headers
gio_gir_args += '--c-include=@0@'.format(h) gio_gir_args += '--c-include=@0@'.format(h)
endforeach endforeach
gio_gir_packages += 'gio-win32-2.0' gio_gir_packages += 'gio-windows-2.0'
gio_gir_args += '--pkg=gio-win32-2.0' gio_gir_args += '--pkg=gio-windows-2.0'
else else
gio_gir_sources += [ gio_unix_include_headers, unix_sources ] gio_gir_sources += [ gio_unix_include_headers, unix_sources ]
foreach h: gio_unix_include_headers foreach h: gio_unix_include_headers
@ -262,7 +262,7 @@ if host_system == 'windows'
nsversion: '2.0', nsversion: '2.0',
identifier_prefix: gi_identifier_prefix, identifier_prefix: gi_identifier_prefix,
symbol_prefix: gi_symbol_prefix, symbol_prefix: gi_symbol_prefix,
export_packages: [ 'gio-win32-2.0' ], export_packages: [ 'gio-windows-2.0' ],
header: 'gio/gio.h', header: 'gio/gio.h',
includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ], includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ],
install: true, install: true,
@ -274,7 +274,7 @@ if host_system == 'windows'
], ],
env: gi_gen_env_variables, env: gi_gen_env_variables,
extra_args: gir_args + gio_gir_args + gio_win32_gir_c_includes + [ extra_args: gir_args + gio_gir_args + gio_win32_gir_c_includes + [
'--pkg=gio-win32-2.0', '--pkg=gio-windows-2.0',
'--symbol-prefix=g_win32', '--symbol-prefix=g_win32',
'--identifier-prefix=GWin32' '--identifier-prefix=GWin32'
], ],