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

2018-07-07 11:53:22 +02:00
parent c4eaa1359d
commit 90679c2cf5
81 changed files with 250 additions and 64 deletions
--- 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