move lv_fonts from lv_misc next to lv_misc

2018-07-07 12:21:36 +02:00
parent 90679c2cf5
commit a6ee4a680c
69 changed files with 86 additions and 78 deletions
--- a/lv_objx/lv_bar.h
+++ b/lv_objx/lv_bar.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_btn.h
+++ b/lv_objx/lv_btn.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_btnm.h
+++ b/lv_objx/lv_btnm.h
@@ -14,7 +14,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_cb.h
+++ b/lv_objx/lv_cb.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_chart.h
+++ b/lv_objx/lv_chart.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_cont.h
+++ b/lv_objx/lv_cont.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_ddlist.c
+++ b/lv_objx/lv_ddlist.c
@@ -14,7 +14,7 @@
 #include "../lv_core/lv_group.h"
 #include "../lv_core/lv_indev.h"
 #include "../lv_themes/lv_theme.h"
-#include "../lv_misc/lv_fonts/lv_symbol_def.h"
+#include "../lv_misc/lv_symbol_def.h"
 #include "../lv_misc/lv_anim.h"

 /*********************
--- a/lv_objx/lv_ddlist.h
+++ b/lv_objx/lv_ddlist.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_gauge.h
+++ b/lv_objx/lv_gauge.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_img.h
+++ b/lv_objx/lv_img.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
@@ -23,7 +23,7 @@ extern "C" {

 #include "../lv_core/lv_obj.h"
 #include "../lv_misc/lv_fs.h"
-#include "../lv_misc/lv_fonts/lv_symbol_def.h"
+#include "../lv_misc/lv_symbol_def.h"
 #include "lv_label.h"
 #include "../lv_draw/lv_draw.h"

--- a/lv_objx/lv_kb.h
+++ b/lv_objx/lv_kb.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_label.h
+++ b/lv_objx/lv_label.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
@@ -24,7 +24,7 @@ extern "C" {
 #include "../lv_core/lv_obj.h"
 #include "../lv_misc/lv_font.h"
 #include "../lv_misc/lv_txt.h"
-#include "../lv_misc/lv_fonts/lv_symbol_def.h"
+#include "../lv_misc/lv_symbol_def.h"

 /*********************
 *      DEFINES
--- a/lv_objx/lv_led.h
+++ b/lv_objx/lv_led.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_line.h
+++ b/lv_objx/lv_line.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_list.h
+++ b/lv_objx/lv_list.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_lmeter.h
+++ b/lv_objx/lv_lmeter.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_mbox.h
+++ b/lv_objx/lv_mbox.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_objx.mk
+++ b/lv_objx/lv_objx.mk
@@ -5,7 +5,7 @@ CSRCS += lv_ddlist.c
 CSRCS += lv_kb.c
 CSRCS += lv_line.c
 CSRCS += lv_mbox.c
-CSRCS += lv_preloader.c
+CSRCS += lv_preload.c
 CSRCS += lv_roller.c
 CSRCS += lv_tabview.c
 CSRCS += lv_btn.c
--- a/lv_objx/lv_objx_templ.h
+++ b/lv_objx/lv_objx_templ.h
@@ -21,7 +21,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_page.h
+++ b/lv_objx/lv_page.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_roller.h
+++ b/lv_objx/lv_roller.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_slider.h
+++ b/lv_objx/lv_slider.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_sw.h
+++ b/lv_objx/lv_sw.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_ta.h
+++ b/lv_objx/lv_ta.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_tabview.h
+++ b/lv_objx/lv_tabview.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
--- a/lv_objx/lv_win.h
+++ b/lv_objx/lv_win.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"