fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Bugfix: enable rlottie/freetype from makefile

Browse Source 
Enable rlottie/freetype libraries only from the unix port only if the libraries are available, and use MICROPY_RLOTTIE/MICROPY_FREETYPE to mark them available

Preprocess LVGL headers for the bindings script with all the flags set in CFLAGS_MOD. This is needed so that MICROPY_RLOTTIE/MICROPY_FREETYPE are captured also on this build step
This commit is contained in:
Amir Gonnen 2021-11-06 01:47:19 +02:00
parent 8f34b4a912
commit efb8b0a3d9
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lv_bindings

@ -1 +1 @@
Subproject commit d3367e986c481d89f4aa0f8c4d98902f0196f63a Subproject commit a4ac928b22c720402f4f3ca730e7ffc72df4ffd5

8
ports/unix/Makefile
View File

@ -223,14 +223,18 @@ endif
# Additional optional libraries # Additional optional libraries
RLOTTIE_CFLAGS_MOD := $(shell pkg-config --silence-errors --cflags rlottie) RLOTTIE_CFLAGS_MOD := $(shell pkg-config --silence-errors --cflags rlottie)
CFLAGS_MOD += $(RLOTTIE_CFLAGS_MOD) ifneq ($(RLOTTIE_CFLAGS_MOD),)
CFLAGS_MOD += $(RLOTTIE_CFLAGS_MOD) -DMICROPY_RLOTTIE=1
RLOTTIE_LDFLAGS_MOD := $(shell pkg-config --silence-errors --libs rlottie) RLOTTIE_LDFLAGS_MOD := $(shell pkg-config --silence-errors --libs rlottie)
LDFLAGS_MOD += $(RLOTTIE_LDFLAGS_MOD) LDFLAGS_MOD += $(RLOTTIE_LDFLAGS_MOD)
endif
FREETYPE_CFLAGS_MOD := $(shell pkg-config --silence-errors --cflags freetype2) FREETYPE_CFLAGS_MOD := $(shell pkg-config --silence-errors --cflags freetype2)
CFLAGS_MOD += $(FREETYPE_CFLAGS_MOD) ifneq ($(FREETYPE_CFLAGS_MOD),)
CFLAGS_MOD += $(FREETYPE_CFLAGS_MOD) -DMICROPY_FREETYPE=1
FREETYPE_LDFLAGS_MOD := $(shell pkg-config --silence-errors --libs freetype2) FREETYPE_LDFLAGS_MOD := $(shell pkg-config --silence-errors --libs freetype2)
LDFLAGS_MOD += $(FREETYPE_LDFLAGS_MOD) LDFLAGS_MOD += $(FREETYPE_LDFLAGS_MOD)
endif
# source files # source files
SRC_C += \ SRC_C += \

2
py/py.mk
View File

@ -43,7 +43,7 @@ CFLAGS_MOD += $(LV_CFLAGS)
$(LVGL_MPY): $(ALL_LVGL_SRC) $(LVGL_BINDING_DIR)/gen/gen_mpy.py $(LVGL_MPY): $(ALL_LVGL_SRC) $(LVGL_BINDING_DIR)/gen/gen_mpy.py
$(ECHO) "LVGL-GEN $@" $(ECHO) "LVGL-GEN $@"
$(Q)mkdir -p $(dir $@) $(Q)mkdir -p $(dir $@)
$(Q)$(CPP) $(LV_CFLAGS) -DPYCPARSER -x c -I $(LVGL_BINDING_DIR)/pycparser/utils/fake_libc_include $(INC) $(LVGL_DIR)/lvgl.h > $(LVGL_PP) $(Q)$(CPP) $(CFLAGS_MOD) -DPYCPARSER -x c -I $(LVGL_BINDING_DIR)/pycparser/utils/fake_libc_include $(INC) $(LVGL_DIR)/lvgl.h > $(LVGL_PP)
$(Q)$(PYTHON) $(LVGL_BINDING_DIR)/gen/gen_mpy.py -M lvgl -MP lv -MD $(LVGL_MPY_METADATA) -E $(LVGL_PP) $(LVGL_DIR)/lvgl.h > $@ $(Q)$(PYTHON) $(LVGL_BINDING_DIR)/gen/gen_mpy.py -M lvgl -MP lv -MD $(LVGL_MPY_METADATA) -E $(LVGL_PP) $(LVGL_DIR)/lvgl.h > $@
.PHONY: LVGL_MPY .PHONY: LVGL_MPY