diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a65216f6..427231d76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ if(ESP_PLATFORM) file(GLOB_RECURSE SOURCES src/*.c) idf_component_register(SRCS ${SOURCES} - INCLUDE_DIRS . src + INCLUDE_DIRS . src ../ REQUIRES main) target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DLV_CONF_INCLUDE_SIMPLE") diff --git a/scripts/lv_conf_checker.py b/scripts/lv_conf_checker.py index 1ecb9928f..d7cdaa2a4 100755 --- a/scripts/lv_conf_checker.py +++ b/scripts/lv_conf_checker.py @@ -27,11 +27,12 @@ fout.write( #include -/*Handle special Kconfig options*/ -#include "lv_conf_kconfig.h" - -#ifdef CONFIG_LV_CONF_SKIP -#define LV_CONF_SKIP +/* Handle special Kconfig options */ +#ifndef LV_KCONFIG_IGNORE +# include "lv_conf_kconfig.h" +# ifdef CONFIG_LV_CONF_SKIP +# define LV_CONF_SKIP +# endif #endif /*If "lv_conf.h" is available from here try to use it later.*/ diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index 6767c529d..dc04072a8 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -10,11 +10,12 @@ #include -/*Handle special Kconfig options*/ -#include "lv_conf_kconfig.h" - -#ifdef CONFIG_LV_CONF_SKIP -#define LV_CONF_SKIP +/* Handle special Kconfig options */ +#ifndef LV_KCONFIG_IGNORE +# include "lv_conf_kconfig.h" +# ifdef CONFIG_LV_CONF_SKIP +# define LV_CONF_SKIP +# endif #endif /*If "lv_conf.h" is available from here try to use it later.*/