diff options
| author | Simon Ser <contact@emersion.fr> | 2022-11-25 18:05:17 +0100 |
|---|---|---|
| committer | Alexander Orzechowski <alex@ozal.ski> | 2022-12-06 22:39:45 +0000 |
| commit | 4da9b32a154901bd8d74a80162ce3962eefbc29f (patch) | |
| tree | 2660a33943a6d4ec3faa4598edbd4dd88c1dadbd /include | |
| parent | 6c897756b6340d098f50eeb0da0d39abda87fdda (diff) | |
xwayland: use internal_config
Avoids the need to have a separate config.h, and removes C compiler
arguments.
Diffstat (limited to 'include')
| -rw-r--r-- | include/meson.build | 2 | ||||
| -rw-r--r-- | include/xwayland/meson.build | 30 |
2 files changed, 0 insertions, 32 deletions
diff --git a/include/meson.build b/include/meson.build index bc91a766..f97e76ac 100644 --- a/include/meson.build +++ b/include/meson.build @@ -13,8 +13,6 @@ if not features.get('x11-backend') endif if not features.get('xwayland') exclude_files += 'xwayland.h' -else - subdir('xwayland') endif if not features.get('gles2-renderer') exclude_files += ['render/egl.h', 'render/gles2.h'] diff --git a/include/xwayland/meson.build b/include/xwayland/meson.build deleted file mode 100644 index fcc5bd3a..00000000 --- a/include/xwayland/meson.build +++ /dev/null @@ -1,30 +0,0 @@ -xwayland_feature_names = [ - 'listenfd', - 'no_touch_pointer_emulation', - 'force_xrandr_emulation', - 'terminate_delay', -] - -xwayland_features = {} -if xwayland.found() - xwayland_path = xwayland.get_variable('xwayland') - foreach name : xwayland_feature_names - have = xwayland.get_variable('have_' + name, default_value: 'false') == 'true' - xwayland_features += { name: have } - endforeach -else - xwayland_path = xwayland_prog.full_path() - foreach name : xwayland_feature_names - xwayland_features += { name: false } - endforeach -endif - -xwayland_config_data = configuration_data() -xwayland_config_data.set_quoted('XWAYLAND_PATH', xwayland_path) -foreach name, have : xwayland_features - xwayland_config_data.set10('HAVE_XWAYLAND_' + name.to_upper(), have) -endforeach -configure_file( - output: 'config.h', - configuration: xwayland_config_data, -) |