mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
fix esp_http_client_example to build for Linux target. Made protocol_examples_common
compatible for Linux target
This commit is contained in:
parent
214627f14b
commit
34705c0cc4
@ -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()
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
@ -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
|
||||
*/
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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 "."
|
||||
|
@ -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;
|
||||
|
@ -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);
|
Loading…
Reference in New Issue
Block a user