Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5725c55

Browse files
committed
working on macOS build
1 parentca66772 commit5725c55

File tree

3 files changed

+31
-15
lines changed

3 files changed

+31
-15
lines changed

‎builder/macOS.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,11 @@ def compile(): # NOQA
211211
data=f.read().decode('utf-8')
212212

213213
data=data.replace('QSTR_GEN_CXXFLAGS += $(QSTR_GEN_FLAGS)','QSTR_GEN_CXXFLAGS += $(QSTR_GEN_FLAGS)\n$(info $$QSTR_GEN_CFLAGS = $(QSTR_GEN_CFLAGS))')
214-
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')
214+
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')
215215

216216
withopen(mkrules_path,'wb')asf:
217217
f.write(data.encode('utf-8'))
218218

219-
220219
build_sdl()
221220

222221
return_code,_=spawn(compile_cmd)

‎ext_mod/lcd_bus/micropython.mk‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,14 @@ LVGL_BINDING_DIR = $(subst /ext_mod/lcd_bus,,$(MOD_DIR))
88
CFLAGS_USERMOD += -I$(MOD_DIR)
99
CFLAGS_USERMOD += -I$(MOD_DIR)/common_include
1010
CFLAGS_USERMOD += -I$(MOD_DIR)/sdl_bus
11-
CFLAGS_USERMOD += -Wno-missing-field-initializers
12-
CFLAGS_USERMOD += -Wno-unused-function
11+
12+
ifneq (,$(findstring -Wno-missing-field-initializers,$(CFLAGS_USERMOD)))
13+
CFLAGS_USERMOD += -Wno-missing-field-initializers
14+
endif
15+
16+
ifneq (,$(findstring -Wno-unused-function,$(CFLAGS_USERMOD)))
17+
CFLAGS_USERMOD += -Wno-unused-function
18+
endif
1319

1420
SRC_USERMOD_C +=$(MOD_DIR)/modlcd_bus.c
1521
SRC_USERMOD_C +=$(MOD_DIR)/lcd_types.c

‎ext_mod/lvgl/micropython.mk‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,25 @@ LVGL_HEADER = $(LVGL_BINDING_DIR)/build/lvgl_header.h
1313
CFLAGS_USERMOD += -I$(LVGL_BINDING_DIR)
1414
CFLAGS_USERMOD += -I$(LVGL_DIR)
1515
CFLAGS_USERMOD += -I$(LVGL_BINDING_DIR)/include
16-
CFLAGS_USERMOD += -Wno-missing-field-initializers
17-
CFLAGS_USERMOD += -Wno-unused-function
16+
17+
ifneq (,$(findstring -Wno-missing-field-initializers,$(CFLAGS_USERMOD)))
18+
CFLAGS_USERMOD += -Wno-missing-field-initializers
19+
endif
20+
21+
ifneq (,$(findstring -Wno-unused-function,$(CFLAGS_USERMOD)))
22+
CFLAGS_USERMOD += -Wno-unused-function
23+
endif
24+
25+
ifneq (,$(findstring "",$(LV_CFLAGS)))
26+
else
27+
CFLAGS_USERMOD +=$(LV_CFLAGS)
28+
endif
1829

1930
ALL_LVGL_SRC =$(shell find$(LVGL_DIR) -type f -name '*.h')$(LVGL_BINDING_DIR)/lib/lv_conf.h
2031

2132
LVGL_MPY =$(BUILD)/lv_mpy.c
2233
LVGL_MPY_METADATA =$(BUILD)/lv_mpy.json
2334

24-
CFLAGS_USERMOD +=$(LV_CFLAGS)
25-
26-
$(LVGL_MPY):$(ALL_LVGL_SRC)$(LVGL_BINDING_DIR)/gen/$(GEN_SCRIPT)_api_gen_mpy.py
27-
$(ECHO)"LVGL-GEN$@"
28-
$(Q)mkdir -p$(dir$@)
29-
$(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)
30-
31-
.PHONY: LVGL_MPY
32-
LVGL_MPY:$(LVGL_MPY)
3335

3436

3537
SRC_USERMOD_LIB_C +=$(shell find$(LVGL_DIR)/src -type f -name "*.c")
@@ -45,3 +47,12 @@ ifneq (,$(findstring rp2, $(LV_PORT)))
4547
CFLAGS_USERMOD += -DMP_SOFT_MATH=1
4648
SRC_USERMOD_LIB_C +=$(LVGL_ADDON_DIR)/src/soft_math.c
4749
endif
50+
51+
$(LVGL_MPY):$(ALL_LVGL_SRC)$(LVGL_BINDING_DIR)/gen/$(GEN_SCRIPT)_api_gen_mpy.py
52+
$(ECHO)"LVGL-GEN$@"
53+
$(Q)mkdir -p$(dir$@)
54+
$(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)
55+
56+
.PHONY: LVGL_MPY
57+
LVGL_MPY:$(LVGL_MPY)
58+

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp