djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix display resources build

Browse Source 
qstrdefs.generated.h no longer includes the translated strings.
So, use the .po file directly.
This commit is contained in:
Scott Shawcroft 2022-06-02 12:26:42 -07:00
parent fd5ef009a4
commit 36b4d49a78
No known key found for this signature in database
GPG Key ID: 0DFD512649C052DA
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
supervisor/supervisor.mk
View File

@ -156,7 +156,7 @@ ifeq ($(CIRCUITPY_DISPLAYIO), 1)
supervisor/shared/display.c
ifeq ($(CIRCUITPY_TERMINALIO), 1)
SUPERVISOR_O += $(BUILD)/autogen_display_resources.o
SUPERVISOR_O += $(BUILD)/autogen_display_resources-$(TRANSLATION).o
endif
endif
@ -194,10 +194,10 @@ $(BUILD)/supervisor/shared/translate/translate.o: $(HEADER_BUILD)/qstrdefs.gener
CIRCUITPY_DISPLAY_FONT ?= "../../tools/fonts/ter-u12n.bdf"
$(BUILD)/autogen_display_resources.c: ../../tools/gen_display_resources.py $(HEADER_BUILD)/qstrdefs.generated.h Makefile | $(HEADER_BUILD)
$(BUILD)/autogen_display_resources-$(TRANSLATION).c: ../../tools/gen_display_resources.py $(TOP)/locale/$(TRANSLATION).po Makefile | $(HEADER_BUILD)
$(STEPECHO) "GEN $@"
$(Q)install -d $(BUILD)/genhdr
$(Q)$(PYTHON) ../../tools/gen_display_resources.py \
--font $(CIRCUITPY_DISPLAY_FONT) \
--sample_file $(HEADER_BUILD)/qstrdefs.generated.h \
--output_c_file $(BUILD)/autogen_display_resources.c
--sample_file $(TOP)/locale/$(TRANSLATION).po \
--output_c_file $(BUILD)/autogen_display_resources-$(TRANSLATION).c