brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter: Use #mesondefine

Browse Source 
Use #mesondefine instead of manual concatenation.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1179
This commit is contained in:
Elias Aebi 2020-04-05 11:45:49 +02:00 committed by Jonas Ådahl
parent d0ef660ff6
commit 425a10de11
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/clutter/clutter-config.h.in
View File

@ -9,7 +9,13 @@
G_BEGIN_DECLS G_BEGIN_DECLS
@CLUTTER_CONFIG_DEFINES@ #mesondefine CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT
#mesondefine CLUTTER_WINDOWING_X11
#mesondefine CLUTTER_INPUT_X11
#mesondefine CLUTTER_WINDOWING_GLX
#mesondefine CLUTTER_WINDOWING_EGL
#mesondefine CLUTTER_INPUT_EVDEV
#mesondefine CLUTTER_INPUT_NULL
G_END_DECLS G_END_DECLS

31
clutter/clutter/meson.build
View File

@ -337,35 +337,20 @@ clutter_build_config_h = configure_file(
) )
clutter_built_private_headers += clutter_build_config_h clutter_built_private_headers += clutter_build_config_h
clutter_config_defines = [] cdata = configuration_data()
if have_wayland if have_wayland
clutter_config_defines += [ cdata.set10('CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT', true)
'#define CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT 1',
]
endif endif
if have_x11 if have_x11
clutter_config_defines += [ cdata.set_quoted('CLUTTER_WINDOWING_X11', 'x11')
'#define CLUTTER_WINDOWING_X11 "x11"', cdata.set_quoted('CLUTTER_INPUT_X11', 'x11')
'#define CLUTTER_INPUT_X11 "x11"', cdata.set_quoted('CLUTTER_WINDOWING_GLX', 'glx')
'#define CLUTTER_WINDOWING_GLX "glx"',
]
endif endif
if have_native_backend if have_native_backend
clutter_config_defines += [ cdata.set_quoted('CLUTTER_WINDOWING_EGL', 'eglnative')
'#define CLUTTER_WINDOWING_EGL "eglnative"', cdata.set_quoted('CLUTTER_INPUT_EVDEV', 'evdev')
'#define CLUTTER_INPUT_EVDEV "evdev"',
]
endif endif
clutter_config_defines += [ cdata.set_quoted('CLUTTER_INPUT_NULL', 'null')
'#define CLUTTER_INPUT_NULL "null"',
]
clutter_config_defines_string = ''
foreach clutter_config_define : clutter_config_defines
clutter_config_defines_string += clutter_config_define + '\n'
endforeach
cdata = configuration_data()
cdata.set('CLUTTER_CONFIG_DEFINES', clutter_config_defines_string)
clutter_config_h = configure_file( clutter_config_h = configure_file(
input: 'clutter-config.h.in', input: 'clutter-config.h.in',