diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-11-12 16:14:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 16:14:18 -0500 |
| commit | 77dfac4fa4082ce95fc9769861e0b971754b6a66 (patch) | |
| tree | cfffb364f9e79dc7acb2dc67075b33f15a1f57c9 /meson.build | |
| parent | d2d8372cdc20c908342497fcdbfa91b6fc99df82 (diff) | |
| parent | 51bfdd620e70c41e1a9fb4ce7831eddfb1bf893b (diff) | |
Merge pull request #1372 from emersion/config10
Use #if instead of #ifdef for wlroots config data
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/meson.build b/meson.build index 1ed93c04..7017e4b5 100644 --- a/meson.build +++ b/meson.build @@ -16,17 +16,26 @@ project( # for a reference about clean library versioning. so_version = ['0', '0', '0'] -add_project_arguments('-Wno-unused-parameter', language: 'c') add_project_arguments( - '-DWLR_SRC_DIR="@0@"'.format(meson.current_source_dir()), - language: 'c', -) -add_project_arguments( - '-DWLR_USE_UNSTABLE', + [ + '-DWLR_SRC_DIR="@0@"'.format(meson.current_source_dir()), + '-DWLR_USE_UNSTABLE', + + '-Wno-unused-parameter', + '-Wundef', + ], language: 'c', ) conf_data = configuration_data() +conf_data.set10('WLR_HAS_LIBCAP', false) +conf_data.set10('WLR_HAS_SYSTEMD', false) +conf_data.set10('WLR_HAS_ELOGIND', false) +conf_data.set10('WLR_HAS_X11_BACKEND', false) +conf_data.set10('WLR_HAS_XWAYLAND', false) +conf_data.set10('WLR_HAS_XCB_ERRORS', false) +conf_data.set10('WLR_HAS_XCB_ICCCM', false) +conf_data.set10('WLR_HAS_XCB_XKB', false) wlr_inc = include_directories('.', 'include') @@ -63,12 +72,12 @@ wlr_parts = [] wlr_deps = [] if libcap.found() - conf_data.set('WLR_HAS_LIBCAP', true) + conf_data.set10('WLR_HAS_LIBCAP', true) wlr_deps += libcap endif if logind.found() - conf_data.set('WLR_HAS_' + get_option('logind-provider').to_upper(), true) + conf_data.set10('WLR_HAS_' + get_option('logind-provider').to_upper(), true) wlr_deps += logind endif |