diff --git a/examples/common_components/protocol_examples_common/CMakeLists.txt b/examples/common_components/protocol_examples_common/CMakeLists.txt index 2a7352d5fd..4f9ea953cf 100644 --- a/examples/common_components/protocol_examples_common/CMakeLists.txt +++ b/examples/common_components/protocol_examples_common/CMakeLists.txt @@ -4,7 +4,7 @@ if(${target} STREQUAL "linux") # Header only library for linux idf_component_register(INCLUDE_DIRS include - PRIV_REQUIRES tapif_io) + SRCS protocol_examples_utils.c) return() endif() diff --git a/examples/common_components/protocol_examples_common/connect.c b/examples/common_components/protocol_examples_common/connect.c index 8a7e28266b..6debc20813 100644 --- a/examples/common_components/protocol_examples_common/connect.c +++ b/examples/common_components/protocol_examples_common/connect.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ diff --git a/examples/common_components/protocol_examples_common/include/example_common_private.h b/examples/common_components/protocol_examples_common/include/example_common_private.h index 4921e477ea..b85d26d636 100644 --- a/examples/common_components/protocol_examples_common/include/example_common_private.h +++ b/examples/common_components/protocol_examples_common/include/example_common_private.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ diff --git a/examples/common_components/protocol_examples_common/include/protocol_examples_common.h b/examples/common_components/protocol_examples_common/include/protocol_examples_common.h index 7417c1e635..430cdae7f9 100644 --- a/examples/common_components/protocol_examples_common/include/protocol_examples_common.h +++ b/examples/common_components/protocol_examples_common/include/protocol_examples_common.h @@ -11,15 +11,18 @@ #include "sdkconfig.h" #include "esp_err.h" +#if !CONFIG_IDF_TARGET_LINUX #include "esp_netif.h" #if CONFIG_EXAMPLE_CONNECT_ETHERNET #include "esp_eth.h" #endif +#endif // !CONFIG_IDF_TARGET_LINUX #ifdef __cplusplus extern "C" { #endif +#if !CONFIG_IDF_TARGET_LINUX #if CONFIG_EXAMPLE_CONNECT_WIFI #define EXAMPLE_NETIF_DESC_STA "example_netif_sta" #endif @@ -96,6 +99,10 @@ void example_register_wifi_connect_commands(void); esp_eth_handle_t get_example_eth_handle(void); #endif // CONFIG_EXAMPLE_CONNECT_ETHERNET +#else +static inline esp_err_t example_connect(void) {return ESP_OK;} +#endif // !CONFIG_IDF_TARGET_LINUX + #ifdef __cplusplus } #endif diff --git a/examples/protocols/esp_http_client/CMakeLists.txt b/examples/protocols/esp_http_client/CMakeLists.txt index a30836152e..3316f636e7 100644 --- a/examples/protocols/esp_http_client/CMakeLists.txt +++ b/examples/protocols/esp_http_client/CMakeLists.txt @@ -2,12 +2,12 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) +set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) + if(${IDF_TARGET} STREQUAL "linux") - set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/mocks/freertos/" + list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/mocks/freertos/" "$ENV{IDF_PATH}/examples/protocols/linux_stubs/esp_stubs") set(COMPONENTS main) -else() - set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) endif() include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/examples/protocols/esp_http_client/main/CMakeLists.txt b/examples/protocols/esp_http_client/main/CMakeLists.txt index 783d70fa84..cc80568867 100644 --- a/examples/protocols/esp_http_client/main/CMakeLists.txt +++ b/examples/protocols/esp_http_client/main/CMakeLists.txt @@ -3,7 +3,7 @@ # (If this was a component, we would set COMPONENT_EMBED_TXTFILES here.) set(requires "") if(${IDF_TARGET} STREQUAL "linux") - list(APPEND requires esp_stubs esp-tls esp_http_client) + list(APPEND requires esp_stubs esp-tls esp_http_client protocol_examples_common) endif() idf_component_register(SRCS "esp_http_client_example.c" INCLUDE_DIRS "." diff --git a/examples/protocols/linux_stubs/esp_stubs/esp_stubs.c b/examples/protocols/linux_stubs/esp_stubs/esp_stubs.c index 33f0cfd0ff..b0edaecd2b 100644 --- a/examples/protocols/linux_stubs/esp_stubs/esp_stubs.c +++ b/examples/protocols/linux_stubs/esp_stubs/esp_stubs.c @@ -19,11 +19,6 @@ esp_err_t esp_netif_init(void) return ESP_OK; } -esp_err_t example_connect(void) -{ - return ESP_OK; -} - esp_err_t nvs_flash_init(void) { return ESP_OK; diff --git a/examples/protocols/linux_stubs/esp_stubs/include/protocol_examples_common.h b/examples/protocols/linux_stubs/esp_stubs/include/protocol_examples_common.h deleted file mode 100644 index 416377a82d..0000000000 --- a/examples/protocols/linux_stubs/esp_stubs/include/protocol_examples_common.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Unlicense OR CC0-1.0 - */ -#include "esp_err.h" - -esp_err_t example_connect(void);