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,6 +1,6 @@
idf_component_register(SRCS "accessors.c" "led.c" "audio_controls.c" "battery.c" "buttons.c" "services.c" "monitor.c" "rotary_encoder.c"
INCLUDE_DIRS . ../tools/
REQUIRES json platform_config
idf_component_register(SRC_DIRS .
INCLUDE_DIRS .
REQUIRES json tools platform_config
)