From 04c08742acf4d6008799ed5aa79dd14f5854963f Mon Sep 17 00:00:00 2001 From: andrey Date: Fri, 6 Nov 2020 17:23:09 +0300 Subject: [PATCH] esp --- esp-idf/CMakeLists.txt | 32 ++++++++++++++++---------------- libs/compress/picompress.cpp | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/esp-idf/CMakeLists.txt b/esp-idf/CMakeLists.txt index bc695488..094639c1 100644 --- a/esp-idf/CMakeLists.txt +++ b/esp-idf/CMakeLists.txt @@ -2,26 +2,26 @@ set(COMPONENT_SRCS "main.cpp") set(COMPONENT_ADD_INCLUDEDIRS "../libs/main") list(APPEND COMPONENT_ADD_INCLUDEDIRS "../libs/main/containers") list(APPEND COMPONENT_ADD_INCLUDEDIRS "../libs/main/core") -set(COMPONENT_PRIV_REQUIRES pthread lwip freertos vfs spiffs) +set(COMPONENT_PRIV_REQUIRES pthread lwip freertos vfs spi_flash libsodium) register_component() set(PIP_FREERTOS ON) set(LIB OFF) set(INCLUDE_DIRS ${IDF_INCLUDE_DIRECTORIES}) -list(APPEND INCLUDE_DIRS "../newlib/platform_include") -list(APPEND INCLUDE_DIRS "../newlib/include") -list(APPEND INCLUDE_DIRS "../libsodium/libsodium/src/libsodium/include") -list(APPEND INCLUDE_DIRS "../libsodium/port_include") -list(APPEND INCLUDE_DIRS "../heap/include") -list(APPEND INCLUDE_DIRS "../esp_rom/include/esp32") -list(APPEND INCLUDE_DIRS "../driver/include") -list(APPEND INCLUDE_DIRS "../spi_flash/include") -list(APPEND INCLUDE_DIRS "../spiffs/include") -list(APPEND INCLUDE_DIRS "../soc/include") -list(APPEND INCLUDE_DIRS "../soc/esp32/include") -list(APPEND INCLUDE_DIRS "../freertos/include") -list(APPEND INCLUDE_DIRS "../lwip/lwip/src/include") -list(APPEND INCLUDE_DIRS "../lwip/port/esp32/include") -list(APPEND INCLUDE_DIRS "../vfs/include") +list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/newlib/platform_include) +list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/newlib/include) +list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/libsodium/libsodium/src/libsodium/include) +list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/libsodium/port_include) +list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/heap/include) +list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/esp_rom/include/esp32) +list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/driver/include) +list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/spi_flash/include) +list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/spiffs/include) +list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/soc/include) +list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/soc/esp32/include) +list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/freertos/include) +list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/lwip/lwip/src/include) +list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/lwip/port/esp32/include) +list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/vfs/include) include_directories(${INCLUDE_DIRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}/pip) #message("IDF_COMPILE_DEFINITIONS = ${IDF_COMPILE_DEFINITIONS}") diff --git a/libs/compress/picompress.cpp b/libs/compress/picompress.cpp index 16c0dcaa..b9d73a51 100644 --- a/libs/compress/picompress.cpp +++ b/libs/compress/picompress.cpp @@ -20,7 +20,7 @@ #include "picompress.h" #ifdef PIP_COMPRESS # ifdef FREERTOS -# include "rom/miniz.h" +# include "esp32/rom/miniz.h" # define compress2 mz_compress2 # define Z_OK MZ_OK # define uncompress mz_uncompress