From: Marc-André Lureau Date: Thu, 18 Aug 2022 15:57:17 +0000 (+0400) Subject: build-sys: generate GdkWin32.gir X-Git-Tag: archive/raspbian/4.8.3+ds-2+rpi1~3^2~20^2~3^2~64^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8ab57fc8ef47564b9d9757bdb1cf4d36eb6346c9;p=gtk4.git build-sys: generate GdkWin32.gir Signed-off-by: Marc-André Lureau --- diff --git a/gdk/win32/meson.build b/gdk/win32/meson.build index 66442bd9f4..bcf7d7c78f 100644 --- a/gdk/win32/meson.build +++ b/gdk/win32/meson.build @@ -1,6 +1,19 @@ -gdk_win32_sources = files([ - 'gdkcairocontext-win32.c', +gdk_win32_public_sources = files([ 'gdkcursor-win32.c', + 'gdkdisplay-win32.c', + 'gdkdisplaymanager-win32.c', + 'gdkdrag-win32.c', + 'gdkglcontext-win32.c', + 'gdkglcontext-win32-wgl.c', + 'gdkwin32id.c', + 'gdksurface-win32.c', + 'gdkevents-win32.c', + 'gdkmonitor-win32.c', + 'gdkscreen-win32.c', +]) + +gdk_win32_sources = gdk_win32_public_sources + files([ + 'gdkcairocontext-win32.c', 'gdkclipboard-win32.c', 'gdkclipdrop-win32.c', 'gdkdevicemanager-win32.c', @@ -8,13 +21,7 @@ gdk_win32_sources = files([ 'gdkdevice-win32.c', 'gdkdevice-winpointer.c', 'gdkdevice-wintab.c', - 'gdkdisplay-win32.c', - 'gdkdisplaymanager-win32.c', - 'gdkdrag-win32.c', 'gdkdrop-win32.c', - 'gdkevents-win32.c', - 'gdkglcontext-win32.c', - 'gdkglcontext-win32-wgl.c', 'gdkglobals-win32.c', 'gdkhdataoutputstream-win32.c', 'gdkinput-dmanipulation.c', @@ -24,15 +31,11 @@ gdk_win32_sources = files([ 'gdkkeys-win32-impl-wow64.c', 'gdkwin32langnotification.c', 'gdkmain-win32.c', - 'gdkmonitor-win32.c', 'gdkproperty-win32.c', - 'gdkscreen-win32.c', 'gdkvulkancontext-win32.c', 'gdkwin32cursor.h', 'gdkwin32display.h', - 'gdkwin32id.c', 'gdkwin32keys.h', - 'gdksurface-win32.c', ]) gdk_win32_public_headers = files([ diff --git a/gtk/meson.build b/gtk/meson.build index 2e404f2ac4..5a76290dad 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -1309,6 +1309,24 @@ if build_gir gtk_dep_sources += gdk_wayland_gir endif + if win32_enabled + gdk_win32_gir = gnome.generate_gir(libgtk, + sources: gdk_win32_public_headers + gdk_win32_public_sources, + namespace: 'GdkWin32', + nsversion: gtk_api_version, + identifier_prefix: 'Gdk', + symbol_prefix: 'gdk', + export_packages: 'gtk4-win32', + includes: [ gdk_gir[0], 'win32-1.0', ], + install: true, + dependencies: libgdk_dep, + header: 'gdk/win32/gdkwin32.h', + extra_args: gir_args, + fatal_warnings: get_option('werror'), + ) + gtk_dep_sources += gdk_win32_gir + endif + gsk_gir_inc = [ gdk_gir[0], 'Graphene-1.0' ] gsk_gir = gnome.generate_gir(libgtk,