Ver Fonte

minor changes to make files

Sebastien há 5 anos atrás
pai
commit
3c9fc8f0c3

+ 1 - 2
components/codecs/CMakeLists.txt

@@ -1,7 +1,6 @@
 idf_component_register(SRCS link_helper.c
 					   INCLUDE_DIRS .  ./inc  inc/alac inc/faad2 inc/FLAC  inc/helix-aac inc/mad inc/ogg inc/opus inc/opusfile inc/resample16 inc/soxr inc/vorbis
-                       REQUIRES esp_common platform_config 
-                       PRIV_REQUIRES freertos bt nvs_flash esp32 spi_flash newlib log console pthread
+	                       REQUIRES esp_common platform_config freertos nvs_flash esp32 spi_flash newlib log pthread
 )
 
 add_prebuilt_library(libmad 		lib/libmad.a)

+ 0 - 1
components/platform_config/CMakeLists.txt

@@ -1,5 +1,4 @@
 idf_component_register(SRCS "nvs_utilities.c" "platform_config.c"
-						INCLUDE_DIRS . 
 						INCLUDE_DIRS . ../tools/
                    REQUIRES newlib nvs_flash json platform_console services vfs
 )

+ 1 - 1
components/platform_display/CMakeLists.txt

@@ -23,7 +23,7 @@ idf_component_register(SRCS display.c
 							fonts/font_line_2.c  
 							fonts/font_tarable7seg_16x32.c  
 							fonts/font_tarable7seg_32x64.c 
-						PRIV_REQUIRES services
+						REQUIRES services
 						INCLUDE_DIRS . fonts core                   
 )
 

+ 2 - 2
components/raop/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 idf_component_register(SRCS dmap_parser.c raop_sink.c raop.c rtp.c util.c   
 						INCLUDE_DIRS .   
-						REQUIRES newlib platform_config services codecs tools
-						PRIV_REQUIRES platform_display  
+						REQUIRES newlib platform_config services codecs tools platform_display
+						  
 )

+ 2 - 6
components/squeezelite/CMakeLists.txt

@@ -57,9 +57,5 @@ set_source_files_properties(flac.c
     -Wno-maybe-uninitialized
 )
 
-add_definitions(-O3 -DLINKALL -DLOOPBACK -DNO_FAAD -DRESAMPLE16 -DEMBEDDED -DTREMOR_ONLY -DBYTES_PER_FRAME=4)
-#add_library(platform_bluetooth STATIC IMPORTED GLOBAL)
-#set_property(TARGET platform_bt PROPERTY IMPORTED_LOCATION "${COMPONENT_DIR}/../freetype/libfreetype.a")
-#add_library(platform_bluetooth STATIC IMPORTED GLOBAL)
-#set_property(TARGET platform_bluetooth PROPERTY IMPORTED_LOCATION "../platform_bluetooth/platform_bluetooth.a")
-#target_link_libraries(${COMPONENT_TARGET} PUBLIC platform_bluetooth)
+add_definitions(-DLINKALL -DLOOPBACK -DNO_FAAD -DRESAMPLE16 -DEMBEDDED -DTREMOR_ONLY -DBYTES_PER_FRAME=4)
+add_compile_options (-O3)