Merge branch 'master' of https://github.com/littlevgl/lvgl

2020-10-01 16:24:01 +02:00
parent d14e642fc7 535c3d506f
commit 0b1590d9ac
1 changed files with 6 additions and 0 deletions
--- a/src/lv_conf_internal.h
+++ b/src/lv_conf_internal.h
@@ -10,6 +10,12 @@

 #include <stdint.h>

+#if defined __has_include
+#  if __has_include("lv_conf.h")
+#    define LV_CONF_INCLUDE_SIMPLE
+#  endif
+#endif
+
 /*If lv_conf.h is not skipped include it*/
 #if !defined(LV_CONF_SKIP) && !defined(CONFIG_LV_CONF_SKIP)
 #  if defined(LV_CONF_PATH)											/*If there is a path defined for lv_conf.h use it*/