mirror of
https://github.com/sle118/squeezelite-esp32.git
synced 2025-12-14 15:37:10 +03:00
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:
@@ -1,28 +1,5 @@
|
||||
|
||||
idf_component_register(SRCS display.c
|
||||
SH1106.c
|
||||
SSD1306.c
|
||||
SSD132x.c
|
||||
core/ifaces/default_if_i2c.c
|
||||
core/ifaces/default_if_spi.c
|
||||
core/gds_draw.c
|
||||
core/gds_font.c
|
||||
core/gds_image.c
|
||||
core/gds_text.c
|
||||
core/gds.c
|
||||
fonts/font_droid_sans_fallback_11x13.c
|
||||
fonts/font_droid_sans_fallback_15x17.c
|
||||
fonts/font_droid_sans_fallback_24x28.c
|
||||
fonts/font_droid_sans_mono_13x24.c
|
||||
fonts/font_droid_sans_mono_16x31.c
|
||||
fonts/font_droid_sans_mono_7x13.c
|
||||
fonts/font_liberation_mono_13x21.c
|
||||
fonts/font_liberation_mono_17x30.c
|
||||
fonts/font_liberation_mono_9x15.c
|
||||
fonts/font_line_1.c
|
||||
fonts/font_line_2.c
|
||||
fonts/font_tarable7seg_16x32.c
|
||||
fonts/font_tarable7seg_32x64.c
|
||||
idf_component_register(SRC_DIRS . core core/ifaces fonts
|
||||
REQUIRES services
|
||||
INCLUDE_DIRS . fonts core
|
||||
)
|
||||
@@ -30,4 +7,11 @@ idf_component_register(SRCS display.c
|
||||
set_source_files_properties(display.c
|
||||
PROPERTIES COMPILE_FLAGS
|
||||
-Wno-format-overflow
|
||||
)
|
||||
)
|
||||
|
||||
#target_link_libraries(${COMPONENT_LIB} PUBLIC
|
||||
# -Wl,--whole-archive
|
||||
# $<TARGET_PROPERTY,INTERFACE_LINK_LIBRARIES>
|
||||
# -Wl,--no-whole-archive
|
||||
#)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user