From 0ea18865ff0364c9c65f88ba5e4d5dbbad997c8d Mon Sep 17 00:00:00 2001
From: Chris van Marle <qistoph@gmail.com>
Date: Wed, 18 Jul 2018 09:11:57 +0200
Subject: [PATCH] Add support for custom defines

---
 Arduino.mk | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Arduino.mk b/Arduino.mk
index 979a0399..47d9bd66 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -1059,7 +1059,7 @@ else
 endif
 
 # Using += instead of =, so that CPPFLAGS can be set per sketch level
-CPPFLAGS      += -$(MCU_FLAG_NAME)=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) $(ARDUINO_ARCH_FLAG) \
+override CPPFLAGS      += -$(MCU_FLAG_NAME)=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) $(ARDUINO_ARCH_FLAG) \
         -I$(ARDUINO_CORE_PATH) -I$(ARDUINO_VAR_PATH)/$(VARIANT) \
         $(SYS_INCLUDES) $(PLATFORM_INCLUDES) $(USER_INCLUDES) -Wall -ffunction-sections \
         -fdata-sections
@@ -1068,7 +1068,7 @@ CPPFLAGS      += -$(MCU_FLAG_NAME)=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_V
 # By placing it before the user-provided CPPFLAGS rather than after, we allow the
 # the user to disable it if they like, by adding the negation of the flag
 # (-U__PROG_TYPES_COMPAT__) to the user-provided CPPFLAGS.
-CPPFLAGS := -D__PROG_TYPES_COMPAT__ $(CPPFLAGS)
+override CPPFLAGS := -D__PROG_TYPES_COMPAT__ $(CPPFLAGS)
 
 ifdef DEBUG
 OPTIMIZATION_FLAGS= $(DEBUG_FLAGS)
@@ -1076,11 +1076,15 @@ else
 OPTIMIZATION_FLAGS = -O$(OPTIMIZATION_LEVEL)
 endif
 
-CPPFLAGS += $(OPTIMIZATION_FLAGS)
+override CPPFLAGS += $(OPTIMIZATION_FLAGS)
 
 # USB IDs for the Caterina devices like leonardo or micro
 ifneq ($(CATERINA),)
-    CPPFLAGS += -DUSB_VID=$(USB_VID) -DUSB_PID=$(USB_PID)
+    override CPPFLAGS += -DUSB_VID=$(USB_VID) -DUSB_PID=$(USB_PID)
+endif
+
+ifdef CUSTOM_DEFINES
+    override CPPFLAGS += $(CUSTOM_DEFINES)
 endif
 
 # avr-gcc version that we can do maths on