Skip to content

Commit 6ce2871

Browse files
amirgonamirgon
committed
Align to Micropyton v1.20.0
Move LVGL build rules to exmod.mk Update lv_bindings
1 parent 5af201d commit 6ce2871

File tree

5 files changed

+65
-61
lines changed

5 files changed

+65
-61
lines changed

‎.gitpod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ tasks:
1515
# source tools/ci.sh && ci_esp32_build
1616
command: |
1717
xrandr --fb 500x500 # Fix resolution for LVGL screens which are smaller
18-
ports/unix/micropython-dev -i lib/lv_bindings/examples/advanced_demo.py
18+
ports/unix/build-standard/micropython -i lib/lv_bindings/examples/advanced_demo.py
1919
vscode:
2020
extensions:
2121
- ms-vscode.cpptools

‎extmod/extmod.mk‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,3 +366,66 @@ include $(TOP)/extmod/btstack/btstack.mk
366366
endif
367367

368368
endif
369+
370+
################################################################################
371+
# LVGL
372+
373+
# Additional optional libraries
374+
375+
ifneq ($(UNAME_S),Darwin)
376+
CFLAGS_EXTMOD += -DMICROPY_FB=1
377+
endif
378+
379+
SDL_CFLAGS_EXTMOD := $(shell pkg-config --silence-errors --cflags sdl2)
380+
SDL_LDFLAGS_EXTMOD := $(shell pkg-config --silence-errors --libs sdl2)
381+
ifneq ($(SDL_LDFLAGS_EXTMOD),)
382+
CFLAGS_EXTMOD += $(SDL_CFLAGS_EXTMOD) -DMICROPY_SDL=1
383+
LDFLAGS_EXTMOD += $(SDL_LDFLAGS_EXTMOD)
384+
endif
385+
386+
RLOTTIE_CFLAGS_EXTMOD := $(shell pkg-config --silence-errors --cflags rlottie)
387+
RLOTTIE_LDFLAGS_EXTMOD := $(shell pkg-config --silence-errors --libs rlottie)
388+
ifneq ($(RLOTTIE_LDFLAGS_EXTMOD),)
389+
CFLAGS_EXTMOD += $(RLOTTIE_CFLAGS_EXTMOD) -DMICROPY_RLOTTIE=1
390+
LDFLAGS_EXTMOD += $(RLOTTIE_LDFLAGS_EXTMOD)
391+
endif
392+
393+
FREETYPE_CFLAGS_EXTMOD := $(shell pkg-config --silence-errors --cflags freetype2)
394+
FREETYPE_LDFLAGS_EXTMOD := $(shell pkg-config --silence-errors --libs freetype2)
395+
ifneq ($(FREETYPE_LDFLAGS_EXTMOD),)
396+
CFLAGS_EXTMOD += $(FREETYPE_CFLAGS_EXTMOD) -DMICROPY_FREETYPE=1
397+
LDFLAGS_EXTMOD += $(FREETYPE_LDFLAGS_EXTMOD)
398+
endif
399+
400+
FFMPEG_LIBS := libavformat libavcodec libswscale libavutil
401+
FFMPEG_CFLAGS_EXTMOD := $(shell pkg-config --silence-errors --cflags $(FFMPEG_LIBS))
402+
FFMPEG_LDFLAGS_EXTMOD := $(shell pkg-config --silence-errors --libs $(FFMPEG_LIBS))
403+
ifneq ($(FFMPEG_LDFLAGS_EXTMOD),)
404+
CFLAGS_EXTMOD += $(FFMPEG_CFLAGS_EXTMOD) -DMICROPY_FFMPEG=1
405+
LDFLAGS_EXTMOD += $(FFMPEG_LDFLAGS_EXTMOD)
406+
endif
407+
408+
# LVGL build rules
409+
410+
LVGL_BINDING_DIR = $(TOP)/lib/lv_bindings
411+
LVGL_DIR = $(LVGL_BINDING_DIR)/lvgl
412+
LVGL_GENERIC_DRV_DIR = $(LVGL_BINDING_DIR)/driver/generic
413+
INC += -I$(LVGL_BINDING_DIR)
414+
ALL_LVGL_SRC = $(shell find $(LVGL_DIR) -type f -name '*.h') $(LVGL_BINDING_DIR)/lv_conf.h
415+
LVGL_PP = $(BUILD)/lvgl/lvgl.pp.c
416+
LVGL_MPY = $(BUILD)/lvgl/lv_mpy.c
417+
LVGL_MPY_METADATA = $(BUILD)/lvgl/lv_mpy.json
418+
CFLAGS_EXTMOD += $(LV_CFLAGS)
419+
420+
$(LVGL_MPY): $(ALL_LVGL_SRC) $(LVGL_BINDING_DIR)/gen/gen_mpy.py
421+
$(ECHO) "LVGL-GEN $@"
422+
$(Q)mkdir -p $(dir $@)
423+
$(Q)$(CPP) $(CFLAGS_EXTMOD) -DPYCPARSER -x c -I $(LVGL_BINDING_DIR)/pycparser/utils/fake_libc_include $(INC) $(LVGL_DIR)/lvgl.h > $(LVGL_PP)
424+
$(Q)$(PYTHON) $(LVGL_BINDING_DIR)/gen/gen_mpy.py -M lvgl -MP lv -MD $(LVGL_MPY_METADATA) -E $(LVGL_PP) $(LVGL_DIR)/lvgl.h > $@
425+
426+
.PHONY: LVGL_MPY
427+
LVGL_MPY: $(LVGL_MPY)
428+
429+
CFLAGS_EXTMOD += -Wno-unused-function
430+
SRC_THIRDPARTY_C += $(subst $(TOP)/,,$(shell find $(LVGL_DIR)/src $(LVGL_DIR)/examples $(LVGL_GENERIC_DRV_DIR) -type f -name "*.c"))
431+
SRC_EXTMOD_C += $(LVGL_MPY)

‎lib/lv_bindings‎

‎ports/unix/Makefile‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -193,41 +193,6 @@ ifeq ($(MICROPY_PY_JNI),1)
193193
CFLAGS += -I/usr/lib/jvm/java-7-openjdk-amd64/include -DMICROPY_PY_JNI=1
194194
endif
195195

196-
# Additional optional libraries
197-
198-
ifneq ($(UNAME_S),Darwin)
199-
CFLAGS_MOD += -DMICROPY_FB=1
200-
endif
201-
202-
SDL_CFLAGS_MOD := $(shell pkg-config --silence-errors --cflags sdl2)
203-
SDL_LDFLAGS_MOD := $(shell pkg-config --silence-errors --libs sdl2)
204-
ifneq ($(SDL_LDFLAGS_MOD),)
205-
CFLAGS_MOD += $(SDL_CFLAGS_MOD) -DMICROPY_SDL=1
206-
LDFLAGS_MOD += $(SDL_LDFLAGS_MOD)
207-
endif
208-
209-
RLOTTIE_CFLAGS_MOD := $(shell pkg-config --silence-errors --cflags rlottie)
210-
RLOTTIE_LDFLAGS_MOD := $(shell pkg-config --silence-errors --libs rlottie)
211-
ifneq ($(RLOTTIE_LDFLAGS_MOD),)
212-
CFLAGS_MOD += $(RLOTTIE_CFLAGS_MOD) -DMICROPY_RLOTTIE=1
213-
LDFLAGS_MOD += $(RLOTTIE_LDFLAGS_MOD)
214-
endif
215-
216-
FREETYPE_CFLAGS_MOD := $(shell pkg-config --silence-errors --cflags freetype2)
217-
FREETYPE_LDFLAGS_MOD := $(shell pkg-config --silence-errors --libs freetype2)
218-
ifneq ($(FREETYPE_LDFLAGS_MOD),)
219-
CFLAGS_MOD += $(FREETYPE_CFLAGS_MOD) -DMICROPY_FREETYPE=1
220-
LDFLAGS_MOD += $(FREETYPE_LDFLAGS_MOD)
221-
endif
222-
223-
FFMPEG_LIBS := libavformat libavcodec libswscale libavutil
224-
FFMPEG_CFLAGS_MOD := $(shell pkg-config --silence-errors --cflags $(FFMPEG_LIBS))
225-
FFMPEG_LDFLAGS_MOD := $(shell pkg-config --silence-errors --libs $(FFMPEG_LIBS))
226-
ifneq ($(FFMPEG_LDFLAGS_MOD),)
227-
CFLAGS_MOD += $(FFMPEG_CFLAGS_MOD) -DMICROPY_FFMPEG=1
228-
LDFLAGS_MOD += $(FFMPEG_LDFLAGS_MOD)
229-
endif
230-
231196
# source files
232197
SRC_C += \
233198
main.c \

‎py/py.mk‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,6 @@ CXX += -m32
2828
LD += -m32
2929
endif
3030

31-
#LittlevGL
32-
LVGL_BINDING_DIR = $(TOP)/lib/lv_bindings
33-
LVGL_DIR = $(LVGL_BINDING_DIR)/lvgl
34-
LVGL_GENERIC_DRV_DIR = $(LVGL_BINDING_DIR)/driver/generic
35-
INC += -I$(LVGL_BINDING_DIR)
36-
ALL_LVGL_SRC = $(shell find $(LVGL_DIR) -type f -name '*.h') $(LVGL_BINDING_DIR)/lv_conf.h
37-
LVGL_PP = $(BUILD)/lvgl/lvgl.pp.c
38-
LVGL_MPY = $(BUILD)/lvgl/lv_mpy.c
39-
LVGL_MPY_METADATA = $(BUILD)/lvgl/lv_mpy.json
40-
QSTR_GLOBAL_DEPENDENCIES += $(LVGL_MPY)
41-
CFLAGS_MOD += $(LV_CFLAGS)
42-
43-
$(LVGL_MPY): $(ALL_LVGL_SRC) $(LVGL_BINDING_DIR)/gen/gen_mpy.py
44-
$(ECHO) "LVGL-GEN $@"
45-
$(Q)mkdir -p $(dir $@)
46-
$(Q)$(CPP) $(CFLAGS_MOD) -DPYCPARSER -x c -I $(LVGL_BINDING_DIR)/pycparser/utils/fake_libc_include $(INC) $(LVGL_DIR)/lvgl.h > $(LVGL_PP)
47-
$(Q)$(PYTHON) $(LVGL_BINDING_DIR)/gen/gen_mpy.py -M lvgl -MP lv -MD $(LVGL_MPY_METADATA) -E $(LVGL_PP) $(LVGL_DIR)/lvgl.h > $@
48-
49-
.PHONY: LVGL_MPY
50-
LVGL_MPY: $(LVGL_MPY)
51-
52-
CFLAGS_MOD += -Wno-unused-function
53-
SRC_MOD += $(subst $(TOP)/,,$(shell find $(LVGL_DIR)/src $(LVGL_DIR)/examples $(LVGL_GENERIC_DRV_DIR) -type f -name "*.c") $(LVGL_MPY))
54-
5531
# External modules written in C.
5632
ifneq ($(USER_C_MODULES),)
5733
# pre-define USERMOD variables as expanded so that variables are immediate

0 commit comments

Comments
 (0)