sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

examples/lvgldemo: LVGL examples are now called lv_demos and not

Browse Source 
lv_examples.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche 2021-06-01 13:57:43 +01:00 committed by Xiang Xiao
parent d6d458c60b
commit 4a72b8d132
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/lvgldemo/.gitignore vendored
View File

@ -1,2 +1,2 @@
/*.zip /*.zip
/lv_examples /lv_demos

22
examples/lvgldemo/Makefile
View File

@ -37,12 +37,12 @@ include $(APPDIR)/Make.defs
# LittleVGL demo built-in application info # LittleVGL demo built-in application info
CONFIG_LV_EXAMPLES_URL ?= https://github.com/lvgl/lv_examples/archive CONFIG_LV_EXAMPLES_URL ?= https://github.com/lvgl/lv_demos/archive
LVGL_EXAMPLES_VERSION = $(patsubst "%",%,$(strip $(CONFIG_LVGL_VERSION))) LVGL_EXAMPLES_VERSION = $(patsubst "%",%,$(strip $(CONFIG_LVGL_VERSION)))
LVGL_EXAMPLES_TARBALL = v$(LVGL_EXAMPLES_VERSION).zip LVGL_EXAMPLES_TARBALL = v$(LVGL_EXAMPLES_VERSION).zip
LVGL_EXAMPLES_UNPACKNAME = lv_examples LVGL_EXAMPLES_UNPACKNAME = lv_demos
UNPACK ?= unzip -o UNPACK ?= unzip -o
PROGNAME = lvgldemo PROGNAME = lvgldemo
@ -60,31 +60,31 @@ endif
# static common assets used in multiple examples # static common assets used in multiple examples
LV_EXAMPLE_ASSETS = $(wildcard ./lv_examples/assets/*.c) LV_EXAMPLE_ASSETS = $(wildcard ./lv_demos/assets/*.c)
CSRCS += $(notdir $(LV_EXAMPLE_ASSETS)) CSRCS += $(notdir $(LV_EXAMPLE_ASSETS))
VPATH += lv_examples/assets VPATH += lv_demos/assets
ifneq ($(CONFIG_EXAMPLES_LVGLDEMO_BENCHMARK),) ifneq ($(CONFIG_EXAMPLES_LVGLDEMO_BENCHMARK),)
CSRCS += lv_demo_benchmark.c CSRCS += lv_demo_benchmark.c
VPATH += lv_examples/src/lv_demo_benchmark VPATH += lv_demos/src/lv_demo_benchmark
endif endif
ifneq ($(CONFIG_EXAMPLES_LVGLDEMO_PRINTER),) ifneq ($(CONFIG_EXAMPLES_LVGLDEMO_PRINTER),)
LV_PRINTER_IMAGES = $(wildcard ./lv_examples/src/lv_demo_printer/images/*.c) LV_PRINTER_IMAGES = $(wildcard ./lv_demos/src/lv_demo_printer/images/*.c)
CSRCS += lv_demo_printer.c lv_demo_printer_theme.c CSRCS += lv_demo_printer.c lv_demo_printer_theme.c
CSRCS += $(notdir $(LV_PRINTER_IMAGES)) CSRCS += $(notdir $(LV_PRINTER_IMAGES))
VPATH += lv_examples/src/lv_demo_printer VPATH += lv_demos/src/lv_demo_printer
VPATH += lv_examples/src/lv_demo_printer/images VPATH += lv_demos/src/lv_demo_printer/images
endif endif
ifneq ($(CONFIG_EXAMPLES_LVGLDEMO_STRESS),) ifneq ($(CONFIG_EXAMPLES_LVGLDEMO_STRESS),)
CSRCS += lv_demo_stress.c CSRCS += lv_demo_stress.c
VPATH += lv_examples/src/lv_demo_stress VPATH += lv_demos/src/lv_demo_stress
endif endif
ifneq ($(CONFIG_EXAMPLES_LVGLDEMO_WIDGETS),) ifneq ($(CONFIG_EXAMPLES_LVGLDEMO_WIDGETS),)
CSRCS += lv_demo_widgets.c CSRCS += lv_demo_widgets.c
VPATH += lv_examples/src/lv_demo_widgets VPATH += lv_demos/src/lv_demo_widgets
endif endif
MAINSRC = lvgldemo.c MAINSRC = lvgldemo.c
@ -99,7 +99,7 @@ $(LVGL_EXAMPLES_TARBALL):
$(LVGL_EXAMPLES_UNPACKNAME): $(LVGL_EXAMPLES_TARBALL) $(LVGL_EXAMPLES_UNPACKNAME): $(LVGL_EXAMPLES_TARBALL)
@echo "Unpacking: $(LVGL_EXAMPLES_TARBALL) -> $(LVGL_EXAMPLES_UNPACKNAME)" @echo "Unpacking: $(LVGL_EXAMPLES_TARBALL) -> $(LVGL_EXAMPLES_UNPACKNAME)"
$(Q) $(UNPACK) $(LVGL_EXAMPLES_TARBALL) $(Q) $(UNPACK) $(LVGL_EXAMPLES_TARBALL)
$(Q) mv lv_examples-$(LVGL_EXAMPLES_VERSION) $(LVGL_EXAMPLES_UNPACKNAME) $(Q) mv lv_demos-$(LVGL_EXAMPLES_VERSION) $(LVGL_EXAMPLES_UNPACKNAME)
$(Q) touch $(LVGL_EXAMPLES_UNPACKNAME) $(Q) touch $(LVGL_EXAMPLES_UNPACKNAME)
context:: $(LVGL_EXAMPLES_UNPACKNAME) context:: $(LVGL_EXAMPLES_UNPACKNAME)