Merge remote-tracking branch 'origin/master' into master-cmake

Conflicts:
	components/raop/raop.c
	components/raop/rtp.c
	main/cmd_squeezelite.c
This commit is contained in:
Sebastien
2020-03-08 09:54:50 -04:00
48 changed files with 951 additions and 481 deletions

View File

@@ -1,7 +1,4 @@
set(COMPONENT_ADD_INCLUDEDIRS .)
set(COMPONENT_SRCS "platform_console.c" "cmd_ota.c" "cmd_nvs.c" "cmd_i2ctools.c" "cmd_squeezelite.c" "cmd_system.c" "cmd_wifi.c" )
set(COMPONENT_REQUIRES squeezelite console nvs_flash spi_flash app_update platform_config vfs pthread wifi-manager)
register_component()
idf_component_register( SRC_DIRS .
INCLUDE_DIRS .
REQUIRES console nvs_flash spi_flash app_update platform_config vfs pthread wifi-manager
PRIV_REQUIRES display squeezelite )