fix(grid,flex): fix compile errors when grid or flex is disabled (#5289)

This commit is contained in:
Gabor Kiss-Vamosi
2024-01-12 03:41:14 +01:00
committed by GitHub
parent 236a2a2672
commit 8df95aaf4b
16 changed files with 180 additions and 63 deletions

View File

@@ -18,6 +18,10 @@
#error "LV_FONT_MONTSERRAT_24 is required for lv_demo_benchmark. Enable it in lv_conf.h."
#endif
#if LV_USE_DEMO_WIDGETS == 0
#error "LV_USE_DEMO_WIDGETS needs to be enabled"
#endif
#include "../../src/display/lv_display_private.h"
#include "../../src/core/lv_global.h"

View File

@@ -15,6 +15,16 @@ extern "C" {
*********************/
#include "../lv_demos.h"
#if LV_USE_DEMO_MULTILANG
#if LV_USE_GRID == 0
#error "LV_USE_GRID needs to be enabled"
#endif
#if LV_USE_FLEX == 0
#error "LV_USE_FLEX needs to be enabled"
#endif
/*********************
* DEFINES
*********************/
@@ -32,6 +42,8 @@ void lv_demo_multilang(void);
* MACROS
**********************/
#endif /*LV_USE_DEMO_MULTILANG*/
#ifdef __cplusplus
} /* extern "C" */
#endif

View File

@@ -14,8 +14,13 @@ extern "C" {
* INCLUDES
*********************/
#include "lv_demo_music.h"
#if LV_USE_DEMO_MUSIC
#if LV_USE_GRID == 0
#error "LV_USE_GRID needs to be enabled"
#endif
/*********************
* DEFINES
*********************/

View File

@@ -9,6 +9,7 @@
#include "lv_demo_render.h"
#if LV_USE_DEMO_RENDER
#include "../../src/display/lv_display_private.h"
#include "../../src/core/lv_global.h"

View File

@@ -17,6 +17,10 @@ extern "C" {
#if LV_USE_DEMO_RENDER
#if LV_USE_GRID == 0
#error "LV_USE_GRID needs to be enabled"
#endif
/*********************
* DEFINES
*********************/

View File

@@ -10,10 +10,6 @@
#if LV_USE_DEMO_TRANSFORM
#if LV_FONT_MONTSERRAT_18 == 0
#error "LV_FONT_MONTSERRAT_18 is required for lv_demo_transform. Enable it in lv_conf.h."
#endif
/*********************
* DEFINES
*********************/

View File

@@ -15,6 +15,16 @@ extern "C" {
*********************/
#include "../lv_demos.h"
#if LV_USE_DEMO_TRANSFORM
#if LV_FONT_MONTSERRAT_18 == 0
#error "LV_FONT_MONTSERRAT_18 is required for lv_demo_transform. Enable it in lv_conf.h."
#endif
#if LV_USE_GRID == 0
#error "LV_USE_GRID needs to be enabled"
#endif
/*********************
* DEFINES
*********************/
@@ -32,6 +42,8 @@ void lv_demo_transform(void);
* MACROS
**********************/
#endif /*LV_USE_DEMO_TRANSFORM*/
#ifdef __cplusplus
} /* extern "C" */
#endif

View File

@@ -15,6 +15,16 @@ extern "C" {
*********************/
#include "../lv_demos.h"
#if LV_USE_DEMO_WIDGETS
#if LV_USE_GRID == 0
#error "LV_USE_GRID needs to be enabled"
#endif
#if LV_USE_FLEX == 0
#error "LV_USE_FLEX needs to be enabled"
#endif
/*********************
* DEFINES
*********************/
@@ -33,6 +43,8 @@ void lv_demo_widgets_start_slideshow(void);
* MACROS
**********************/
#endif /*LV_USE_DEMO_WIDGETS*/
#ifdef __cplusplus
} /* extern "C" */
#endif