AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix-gdkconfig' into 'gtk-3-24'

Browse Source 
Fix gdkconfig.h generation for GDK_WINDOWING_QUARTZ

See merge request GNOME/gtk!1004
This commit is contained in:
Emmanuele Bassi 2019-07-20 11:13:38 +00:00
commit fdcd0ec07d
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/gdkconfig.h.meson
View File

@ -14,6 +14,7 @@ G_BEGIN_DECLS
#mesondefine GDK_WINDOWING_BROADWAY #mesondefine GDK_WINDOWING_BROADWAY
#mesondefine GDK_WINDOWING_WAYLAND #mesondefine GDK_WINDOWING_WAYLAND
#mesondefine GDK_WINDOWING_WIN32 #mesondefine GDK_WINDOWING_WIN32
#mesondefine GDK_WINDOWING_QUARTZ
G_END_DECLS G_END_DECLS

3
gdk/meson.build
View File

@ -165,6 +165,7 @@ gdkconfig_cdata.set('GDK_WINDOWING_X11', x11_enabled)
gdkconfig_cdata.set('GDK_WINDOWING_WAYLAND', wayland_enabled) gdkconfig_cdata.set('GDK_WINDOWING_WAYLAND', wayland_enabled)
gdkconfig_cdata.set('GDK_WINDOWING_WIN32', win32_enabled) gdkconfig_cdata.set('GDK_WINDOWING_WIN32', win32_enabled)
gdkconfig_cdata.set('GDK_WINDOWING_BROADWAY', broadway_enabled) gdkconfig_cdata.set('GDK_WINDOWING_BROADWAY', broadway_enabled)
gdkconfig_cdata.set('GDK_WINDOWING_QUARTZ', quartz_enabled)
gdkconfig = configure_file( gdkconfig = configure_file(
input : 'gdkconfig.h.meson', input : 'gdkconfig.h.meson',
@ -268,7 +269,7 @@ foreach backend : ['broadway', 'quartz', 'wayland', 'win32', 'x11', 'mir']
gdk_backends_gen_headers += get_variable('gdk_@0@_gen_headers'.format(backend)) gdk_backends_gen_headers += get_variable('gdk_@0@_gen_headers'.format(backend))
endif endif
if backend == 'quartz' if backend == 'quartz'
common_cflags += ['-DGDK_WINDOWING_QUARTZ', '-xobjective-c'] common_cflags += ['-xobjective-c']
endif endif
endif endif
endforeach endforeach

2
gtk/meson.build
View File

@ -899,7 +899,7 @@ endif
if quartz_enabled if quartz_enabled
gtk_sources += gtk_use_quartz_sources gtk_sources += gtk_use_quartz_sources
gtk_cargs += ['-DGDK_WINDOWING_QUARTZ', '-xobjective-c'] gtk_cargs += ['-xobjective-c']
endif endif
# So we don't add these twice # So we don't add these twice