diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt index 806c0dbdf2..fe176fcdba 100644 --- a/components/bt/CMakeLists.txt +++ b/components/bt/CMakeLists.txt @@ -922,29 +922,30 @@ idf_component_register(SRCS "${srcs}" if(CONFIG_BT_ENABLED) target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-implicit-fallthrough -Wno-unused-const-variable) if(CONFIG_IDF_TARGET_ESP32) - target_link_directories(${COMPONENT_LIB} INTERFACE "${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32/esp32") - target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app) - - target_link_libraries(${COMPONENT_LIB} INTERFACE "-u ld_include_hli_vectors_bt") + add_prebuilt_library(bt_btdm_app "${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32/esp32/libbtdm_app.a") + target_link_libraries(${COMPONENT_LIB} PRIVATE bt_btdm_app) + target_link_options(${COMPONENT_LIB} INTERFACE "SHELL:-u ld_include_hli_vectors_bt") elseif(CONFIG_IDF_TARGET_ESP32C3) - target_link_directories(${COMPONENT_LIB} INTERFACE - "${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32c3_family/esp32c3") if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY) - target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app_flash) + set(lib_name "btdm_app_flash") else() - target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app) + set(lib_name "btdm_app") endif() + add_prebuilt_library(bt_btdm_app + "${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32c3_family/esp32c3/lib${lib_name}.a") + target_link_libraries(${COMPONENT_LIB} PRIVATE bt_btdm_app) elseif(CONFIG_IDF_TARGET_ESP32S3) - target_link_directories(${COMPONENT_LIB} INTERFACE - "${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32c3_family/esp32s3") if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY) - target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app_flash) + set(lib_name "btdm_app_flash") else() - target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app) + set(lib_name "btdm_app") endif() + add_prebuilt_library(bt_btdm_app + "${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32c3_family/esp32s3/lib${lib_name}.a") + target_link_libraries(${COMPONENT_LIB} PRIVATE bt_btdm_app) elseif(CONFIG_BT_CONTROLLER_ENABLED) if(CONFIG_BT_LE_CONTROLLER_LOG_WRAP_PANIC_HANDLER_ENABLE) - target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--wrap=esp_panic_handler") + target_link_options(${COMPONENT_LIB} INTERFACE "-Wl,--wrap=esp_panic_handler") endif() if(CONFIG_IDF_TARGET_ESP32C6) add_prebuilt_library(libble_app diff --git a/components/esp_coex/CMakeLists.txt b/components/esp_coex/CMakeLists.txt index a1da2af74c..3160d55da2 100644 --- a/components/esp_coex/CMakeLists.txt +++ b/components/esp_coex/CMakeLists.txt @@ -45,7 +45,7 @@ if(CONFIG_ESP_COEX_ENABLED) REQUIRES ${COMPONENT_NAME}) target_link_libraries(${COMPONENT_LIB} PUBLIC ${blob}) if(CONFIG_IDF_TARGET_ESP32) - target_link_libraries(${COMPONENT_LIB} PRIVATE btdm_app) + target_link_libraries(${COMPONENT_LIB} PRIVATE bt_btdm_app) endif() endif()