Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-07 20:17:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sebastien
2020-09-08 16:47:08 -04:00
parent 573ddb6fda 708a3f9c4a
commit 2eb995d621
5 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
components/codecs/CMakeLists.txt
View File

@@ -1,6 +1,5 @@
idf_component_register(SRC_DIRS . 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 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
) )
add_prebuilt_library(libmad lib/libmad.a) 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(libvorbisidec lib/libvorbisidec.a )
add_prebuilt_library(libogg lib/libogg.a ) add_prebuilt_library(libogg lib/libogg.a )
add_prebuilt_library(libalac lib/libalac.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(libopusfile lib/libopusfile.a )
add_prebuilt_library(libopus lib/libopus.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} INTERFACE libmad)
target_link_libraries(${COMPONENT_LIB} PRIVATE libalac) target_link_libraries(${COMPONENT_LIB} INTERFACE libFLAC)
target_link_libraries(${COMPONENT_LIB} PRIVATE libremple16) target_link_libraries(${COMPONENT_LIB} INTERFACE libhelix-aac)
target_link_libraries(${COMPONENT_LIB} PRIVATE libopusfile) target_link_libraries(${COMPONENT_LIB} INTERFACE libvorbisidec)
target_link_libraries(${COMPONENT_LIB} PRIVATE libopus) 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)

3
components/codecs/link_helper.c
View File

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

2
components/display/display.c
View File

@@ -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; int total_size = 1;
char * supported_drivers=NULL; char * supported_drivers=NULL;
const char * separator = "|"; const char * separator = "|";

2
components/display/display.h
View File

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

2
components/services/CMakeLists.txt
View File

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