add LV_CONF_INCLUDE_SIMPLE to choose between relative or simple include of lv_conf.h

2025-01-28 07:03:00 +08:00 · 2018-07-07 11:53:22 +02:00 · 2018-07-07 11:53:22 +02:00 · 90679c2cf5
commit 90679c2cf5
parent c4eaa1359d
81 changed files with 250 additions and 64 deletions
--- a/lv_core/lv_group.h
+++ b/lv_core/lv_group.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #include "lv_obj.h"

 /*********************
--- a/lv_core/lv_indev.c
+++ b/lv_core/lv_indev.c
@ -7,7 +7,6 @@
 *      INCLUDES
 ********************/
 #include "lv_indev.h"
-#include "../../lv_conf.h"

 #include "../lv_hal/lv_hal_tick.h"
 #include "../lv_core/lv_group.h"
--- a/lv_core/lv_obj.h
+++ b/lv_core/lv_obj.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #include <stddef.h>
 #include <stdbool.h>
 #include "lv_style.h"
--- a/lv_core/lv_refr.c
+++ b/lv_core/lv_refr.c
@ -6,7 +6,6 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
 #include <stddef.h>
 #include "lv_refr.h"
 #include "lv_vdb.h"
--- a/lv_core/lv_refr.h
+++ b/lv_core/lv_refr.h
@ -16,7 +16,6 @@ extern "C" {
 #include "lv_obj.h"
 #include <stdbool.h>

-
 /*********************
 *      DEFINES
 *********************/
--- a/lv_core/lv_style.c
+++ b/lv_core/lv_style.c
@ -6,8 +6,6 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
-#include "lv_style.h"
 #include "lv_obj.h"
 #include "../lv_misc/lv_mem.h"

--- a/lv_core/lv_vdb.c
+++ b/lv_core/lv_vdb.c
@ -2,12 +2,12 @@
 * @file lv_vdb.c
 *
 */
-#include "../../lv_conf.h"
+
+#include "lv_vdb.h"
 #if LV_VDB_SIZE != 0

 #include "../lv_hal/lv_hal_disp.h"
 #include <stddef.h>
-#include "lv_vdb.h"

 /*********************
 *      INCLUDES
--- a/lv_core/lv_vdb.h
+++ b/lv_core/lv_vdb.h
@ -13,7 +13,11 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif

 #if LV_VDB_SIZE != 0

--- a/lv_draw/lv_draw.c
+++ b/lv_draw/lv_draw.c
@ -6,7 +6,6 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"

 #include <stdio.h>
 #include <stdbool.h>
--- a/lv_draw/lv_draw.h
+++ b/lv_draw/lv_draw.h
@ -13,6 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include "../lv_core/lv_style.h"
 #include "../lv_misc/lv_txt.h"

--- a/lv_draw/lv_draw_rbasic.h
+++ b/lv_draw/lv_draw_rbasic.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_REAL_DRAW != 0

 #include "../lv_misc/lv_color.h"
--- a/lv_draw/lv_draw_vbasic.c
+++ b/lv_draw/lv_draw_vbasic.c
@ -3,7 +3,7 @@
 *
 */

-#include "../../lv_conf.h"
+#include "lv_draw_vbasic.h"

 #include <stdbool.h>
 #include <stdint.h>
--- a/lv_draw/lv_draw_vbasic.h
+++ b/lv_draw/lv_draw_vbasic.h
@ -13,7 +13,11 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif

 #if LV_VDB_SIZE != 0

--- a/lv_hal/lv_hal_tick.c
+++ b/lv_hal/lv_hal_tick.c
@ -6,9 +6,14 @@
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include "lv_hal_tick.h"
 #include <stddef.h>
-#include "../../lv_conf.h"

 /*********************
 *      DEFINES
--- a/lv_misc/lv_anim.h
+++ b/lv_misc/lv_anim.h
@ -14,7 +14,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_ANIMATION

 #include <stdint.h>
--- a/lv_misc/lv_color.h
+++ b/lv_misc/lv_color.h
@ -13,7 +13,11 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif

 #include <stdint.h>

--- a/lv_misc/lv_font.c
+++ b/lv_misc/lv_font.c
@ -6,8 +6,6 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
-
 #include <stddef.h>
 #include "lv_font.h"

--- a/lv_misc/lv_font.h
+++ b/lv_misc/lv_font.h
@ -14,7 +14,11 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif

 #include <stdint.h>
 #include <stddef.h>
--- a/lv_misc/lv_mem.c
+++ b/lv_misc/lv_mem.c
@ -7,7 +7,6 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
 #include "lv_mem.h"
 #include "lv_math.h"
 #include <string.h>
--- a/lv_misc/lv_mem.h
+++ b/lv_misc/lv_mem.h
@ -14,6 +14,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include <stdint.h>
 #include <stddef.h>

--- a/lv_misc/lv_task.c
+++ b/lv_misc/lv_task.c
@ -10,7 +10,6 @@
 #include <stddef.h>
 #include "lv_task.h"
 #include "../lv_hal/lv_hal_tick.h"
-#include "../../lv_conf.h"

 /*********************
 *      DEFINES
--- a/lv_misc/lv_task.h
+++ b/lv_misc/lv_task.h
@ -14,6 +14,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include <stdint.h>
 #include <stdbool.h>
 #include "lv_mem.h"
--- a/lv_misc/lv_txt.c
+++ b/lv_misc/lv_txt.c
@ -7,7 +7,6 @@
 *      INCLUDES
 *********************/
 #include "lv_txt.h"
-#include "../../lv_conf.h"
 #include "lv_math.h"

 /*********************
--- a/lv_misc/lv_txt.h
+++ b/lv_misc/lv_txt.h
@ -13,6 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include <stdbool.h>
 #include "lv_area.h"
 #include "lv_font.h"
--- a/lv_misc/lv_ufs.h
+++ b/lv_misc/lv_ufs.h
@ -15,7 +15,11 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif

 #if USE_LV_FILESYSTEM

--- a/lv_objx/lv_bar.c
+++ b/lv_objx/lv_bar.c
@ -8,10 +8,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_bar.h"
 #if USE_LV_BAR != 0

-#include "lv_bar.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
--- a/lv_objx/lv_bar.h
+++ b/lv_objx/lv_bar.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_BAR != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_btn.c
+++ b/lv_objx/lv_btn.c
@ -7,11 +7,10 @@
 *      INCLUDES
 *********************/

-#include "../../lv_conf.h"
+#include "lv_btn.h"
 #if USE_LV_BTN != 0

 #include <string.h>
-#include "lv_btn.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
--- a/lv_objx/lv_btn.h
+++ b/lv_objx/lv_btn.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_BTN != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_btnm.c
+++ b/lv_objx/lv_btnm.c
@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_btnm.h"
 #if USE_LV_BTNM != 0

-#include "lv_btnm.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_core/lv_refr.h"
--- a/lv_objx/lv_btnm.h
+++ b/lv_objx/lv_btnm.h
@ -14,7 +14,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_BTNM != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_cb.c
+++ b/lv_objx/lv_cb.c
@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_cb.h"
 #if USE_LV_CB != 0

-#include "lv_cb.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"

--- a/lv_objx/lv_cb.h
+++ b/lv_objx/lv_cb.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_CB != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_chart.c
+++ b/lv_objx/lv_chart.c
@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_chart.h"
 #if USE_LV_CHART != 0

-#include "lv_chart.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"

--- a/lv_objx/lv_chart.h
+++ b/lv_objx/lv_chart.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_CHART != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_cont.c
+++ b/lv_objx/lv_cont.c
@ -6,15 +6,14 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"

+#include "lv_cont.h"
 #if USE_LV_CONT != 0

 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>

-#include "lv_cont.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_draw/lv_draw_vbasic.h"
 #include "../lv_themes/lv_theme.h"
--- a/lv_objx/lv_cont.h
+++ b/lv_objx/lv_cont.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_CONT != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_ddlist.c
+++ b/lv_objx/lv_ddlist.c
@ -7,10 +7,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_ddlist.h"
 #if USE_LV_DDLIST != 0

-#include "lv_ddlist.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_core/lv_indev.h"
--- a/lv_objx/lv_ddlist.h
+++ b/lv_objx/lv_ddlist.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_DDLIST != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_gauge.c
+++ b/lv_objx/lv_gauge.c
@ -7,10 +7,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_gauge.h"
 #if USE_LV_GAUGE != 0

-#include "lv_gauge.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_txt.h"
--- a/lv_objx/lv_gauge.h
+++ b/lv_objx/lv_gauge.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_GAUGE != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_img.c
+++ b/lv_objx/lv_img.c
@ -6,7 +6,7 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_img.h"
 #if USE_LV_IMG != 0

 /*Testing of dependencies*/
@ -14,7 +14,6 @@
 #error "lv_img: lv_label is required. Enable it in lv_conf.h (USE_LV_LABEL  1) "
 #endif

-#include "lv_img.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_fs.h"
 #include "../lv_misc/lv_ufs.h"
--- a/lv_objx/lv_img.h
+++ b/lv_objx/lv_img.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_IMG != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_kb.c
+++ b/lv_objx/lv_kb.c
@ -7,10 +7,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_kb.h"
 #if USE_LV_KB != 0

-#include "lv_kb.h"
 #include "lv_ta.h"
 #include "../lv_themes/lv_theme.h"

--- a/lv_objx/lv_kb.h
+++ b/lv_objx/lv_kb.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_KB != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_label.c
+++ b/lv_objx/lv_label.c
@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_label.h"
 #if USE_LV_LABEL != 0

-#include "lv_label.h"
 #include "../lv_core/lv_obj.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
--- a/lv_objx/lv_label.h
+++ b/lv_objx/lv_label.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_LABEL != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_led.c
+++ b/lv_objx/lv_led.c
@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_led.h"
 #if USE_LV_LED != 0

-#include "lv_led.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_draw/lv_draw.h"

--- a/lv_objx/lv_led.h
+++ b/lv_objx/lv_led.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_LED != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_line.c
+++ b/lv_objx/lv_line.c
@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_line.h"

 #if USE_LV_LINE != 0
-#include "lv_line.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_misc/lv_math.h"
 #include <stdbool.h>
--- a/lv_objx/lv_line.h
+++ b/lv_objx/lv_line.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_LINE != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_list.c
+++ b/lv_objx/lv_list.c
@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_list.h"
 #if USE_LV_LIST != 0

-#include "lv_list.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
--- a/lv_objx/lv_list.h
+++ b/lv_objx/lv_list.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_LIST != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_lmeter.c
+++ b/lv_objx/lv_lmeter.c
@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_lmeter.h"
 #if USE_LV_LMETER != 0

-#include "lv_lmeter.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_core/lv_group.h"
--- a/lv_objx/lv_lmeter.h
+++ b/lv_objx/lv_lmeter.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_LMETER != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_mbox.c
+++ b/lv_objx/lv_mbox.c
@ -7,10 +7,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_mbox.h"
 #if USE_LV_MBOX != 0

-#include "lv_mbox.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
--- a/lv_objx/lv_mbox.h
+++ b/lv_objx/lv_mbox.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_MBOX != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_objx_templ.c
+++ b/lv_objx/lv_objx_templ.c
@ -13,10 +13,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+//#include "lv_templ.h"	/*TODO uncomment this*/
 #if USE_LV_TEMPL != 0

-#include "lv_templ.h"

 /*********************
 *      DEFINES
--- a/lv_objx/lv_objx_templ.h
+++ b/lv_objx/lv_objx_templ.h
@ -21,7 +21,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_TEMPL != 0

 #include "../lv_core/lv_obj.h"
--- a/lv_objx/lv_page.c
+++ b/lv_objx/lv_page.c
@ -6,11 +6,10 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "../lv_objx/lv_page.h"
 #if USE_LV_PAGE != 0

 #include "../lv_core/lv_group.h"
-#include "../lv_objx/lv_page.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_core/lv_refr.h"
--- a/lv_objx/lv_page.h
+++ b/lv_objx/lv_page.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_PAGE != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_roller.c
+++ b/lv_objx/lv_roller.c
@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_roller.h"
 #if USE_LV_ROLLER != 0

-#include "lv_roller.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
--- a/lv_objx/lv_roller.h
+++ b/lv_objx/lv_roller.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_ROLLER != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_slider.c
+++ b/lv_objx/lv_slider.c
@ -7,10 +7,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_slider.h"
 #if USE_LV_SLIDER != 0

-#include "lv_slider.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
--- a/lv_objx/lv_slider.h
+++ b/lv_objx/lv_slider.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_SLIDER != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_sw.c
+++ b/lv_objx/lv_sw.c
@ -6,7 +6,7 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_sw.h"
 #if USE_LV_SW != 0

 /*Testing of dependencies*/
@ -14,7 +14,6 @@
 #error "lv_sw: lv_slider is required. Enable it in lv_conf.h (USE_LV_SLIDER  1) "
 #endif

-#include "lv_sw.h"
 #include "../lv_themes/lv_theme.h"

 /*********************
--- a/lv_objx/lv_sw.h
+++ b/lv_objx/lv_sw.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_SW != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_ta.c
+++ b/lv_objx/lv_ta.c
@ -7,10 +7,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_ta.h"
 #if USE_LV_TA != 0

-#include "lv_ta.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
--- a/lv_objx/lv_ta.h
+++ b/lv_objx/lv_ta.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_TA != 0

 /*Testing of dependencies*/
--- a/lv_objx/lv_tabview.c
+++ b/lv_objx/lv_tabview.c
@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_tabview.h"
 #if USE_LV_TABVIEW != 0

-#include "lv_tabview.h"
 #include "lv_btnm.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
--- a/lv_objx/lv_tabview.h
+++ b/lv_objx/lv_tabview.h
@ -13,9 +13,13 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
-#if USE_LV_TABVIEW != 0
+#endif

+#if USE_LV_TABVIEW != 0

 /*Testing of dependencies*/
 #if USE_LV_BTNM == 0
--- a/lv_objx/lv_win.c
+++ b/lv_objx/lv_win.c
@ -6,10 +6,9 @@
 /*********************
 *      INCLUDES
 *********************/
-#include "../../lv_conf.h"
+#include "lv_win.h"
 #if USE_LV_WIN != 0

-#include "lv_win.h"
 #include "../lv_themes/lv_theme.h"

 /*********************
--- a/lv_objx/lv_win.h
+++ b/lv_objx/lv_win.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_WIN != 0

 /*Testing of dependencies*/
--- a/lv_themes/lv_theme.h
+++ b/lv_themes/lv_theme.h
@ -13,7 +13,12 @@ extern "C" {
 /*********************
 *    INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #include "../lv_core/lv_style.h"

 /*********************
--- a/lv_themes/lv_theme_alien.h
+++ b/lv_themes/lv_theme_alien.h
@ -13,7 +13,11 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif

 #if USE_LV_THEME_ALIEN

--- a/lv_themes/lv_theme_default.h
+++ b/lv_themes/lv_theme_default.h
@ -13,7 +13,11 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif

 #if USE_LV_THEME_DEFAULT

--- a/lv_themes/lv_theme_material.h
+++ b/lv_themes/lv_theme_material.h
@ -13,7 +13,11 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif

 #if USE_LV_THEME_MATERIAL

--- a/lv_themes/lv_theme_mono.h
+++ b/lv_themes/lv_theme_mono.h
@ -13,7 +13,11 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif

 #if USE_LV_THEME_MONO

--- a/lv_themes/lv_theme_night.h
+++ b/lv_themes/lv_theme_night.h
@ -13,7 +13,11 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif

 #if USE_LV_THEME_NIGHT

--- a/lv_themes/lv_theme_templ.h
+++ b/lv_themes/lv_theme_templ.h
@ -13,7 +13,11 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif

 #if USE_LV_THEME_TEMPL

--- a/lv_themes/lv_theme_zen.h
+++ b/lv_themes/lv_theme_zen.h
@ -13,7 +13,11 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif

 #if USE_LV_THEME_ZEN