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

Merge branch 'gsk-public-symbols' into 'master'

Browse Source 
Install all headers with public symbols

Closes #2607

See merge request GNOME/gtk!1666
This commit is contained in:
Emmanuele Bassi 2020-04-11 15:21:11 +00:00
commit e072d9b28b
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gsk/meson.build
View File

@ -60,7 +60,6 @@ gsk_public_headers = files([
]) ])
install_headers(gsk_public_headers, 'gsk.h', subdir: 'gtk-4.0/gsk') install_headers(gsk_public_headers, 'gsk.h', subdir: 'gtk-4.0/gsk')
gsk_public_gl_headers = files([ gsk_public_gl_headers = files([
'gl/gskglrenderer.h' 'gl/gskglrenderer.h'
]) ])
@ -70,20 +69,14 @@ gsk_public_headers += gsk_public_gl_headers
gsk_public_broadway_headers = files([ gsk_public_broadway_headers = files([
'broadway/gskbroadwayrenderer.h' 'broadway/gskbroadwayrenderer.h'
]) ])
if get_variable('broadway_enabled')
install_headers(gsk_public_broadway_headers, subdir: 'gtk-4.0/gsk/broadway') install_headers(gsk_public_broadway_headers, subdir: 'gtk-4.0/gsk/broadway')
gsk_public_headers += gsk_public_broadway_headers gsk_public_headers += gsk_public_broadway_headers
endif
gsk_public_vulkan_headers = files([ gsk_public_vulkan_headers = files([
'vulkan/gskvulkanrenderer.h' 'vulkan/gskvulkanrenderer.h'
]) ])
if have_vulkan
install_headers(gsk_public_vulkan_headers, subdir: 'gtk-4.0/gsk/vulkan') install_headers(gsk_public_vulkan_headers, subdir: 'gtk-4.0/gsk/vulkan')
gsk_public_headers += gsk_public_vulkan_headers gsk_public_headers += gsk_public_vulkan_headers
endif
gsk_private_vulkan_shaders = [] gsk_private_vulkan_shaders = []
# This is an odd split because we use configure_file() below to workaround # This is an odd split because we use configure_file() below to workaround

6
gtk/gentypefuncs.py
View File

@ -59,7 +59,7 @@ for f in funcs:
file_output += ['#ifdef GDK_WINDOWING_X11'] file_output += ['#ifdef GDK_WINDOWING_X11']
file_output += ['*tp++ = {0}();'.format(f)] file_output += ['*tp++ = {0}();'.format(f)]
file_output += ['#endif'] file_output += ['#endif']
elif f.startswith('gdk_broadway'): elif f.startswith('gdk_broadway') or f.startswith('gsk_broadway'):
file_output += ['#ifdef GDK_WINDOWING_BROADWAY'] file_output += ['#ifdef GDK_WINDOWING_BROADWAY']
file_output += ['*tp++ = {0}();'.format(f)] file_output += ['*tp++ = {0}();'.format(f)]
file_output += ['#endif'] file_output += ['#endif']
@ -75,6 +75,10 @@ for f in funcs:
file_output += ['#ifdef GDK_WINDOWING_QUARTZ'] file_output += ['#ifdef GDK_WINDOWING_QUARTZ']
file_output += ['*tp++ = {0}();'.format(f)] file_output += ['*tp++ = {0}();'.format(f)]
file_output += ['#endif'] file_output += ['#endif']
elif f.startswith('gsk_vulkan'):
file_output += ['#ifdef GDK_RENDERING_VULKAN']
file_output += ['*tp++ = {0}();'.format(f)]
file_output += ['#endif']
else: else:
file_output += ['*tp++ = {0}();'.format(f)] file_output += ['*tp++ = {0}();'.format(f)]