diff --git a/meson.build b/meson.build index 9102b444..e9bddeed 100644 --- a/meson.build +++ b/meson.build @@ -111,15 +111,6 @@ else codec2_dep = dependency('codec2') endif -# tinyusb, open source cross-platform USB stack for embedded system. -# Subproject included only for embedded targets -if meson.is_cross_build() - tinyusb_proj = subproject('tinyusb') - tinyusb_dep = tinyusb_proj.get_variable('tinyusb_dep') -else - tinyusb_dep = [ ] -endif - src = openrtx_src + main_src + minmea_src inc = openrtx_inc + minmea_inc + qdec_inc @@ -162,9 +153,7 @@ mdx_src = ['openrtx/src/core/xmodem.c', 'platform/drivers/audio/outputStream_MDx.cpp', 'platform/drivers/baseband/HR_Cx000.cpp', 'platform/drivers/backlight/backlight_MDx.c', - 'platform/drivers/tones/toneGenerator_MDx.cpp', - 'platform/drivers/USB/usb_MDx.cpp', - 'platform/drivers/USB/usb_descriptors.c'] + 'platform/drivers/tones/toneGenerator_MDx.cpp'] ## ## GDx family: Radioddity GD-77 and Baofeng DM-1801 @@ -473,7 +462,7 @@ md3x0_opts = {'sources' : md3x0_src, 'cpp_args': md3x0_args, 'link_args' : ['-Wl,-T../platform/mcu/STM32F4xx/linker_script_MDx.ld', '-Wl,--print-memory-usage'], - 'dependencies': [codec2_dep, tinyusb_dep], + 'dependencies': [codec2_dep], 'include_directories': md3x0_inc} mduv3x0_opts = {'sources': mduv3x0_src, @@ -481,7 +470,7 @@ mduv3x0_opts = {'sources': mduv3x0_src, 'cpp_args': mduv3x0_args, 'link_args' : ['-Wl,-T../platform/mcu/STM32F4xx/linker_script_MDx.ld', '-Wl,--print-memory-usage'], - 'dependencies': [codec2_dep, tinyusb_dep], + 'dependencies': [codec2_dep], 'include_directories': mduv3x0_inc} gd77_opts = {'sources': gd77_src, @@ -505,7 +494,7 @@ md9600_opts = {'sources': md9600_src, 'cpp_args': md9600_args, 'link_args' : ['-Wl,-T../platform/mcu/STM32F4xx/linker_script_MDx.ld', '-Wl,--print-memory-usage'], - 'dependencies': [codec2_dep, tinyusb_dep], + 'dependencies': [codec2_dep], 'include_directories': md9600_inc} mod17_opts = {'sources': mod17_src, @@ -513,7 +502,7 @@ mod17_opts = {'sources': mod17_src, 'cpp_args': mod17_args, 'link_args' : ['-Wl,-T../platform/mcu/STM32F4xx/linker_script_Mod17.ld', '-Wl,--print-memory-usage'], - 'dependencies': [codec2_dep, tinyusb_dep], + 'dependencies': [codec2_dep], 'include_directories': mod17_inc} ##