From 51f2253cef5bbd0f856eeadd03b04504b288f81a Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 19 Jul 2022 14:07:18 -0400 Subject: [PATCH] no Russian font for SAMD21; adjust unix build warnings --- ports/atmel-samd/mpconfigport.mk | 9 ++------- ports/unix/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index 66ebb54a6b..3ea6c44049 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -61,17 +61,12 @@ endif MICROPY_PY_ASYNC_AWAIT = 0 -# We don't have room for the fonts for terminalio for ja and ko +# We don't have room for the fonts for terminalio for certain languages, # so turn off terminalio, and if it's off and displayio is on, # force a clean build. # Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an # ifeq, because it's not set yet. -ifeq ($(TRANSLATION), ja) -CIRCUITPY_TERMINALIO = 0 -RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO) -endif - -ifeq ($(TRANSLATION), ko) +ifneq (,$(filter $(TRANSLATION),ja ko ru)) CIRCUITPY_TERMINALIO = 0 RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO) endif diff --git a/ports/unix/Makefile b/ports/unix/Makefile index ae293fcb7d..c0d2bdfc63 100644 --- a/ports/unix/Makefile +++ b/ports/unix/Makefile @@ -37,8 +37,8 @@ INC += -I$(BUILD) # compiler settings CWARN = -Wall -Werror -CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith -Wdouble-promotion -Wfloat-conversion -CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA) +CWARN += -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wpointer-arith -Wdouble-promotion -Wfloat-conversion +CFLAGS += $(INC) $(CWARN) -std=gnu11 -DUNIX $(CFLAGS_MOD) $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA) # Debugging/Optimization ifdef DEBUG