summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-09-09 10:04:43 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-09-09 10:19:47 +0200
commita1c6559d02c591390337b06a0d87a2768a3a4f83 (patch)
tree117ef498cf983ba9d2e36e0323c60a77f71efc4c
parentb6d5ee9745cc3a71dc8529f8028aa8cfcd8e6c2a (diff)
build: fix disabling of audiodevs/bu5hm4n/build-test
this supports disabling audio building in efl.
-rw-r--r--meson.build6
-rw-r--r--src/lib/edje/meson.build2
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 = [
280['ecore' ,[] , false, true, false, false, false, false, ['eina', 'eo', 'efl'], ['buildsystem']], 280['ecore' ,[] , false, true, false, false, false, false, ['eina', 'eo', 'efl'], ['buildsystem']],
281['eldbus' ,[] , false, true, true, false, true, true, ['eina', 'eo', 'efl'], []], 281['eldbus' ,[] , false, true, true, false, true, true, ['eina', 'eo', 'efl'], []],
282['ecore' ,[] , true, false, false, false, true, true, ['eina', 'eo', 'efl'], []], #ecores modules depend on eldbus 282['ecore' ,[] , true, false, false, false, true, true, ['eina', 'eo', 'efl'], []], #ecores modules depend on eldbus
283['ecore_audio' ,[] , false, true, false, false, false, false, ['eina', 'eo'], []], 283['ecore_audio' ,['audio'] , false, true, false, false, false, false, ['eina', 'eo'], []],
284['ecore_avahi' ,['avahi'] , false, true, false, false, false, true, ['eina', 'ecore'], []], 284['ecore_avahi' ,['avahi'] , false, true, false, false, false, true, ['eina', 'ecore'], []],
285['ecore_con' ,[] , false, true, true, false, true, false, ['eina', 'eo', 'efl', 'ecore'], ['http-parser']], 285['ecore_con' ,[] , false, true, true, false, true, false, ['eina', 'eo', 'efl', 'ecore'], ['http-parser']],
286['ecore_file' ,[] , false, true, false, false, false, false, ['eina'], []], 286['ecore_file' ,[] , false, true, false, false, false, false, ['eina'], []],
@@ -325,6 +325,10 @@ config_dir += include_directories('.')
325#the other modules require theire package 325#the other modules require theire package
326subdir(join_paths(local_module, 'eina')) 326subdir(join_paths(local_module, 'eina'))
327 327
328#List of dependency objects that might be disabled due to configurations
329#If they are enabled, the object gets overwritten by the library file.
330ecore_audio = declare_dependency()
331
328test_dirs = [] 332test_dirs = []
329example_dirs = [] 333example_dirs = []
330tmp_empty = declare_dependency() 334tmp_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
15 15
16config_h.set('EDJE_CALC_CACHE', '1') 16config_h.set('EDJE_CALC_CACHE', '1')
17 17
18if get_option('edje-sound-and-video') 18if get_option('audio') and get_option('edje-sound-and-video')
19 config_h.set('ENABLE_MULTISENSE', '1') 19 config_h.set('ENABLE_MULTISENSE', '1')
20 edje_deps += ecore_audio 20 edje_deps += ecore_audio
21endif 21endif