From 37c3162bbebf75320c48024cbd7d575617aaa8a6 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 19 Apr 2021 20:22:38 +0200 Subject: [PATCH] Revert "feat(conf) automatically enable LV_LVGL_H_INCLUDE_SIMPLE if lvgl.h can be included" This reverts commit a995695cdf51d8ee476f19e619851fd40d7c90cf. __has_include("lvgl.h") is always true beacsue it's next to lv_conf_internal.h. --- scripts/lv_conf_checker.py | 5 ----- src/lv_conf_internal.h | 5 ----- 2 files changed, 10 deletions(-) diff --git a/scripts/lv_conf_checker.py b/scripts/lv_conf_checker.py index f83607958e..d7cdaa2a44 100755 --- a/scripts/lv_conf_checker.py +++ b/scripts/lv_conf_checker.py @@ -42,11 +42,6 @@ fout.write( # define LV_CONF_INCLUDE_SIMPLE # endif # endif -# if __has_include("lvgl.h") -# ifndef LV_LVGL_H_INCLUDE_SIMPLE -# define LV_LVGL_H_INCLUDE_SIMPLE -# endif -# endif #endif /*If lv_conf.h is not skipped include it*/ diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index 5632b41e6d..b06911ff60 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -25,11 +25,6 @@ # define LV_CONF_INCLUDE_SIMPLE # endif # endif -# if __has_include("lvgl.h") -# ifndef LV_LVGL_H_INCLUDE_SIMPLE -# define LV_LVGL_H_INCLUDE_SIMPLE -# endif -# endif #endif /*If lv_conf.h is not skipped include it*/