fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linux: removed dependency from pulse-simple

This commit is contained in:
Marc Balmer 2024-09-17 12:35:10 +02:00 committed by Silvano Seva
parent 71d3a2c319
commit 644ffb5580
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meson.build
View File

@ -286,7 +286,6 @@ linux_def = {'PLATFORM_LINUX': '', 'VP_USE_FILESYSTEM':''}
sdl_dep = dependency('SDL2', required: false) sdl_dep = dependency('SDL2', required: false)
threads_dep = dependency('threads', required: false) threads_dep = dependency('threads', required: false)
pulse_dep = dependency('libpulse', required: false)
linux_src += openrtx_src linux_src += openrtx_src
linux_inc += openrtx_inc linux_inc += openrtx_inc
linux_def += openrtx_def linux_def += openrtx_def
@ -309,7 +308,7 @@ linux_mod17_def = linux_def + {'CONFIG_SCREEN_WIDTH': '128', 'CONFIG_SCREEN_HEIG
linux_c_args = ['-ffunction-sections', '-fdata-sections'] linux_c_args = ['-ffunction-sections', '-fdata-sections']
linux_cpp_args = ['-ffunction-sections', '-fdata-sections', '-std=c++14'] linux_cpp_args = ['-ffunction-sections', '-fdata-sections', '-std=c++14']
linux_l_args = ['-lm', '-lreadline', '-lpulse-simple', '-Wl,--gc-sections'] linux_l_args = ['-lm', '-lreadline', '-Wl,--gc-sections']
# Add AddressSanitizer if required # Add AddressSanitizer if required
if get_option('asan') if get_option('asan')
@ -530,7 +529,7 @@ endforeach
linux_opts = { linux_opts = {
'sources' : linux_default_src, 'sources' : linux_default_src,
'include_directories': linux_inc, 'include_directories': linux_inc,
'dependencies' : [sdl_dep, threads_dep, pulse_dep, codec2_dep], 'dependencies' : [sdl_dep, threads_dep, codec2_dep],
'c_args' : linux_c_args, 'c_args' : linux_c_args,
'cpp_args' : linux_cpp_args, 'cpp_args' : linux_cpp_args,
'link_args' : linux_l_args 'link_args' : linux_l_args
@ -539,7 +538,7 @@ linux_opts = {
linux_small_opts = { linux_small_opts = {
'sources' : linux_default_src, 'sources' : linux_default_src,
'include_directories': linux_inc, 'include_directories': linux_inc,
'dependencies' : [sdl_dep, threads_dep, pulse_dep, codec2_dep], 'dependencies' : [sdl_dep, threads_dep, codec2_dep],
'c_args' : linux_small_c_args, 'c_args' : linux_small_c_args,
'cpp_args' : linux_small_cpp_args, 'cpp_args' : linux_small_cpp_args,
'link_args' : linux_l_args 'link_args' : linux_l_args
@ -548,7 +547,7 @@ linux_small_opts = {
linux_mod17_opts = { linux_mod17_opts = {
'sources' : linux_mod17_src, 'sources' : linux_mod17_src,
'include_directories': linux_inc, 'include_directories': linux_inc,
'dependencies' : [sdl_dep, threads_dep, pulse_dep, codec2_dep], 'dependencies' : [sdl_dep, threads_dep, codec2_dep],
'c_args' : linux_mod17_c_args, 'c_args' : linux_mod17_c_args,
'cpp_args' : linux_mod17_cpp_args, 'cpp_args' : linux_mod17_cpp_args,
'link_args' : linux_l_args 'link_args' : linux_l_args
@ -849,7 +848,7 @@ endforeach
unit_test_opts = {'c_args' : linux_c_args, unit_test_opts = {'c_args' : linux_c_args,
'cpp_args' : linux_cpp_args, 'cpp_args' : linux_cpp_args,
'include_directories': linux_inc, 'include_directories': linux_inc,
'dependencies' : [sdl_dep, threads_dep, pulse_dep, codec2_dep], 'dependencies' : [sdl_dep, threads_dep, codec2_dep],
'link_args' : linux_l_args} 'link_args' : linux_l_args}
unit_test_src = linux_src + ui_src_default unit_test_src = linux_src + ui_src_default