github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-7.0' into feat-new-style

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-12-26 04:18:21 +01:00
parent f5aebd4c2c 921b191124
commit 5dcee31f94
86 changed files with 594 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lv_core/lv_obj.h
View File

@@ -13,11 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../../lv_conf.h"
#endif
#include "../lv_conf_internal.h"
#include <stddef.h>
#include <stdbool.h>
@@ -27,7 +23,6 @@ extern "C" {
#include "../lv_misc/lv_mem.h"
#include "../lv_misc/lv_ll.h"
#include "../lv_misc/lv_color.h"
#include "../lv_misc/lv_log.h"
#include "../lv_misc/lv_bidi.h"
#include "../lv_hal/lv_hal.h"
#include "../lv_draw/lv_draw_rect.h"