Skip to content

Commit 51f2253

Browse files
committed
no Russian font for SAMD21; adjust unix build warnings
1 parent 4d3ab4f commit 51f2253

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

ports/atmel-samd/mpconfigport.mk

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,12 @@ endif
6161

6262
MICROPY_PY_ASYNC_AWAIT = 0
6363

64-
# We don't have room for the fonts for terminalio for ja and ko
64+
# We don't have room for the fonts for terminalio for certain languages,
6565
# so turn off terminalio, and if it's off and displayio is on,
6666
# force a clean build.
6767
# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
6868
# ifeq, because it's not set yet.
69-
ifeq ($(TRANSLATION), ja)
70-
CIRCUITPY_TERMINALIO = 0
71-
RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
72-
endif
73-
74-
ifeq ($(TRANSLATION), ko)
69+
ifneq (,$(filter $(TRANSLATION),ja ko ru))
7570
CIRCUITPY_TERMINALIO = 0
7671
RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
7772
endif

ports/unix/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ INC += -I$(BUILD)
3737

3838
# compiler settings
3939
CWARN = -Wall -Werror
40-
CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith -Wdouble-promotion -Wfloat-conversion
41-
CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA)
40+
CWARN += -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wpointer-arith -Wdouble-promotion -Wfloat-conversion
41+
CFLAGS += $(INC) $(CWARN) -std=gnu11 -DUNIX $(CFLAGS_MOD) $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA)
4242

4343
# Debugging/Optimization
4444
ifdef DEBUG

0 commit comments

Comments
 (0)