diff options
| author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-09-09 10:04:43 +0200 |
|---|---|---|
| committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-09-09 10:19:47 +0200 |
| commit | a1c6559d02c591390337b06a0d87a2768a3a4f83 (patch) | |
| tree | 117ef498cf983ba9d2e36e0323c60a77f71efc4c | |
| parent | b6d5ee9745cc3a71dc8529f8028aa8cfcd8e6c2a (diff) | |
| download | efl-a1c6559d02c591390337b06a0d87a2768a3a4f83.tar.gz | |
build: fix disabling of audiodevs/bu5hm4n/build-test
this supports disabling audio building in efl.
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | src/lib/edje/meson.build | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 5d5da3e06c..ebea18e0bc 100644 --- a/meson.build +++ b/meson.build @@ -280,7 +280,7 @@ subprojects = [ ['ecore' ,[] , false, true, false, false, false, false, ['eina', 'eo', 'efl'], ['buildsystem']], ['eldbus' ,[] , false, true, true, false, true, true, ['eina', 'eo', 'efl'], []], ['ecore' ,[] , true, false, false, false, true, true, ['eina', 'eo', 'efl'], []], #ecores modules depend on eldbus -['ecore_audio' ,[] , false, true, false, false, false, false, ['eina', 'eo'], []], +['ecore_audio' ,['audio'] , false, true, false, false, false, false, ['eina', 'eo'], []], ['ecore_avahi' ,['avahi'] , false, true, false, false, false, true, ['eina', 'ecore'], []], ['ecore_con' ,[] , false, true, true, false, true, false, ['eina', 'eo', 'efl', 'ecore'], ['http-parser']], ['ecore_file' ,[] , false, true, false, false, false, false, ['eina'], []], @@ -325,6 +325,10 @@ config_dir += include_directories('.') #the other modules require theire package subdir(join_paths(local_module, 'eina')) +#List of dependency objects that might be disabled due to configurations +#If they are enabled, the object gets overwritten by the library file. +ecore_audio = declare_dependency() + test_dirs = [] example_dirs = [] tmp_empty = declare_dependency() diff --git a/src/lib/edje/meson.build b/src/lib/edje/meson.build index 23d93ce27e..9c7fb3951a 100644 --- a/src/lib/edje/meson.build +++ b/src/lib/edje/meson.build @@ -15,7 +15,7 @@ endif config_h.set('EDJE_CALC_CACHE', '1') -if get_option('edje-sound-and-video') +if get_option('audio') and get_option('edje-sound-and-video') config_h.set('ENABLE_MULTISENSE', '1') edje_deps += ecore_audio endif |