Skip to content

Commit 36b4d49

Browse files
committed
Fix display resources build
qstrdefs.generated.h no longer includes the translated strings. So, use the .po file directly.
1 parent fd5ef00 commit 36b4d49

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

supervisor/supervisor.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ ifeq ($(CIRCUITPY_DISPLAYIO), 1)
156156
supervisor/shared/display.c
157157

158158
ifeq ($(CIRCUITPY_TERMINALIO), 1)
159-
SUPERVISOR_O += $(BUILD)/autogen_display_resources.o
159+
SUPERVISOR_O += $(BUILD)/autogen_display_resources-$(TRANSLATION).o
160160
endif
161161
endif
162162

@@ -194,10 +194,10 @@ $(BUILD)/supervisor/shared/translate/translate.o: $(HEADER_BUILD)/qstrdefs.gener
194194

195195
CIRCUITPY_DISPLAY_FONT ?= "../../tools/fonts/ter-u12n.bdf"
196196

197-
$(BUILD)/autogen_display_resources.c: ../../tools/gen_display_resources.py $(HEADER_BUILD)/qstrdefs.generated.h Makefile | $(HEADER_BUILD)
197+
$(BUILD)/autogen_display_resources-$(TRANSLATION).c: ../../tools/gen_display_resources.py $(TOP)/locale/$(TRANSLATION).po Makefile | $(HEADER_BUILD)
198198
$(STEPECHO) "GEN $@"
199199
$(Q)install -d $(BUILD)/genhdr
200200
$(Q)$(PYTHON) ../../tools/gen_display_resources.py \
201201
--font $(CIRCUITPY_DISPLAY_FONT) \
202-
--sample_file $(HEADER_BUILD)/qstrdefs.generated.h \
203-
--output_c_file $(BUILD)/autogen_display_resources.c
202+
--sample_file $(TOP)/locale/$(TRANSLATION).po \
203+
--output_c_file $(BUILD)/autogen_display_resources-$(TRANSLATION).c

0 commit comments

Comments
 (0)