working on macOS build

lvgl-micropython · May 8, 2024 · 5725c55 · 5725c55
1 parent ca66772
commit 5725c55
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 15 deletions.
diff --git a/builder/macOS.py b/builder/macOS.py
@@ -211,12 +211,11 @@ def compile():  # NOQA
         data = f.read().decode('utf-8')
 
     data = data.replace('QSTR_GEN_CXXFLAGS += $(QSTR_GEN_FLAGS)', 'QSTR_GEN_CXXFLAGS += $(QSTR_GEN_FLAGS)\n$(info $$QSTR_GEN_CFLAGS = $(QSTR_GEN_CFLAGS))')
-    data = data.replace('$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py pp $(CPP) output', '$(info $$QSTR_GEN_CFLAGS = $(QSTR_GEN_CFLAGS))\n    $(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py pp $(CPP) output')
+    data = data.replace('$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py pp $(CPP) output', '$(ECHO) "GEN $@ $$QSTR_GEN_CFLAGS = $(QSTR_GEN_CFLAGS)"\n    $(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py pp $(CPP) output')
 
     with open(mkrules_path, 'wb') as f:
         f.write(data.encode('utf-8'))
 
-
     build_sdl()
 
     return_code, _ = spawn(compile_cmd)

diff --git a/ext_mod/lcd_bus/micropython.mk b/ext_mod/lcd_bus/micropython.mk
@@ -8,8 +8,14 @@ LVGL_BINDING_DIR = $(subst /ext_mod/lcd_bus,,$(MOD_DIR))
 CFLAGS_USERMOD += -I$(MOD_DIR)
 CFLAGS_USERMOD += -I$(MOD_DIR)/common_include
 CFLAGS_USERMOD += -I$(MOD_DIR)/sdl_bus
-CFLAGS_USERMOD += -Wno-missing-field-initializers
-CFLAGS_USERMOD += -Wno-unused-function
+
+ifneq (,$(findstring -Wno-missing-field-initializers, $(CFLAGS_USERMOD)))
+    CFLAGS_USERMOD += -Wno-missing-field-initializers
+endif
+
+ifneq (,$(findstring -Wno-unused-function, $(CFLAGS_USERMOD)))
+    CFLAGS_USERMOD += -Wno-unused-function
+endif
 
 SRC_USERMOD_C += $(MOD_DIR)/modlcd_bus.c
 SRC_USERMOD_C += $(MOD_DIR)/lcd_types.c

diff --git a/ext_mod/lvgl/micropython.mk b/ext_mod/lvgl/micropython.mk
@@ -13,23 +13,25 @@ LVGL_HEADER = $(LVGL_BINDING_DIR)/build/lvgl_header.h
 CFLAGS_USERMOD += -I$(LVGL_BINDING_DIR)
 CFLAGS_USERMOD += -I$(LVGL_DIR)
 CFLAGS_USERMOD += -I$(LVGL_BINDING_DIR)/include
-CFLAGS_USERMOD += -Wno-missing-field-initializers
-CFLAGS_USERMOD += -Wno-unused-function
+
+ifneq (,$(findstring -Wno-missing-field-initializers, $(CFLAGS_USERMOD)))
+    CFLAGS_USERMOD += -Wno-missing-field-initializers
+endif
+
+ifneq (,$(findstring -Wno-unused-function, $(CFLAGS_USERMOD)))
+    CFLAGS_USERMOD += -Wno-unused-function
+endif
+
+ifneq (,$(findstring "", $(LV_CFLAGS)))
+else
+    CFLAGS_USERMOD += $(LV_CFLAGS)
+endif
 
 ALL_LVGL_SRC = $(shell find $(LVGL_DIR) -type f -name '*.h') $(LVGL_BINDING_DIR)/lib/lv_conf.h
 
 LVGL_MPY = $(BUILD)/lv_mpy.c
 LVGL_MPY_METADATA = $(BUILD)/lv_mpy.json
 
-CFLAGS_USERMOD += $(LV_CFLAGS)
-
-$(LVGL_MPY): $(ALL_LVGL_SRC) $(LVGL_BINDING_DIR)/gen/$(GEN_SCRIPT)_api_gen_mpy.py
-	$(ECHO) "LVGL-GEN $@"
-	$(Q)mkdir -p $(dir $@)
-	$(Q)$(PYTHON) $(LVGL_BINDING_DIR)/gen/$(GEN_SCRIPT)_api_gen_mpy.py $(LV_CFLAGS) --board=$(LV_PORT) --output=$(LVGL_MPY) --include=$(LVGL_BINDING_DIR) --include=$(LVGL_DIR) --include=$(LVGL_BINDING_DIR)/include --module_name=lvgl --module_prefix=lv --metadata=$(LVGL_MPY_METADATA) --header_file=$(LVGL_HEADER)
-
-.PHONY: LVGL_MPY
-LVGL_MPY: $(LVGL_MPY)
 
 
 SRC_USERMOD_LIB_C += $(shell find $(LVGL_DIR)/src -type f -name "*.c")
@@ -45,3 +47,12 @@ ifneq (,$(findstring rp2, $(LV_PORT)))
     CFLAGS_USERMOD += -DMP_SOFT_MATH=1
     SRC_USERMOD_LIB_C += $(LVGL_ADDON_DIR)/src/soft_math.c
 endif
+
+$(LVGL_MPY): $(ALL_LVGL_SRC) $(LVGL_BINDING_DIR)/gen/$(GEN_SCRIPT)_api_gen_mpy.py
+	$(ECHO) "LVGL-GEN $@"
+	$(Q)mkdir -p $(dir $@)
+	$(Q)$(PYTHON) $(LVGL_BINDING_DIR)/gen/$(GEN_SCRIPT)_api_gen_mpy.py $(LV_CFLAGS) --board=$(LV_PORT) --output=$(LVGL_MPY) --include=$(LVGL_BINDING_DIR) --include=$(LVGL_DIR) --include=$(LVGL_BINDING_DIR)/include --module_name=lvgl --module_prefix=lv --metadata=$(LVGL_MPY_METADATA) --header_file=$(LVGL_HEADER)
+
+.PHONY: LVGL_MPY
+LVGL_MPY: $(LVGL_MPY)
+