Merge branch 'master-cmake' of https://github.com/sle118/squeezelite-esp32.git into master-cmake

components/codecs/CMakeLists.txt

@@ -1,6 +1,5 @@
-idf_component_register(SRC_DIRS . 
-					   INCLUDE_DIRS .  ./inc  inc/alac inc/FLAC  inc/helix-aac inc/mad inc/ogg inc/opus inc/opusfile inc/resample16 inc/soxr inc/vorbis
-					   PRIV_REQUIRES newlib
+idf_component_register(
+	   INCLUDE_DIRS .  ./inc  inc/alac inc/FLAC  inc/helix-aac inc/mad inc/ogg inc/opus inc/opusfile inc/resample16 inc/soxr inc/vorbis
 )
 
 add_prebuilt_library(libmad 		lib/libmad.a)
@@ -9,16 +8,16 @@ add_prebuilt_library(libhelix-aac 	lib/libhelix-aac.a )
 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(libresample16 	lib/libresample16.a ) 
 add_prebuilt_library(libopusfile 	lib/libopusfile.a ) 
 add_prebuilt_library(libopus 		lib/libopus.a ) 
-target_link_libraries(${COMPONENT_LIB} PRIVATE libmad)
-target_link_libraries(${COMPONENT_LIB} PRIVATE libFLAC)
-target_link_libraries(${COMPONENT_LIB} PRIVATE libhelix-aac)
-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 libopusfile)
-target_link_libraries(${COMPONENT_LIB} PRIVATE libopus)
+target_link_libraries(${COMPONENT_LIB} INTERFACE libmad)
+target_link_libraries(${COMPONENT_LIB} INTERFACE libFLAC)
+target_link_libraries(${COMPONENT_LIB} INTERFACE libhelix-aac)
+target_link_libraries(${COMPONENT_LIB} INTERFACE libvorbisidec)
+target_link_libraries(${COMPONENT_LIB} INTERFACE libogg)
+target_link_libraries(${COMPONENT_LIB} INTERFACE libalac)
+target_link_libraries(${COMPONENT_LIB} INTERFACE libresample16)
+target_link_libraries(${COMPONENT_LIB} INTERFACE libopusfile)
+target_link_libraries(${COMPONENT_LIB} INTERFACE libopus)

components/codecs/link_helper.c

@@ -1,3 +0,0 @@
-void dummy_obj() {
-	return;
-}

components/display/display.c

@@ -400,7 +400,7 @@ const char *display_conf_get_driver_name(char * driver){
 /****************************************************************************************
  *
  */
-char * display_get_supported_drivers(){
+char * display_get_supported_drivers(void){
 	int total_size = 1;
 	char * supported_drivers=NULL;
 	const char * separator = "|";

components/display/display.h

@@ -39,4 +39,4 @@ void displayer_scroll(char *string, int speed, int pause);
 void displayer_control(enum displayer_cmd_e cmd, ...);
 void displayer_metadata(char *artist, char *album, char *title);
 void displayer_timer(enum displayer_time_e mode, int elapsed, int duration);
-char * display_get_supported_drivers();
+char * display_get_supported_drivers(void);

components/services/CMakeLists.txt

@@ -1,6 +1,6 @@
 idf_component_register(SRC_DIRS .
-						INCLUDE_DIRS . ${IDF_PATH}/components/driver
-						REQUIRES json tools platform_config display 
+						INCLUDE_DIRS . 
+						REQUIRES json tools platform_config display
 
 )