Compare commits

...

1 Commits

Author SHA1 Message Date
Marcel Hollerbach a1c6559d02 build: fix disabling of audio
this supports disabling audio building in efl.
2019-09-09 10:19:47 +02:00
2 changed files with 6 additions and 2 deletions

View File

@ -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()

View File

@ -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