diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-05-03 09:36:20 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-05-03 09:36:20 +0000 |
| commit | 1d1eb899257a98db81d2cd3a634135b60ba0d0ba (patch) | |
| tree | 14d141ed96f7e47a6adb6102a0ab1626cd125a29 /meson.build | |
| parent | osc: fix scaling of RGB formatted color specifiers (diff) | |
| parent | unicode-combining: limit maximum number of allowed composed chains (diff) | |
Merge branch 'space-optimize-combining-chars'
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/meson.build b/meson.build index eca6e0fd..f34a5e60 100644 --- a/meson.build +++ b/meson.build @@ -57,11 +57,8 @@ wayland_client = dependency('wayland-client') wayland_cursor = dependency('wayland-cursor') xkb = dependency('xkbcommon') -add_project_arguments('-DFOOT_UNICODE_MAX_COMBINING_CHARS=@0@'.format( - get_option('unicode-max-combining-chars')), language: 'c') add_project_arguments('-DFOOT_UNICODE_PRECOMPOSE=@0@'.format( - get_option('unicode-max-combining-chars') > 0 and get_option('unicode-precompose')), - language: 'c') + get_option('unicode-precompose')), language: 'c') tllist = dependency('tllist', version: '>=1.0.1', fallback: 'tllist') fcft = dependency('fcft', version: ['>=2.0.0', '<2.1.0'], fallback: 'fcft') @@ -95,7 +92,7 @@ foreach prot : [ command: [wscanner_prog, 'private-code', '@INPUT@', '@OUTPUT@']) endforeach -if get_option('unicode-max-combining-chars') > 0 and get_option('unicode-precompose') +if get_option('unicode-precompose') generate_unicode_precompose_sh = files('scripts/generate-unicode-precompose.sh') unicode_data = custom_target( 'unicode-data', @@ -167,8 +164,7 @@ subdir('doc') summary( { - 'Unicode max combining chars': get_option('unicode-max-combining-chars'), - 'Unicode precompose': get_option('unicode-max-combining-chars') > 0 and get_option('unicode-precompose'), + 'Unicode precompose': get_option('unicode-precompose'), }, bool_yn: true ) |
