fix compiling of examples when cmake is used (#2572)

* use INCLUDE_SIMPLE in all c sources * removed unnecessary ifdef LV_LVGL_H_INCLUDE_SIMPLE
2021-09-20 13:42:47 +02:00
parent ab50f001a6
commit a31f4b77bf
9 changed files with 9 additions and 45 deletions
--- a/examples/assets/animimg001.c
+++ b/examples/assets/animimg001.c
@@ -1,8 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
+#include "../../lvgl.h"

 #if LV_BUILD_EXAMPLES

--- a/examples/assets/animimg002.c
+++ b/examples/assets/animimg002.c
@@ -1,8 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
+#include "../../lvgl.h"

 #if LV_BUILD_EXAMPLES

--- a/examples/assets/animimg003.c
+++ b/examples/assets/animimg003.c
@@ -1,8 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
+#include "../../lvgl.h"

 #if LV_BUILD_EXAMPLES

--- a/examples/assets/img_caret_down.c
+++ b/examples/assets/img_caret_down.c
@@ -1,8 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
+#include "../../lvgl.h"

 #if LV_BUILD_EXAMPLES

--- a/examples/assets/img_skew_strip.c
+++ b/examples/assets/img_skew_strip.c
@@ -1,8 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
+#include "../../lvgl.h"

 #if LV_BUILD_EXAMPLES

--- a/examples/assets/img_star.c
+++ b/examples/assets/img_star.c
@@ -1,8 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
+#include "../../lvgl.h"

 #if LV_BUILD_EXAMPLES

--- a/examples/assets/imgbtn_left.c
+++ b/examples/assets/imgbtn_left.c
@@ -1,8 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
+#include "../../lvgl.h"

 #if LV_BUILD_EXAMPLES

--- a/examples/assets/imgbtn_mid.c
+++ b/examples/assets/imgbtn_mid.c
@@ -1,8 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
+#include "../../lvgl.h"

 #if LV_BUILD_EXAMPLES

--- a/examples/assets/imgbtn_right.c
+++ b/examples/assets/imgbtn_right.c
@@ -1,8 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
+#include "../../lvgl.h"

 #if LV_BUILD_EXAMPLES