diff options
| author | Scott Shawcroft <scott@adafruit.com> | 2020-08-12 16:53:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-12 16:53:09 -0700 |
| commit | 7ffa2a103cd0f00a4626b5cbae8b8d1c048342b3 (patch) | |
| tree | bcbd0f9699ee59d02d4df9685e9592dcfbdb0052 /ports/nrf/Makefile | |
| parent | 3197c579e0acddf7aa962fe805cefd75b584d267 (diff) | |
| parent | 195c0ea986fd44f3b56cc57f23e8259df1e18202 (diff) | |
Merge pull request #3269 from jepler/sharpdisplay-v2
Sharp Memory Display displayio support (v2)
Diffstat (limited to 'ports/nrf/Makefile')
| -rwxr-xr-x | ports/nrf/Makefile | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index 13a148df3..3fef68e88 100755 --- a/ports/nrf/Makefile +++ b/ports/nrf/Makefile @@ -73,11 +73,11 @@ INC += -I$(BUILD) INC += -I$(BUILD)/genhdr INC += -I./../../lib/cmsis/inc INC += -I./boards/$(BOARD) -INC += -I./nrfx -INC += -I./nrfx/hal -INC += -I./nrfx/mdk -INC += -I./nrfx/drivers/include -INC += -I./nrfx/drivers/src +INC += -isystem ./nrfx +INC += -isystem ./nrfx/hal +INC += -isystem ./nrfx/mdk +INC += -isystem ./nrfx/drivers/include +INC += -isystem ./nrfx/drivers/src INC += -I./bluetooth INC += -I./peripherals INC += -I../../lib/mp-readline @@ -100,8 +100,6 @@ CFLAGS += $(OPTIMIZATION_FLAGS) CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) # Undo some warnings. -# nrfx uses undefined preprocessor variables quite casually, so we can't do warning checks for these. -CFLAGS += -Wno-undef # nrfx does casts that increase alignment requirements. CFLAGS += -Wno-cast-align @@ -240,6 +238,11 @@ endif OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o)) OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o)) +# nrfx uses undefined preprocessor variables quite casually, so we can't do +# warning checks for these. Happily, we've confined the offenders to the NRFX +# source files themselves. +$(addprefix $(BUILD)/, $(SRC_NRFX:.c=.o)): CFLAGS += -Wno-undef + $(BUILD)/$(FATFS_DIR)/ff.o: COPT += -Os $(filter $(PY_BUILD)/../extmod/vfs_fat_%.o, $(PY_O)): COPT += -Os |