aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authortcsullivan <tullivan99@gmail.com>2019-03-31 22:21:59 -0400
committertcsullivan <tullivan99@gmail.com>2019-03-31 22:21:59 -0400
commitd1a1e7a053cb8840e9c90b380a005ddd2caf3eff (patch)
tree316a49aa26e830392737889c2259f66e5dbafa46 /Makefile
parent904553177639d9840ee345d17123215d1bd02423 (diff)
parent230f0cb2914b02c4d70b19ac4358f2a0a078a676 (diff)
Merge branch 'master' of https://github.com/tcsullivan/smartwatch
Diffstat (limited to 'Makefile')
-rwxr-xr-xMakefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 60a7490..961769d 100755
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ MCUFLAGS = -mcpu=cortex-m4 -mthumb -mabi=aapcs \
CFLAGS = $(MCUFLAGS) --std=gnu99
CXXFLAGS = $(MCUFLAGS) --std=c++17 -fno-builtin -fno-exceptions \
- -fno-strict-aliasing
+ -fno-strict-aliasing
SFLAGS = $(MCUFLAGS) -x assembler-with-cpp \
-DCONFIG_GPIO_AS_PINRESET \
@@ -35,6 +35,7 @@ CSRC = $(wildcard $(ARDUINO)/cores/nRF5/freertos/Source/*.c) \
$(ARDUINO)/cores/nRF5/nordic/nrfx/mdk/system_nrf52.c \
$(ARDUINO)/cores/nRF5/wiring.c \
$(ARDUINO)/cores/nRF5/wiring_digital.c \
+ $(ARDUINO)/cores/nRF5/wiring_analog_nRF52.c \
$(ARDUINO)/libraries/FileSystem/src/littlefs/lfs.c \
$(ARDUINO)/libraries/FileSystem/src/littlefs/lfs_util.c \
$(ARDUINO)/libraries/Bluefruit52Lib/src/utility/bootloader_util.c \