Merge branch 'Over_The_Air_Update' of

https://github.com/sle118/squeezelite-esp32.git into Over_The_Air_Update

Conflicts:
	components/wifi-manager/wifi_manager.c
This commit is contained in:
Sebastien
2019-09-23 00:21:37 -04:00
13 changed files with 282 additions and 61 deletions

View File

@@ -2,13 +2,15 @@
#export PROJECT_BUILD_NAME="${build_version_prefix}${BUILD_NUMBER}"
#export PROJECT_BUILD_TARGET="${config_target}"
PROJECT_BUILD_NAME?=local
PROJECT_CONFIG_TARGET?=custom
PROJECT_NAME?=squeezelite.$(PROJECT_CONFIG_TARGET)
PROJECT_VER?="$(PROJECT_BUILD_NAME)-$(PROJECT_CONFIG_TARGET)"
RECOVERY_APPLICATION?=0
CFLAGS?=
#PROJECT_BUILD_NAME?=local
#PROJECT_CONFIG_TARGET?=custom
#PROJECT_NAME?=squeezelite.$(PROJECT_CONFIG_TARGET)
#PROJECT_VER?="$(PROJECT_BUILD_NAME)-$(PROJECT_CONFIG_TARGET)"
#recovery: PROJECT_NAME:=recovery.$(PROJECT_CONFIG_TARGET)
#recovery: CPPFLAGS+=-DRECOVERY_APPLICATION=1
PROJECT_NAME?=squeezelite
include $(IDF_PATH)/make/project.mk