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

Conflicts:
	README.md
	build-scripts/ESP32-A1S-sdkconfig.defaults
	build-scripts/I2S-4MFlash-sdkconfig.defaults
	build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults
	build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults
	build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults
	build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults
This commit is contained in:
Sebastien
2020-06-09 14:42:37 -04:00
19 changed files with 3553 additions and 26 deletions

View File

@@ -10,7 +10,6 @@ add_prebuilt_library(libvorbisidec lib/libvorbisidec.a )
add_prebuilt_library(libogg lib/libogg.a )
add_prebuilt_library(libalac lib/libalac.a )
add_prebuilt_library(libremple16 lib/libresample16.a )
add_prebuilt_library(libsoxr lib/libsoxr.a )
add_prebuilt_library(libopusfile lib/libopusfile.a )
add_prebuilt_library(libopus lib/libopus.a )
target_link_libraries(${COMPONENT_LIB} PRIVATE libmad)
@@ -21,6 +20,5 @@ target_link_libraries(${COMPONENT_LIB} PRIVATE libvorbisidec)
target_link_libraries(${COMPONENT_LIB} PRIVATE libogg)
target_link_libraries(${COMPONENT_LIB} PRIVATE libalac)
target_link_libraries(${COMPONENT_LIB} PRIVATE libremple16)
target_link_libraries(${COMPONENT_LIB} PRIVATE libsoxr)
target_link_libraries(${COMPONENT_LIB} PRIVATE libopusfile)
target_link_libraries(${COMPONENT_LIB} PRIVATE libopus)