dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add support for custom defines

Browse source
This commit is contained in:
Chris van Marle 2018-07-18 09:11:57 +02:00
parent b2d1ff23a2
commit 0ea18865ff
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Arduino.mk
View file

@ -1059,7 +1059,7 @@ else
endif endif
# Using += instead of =, so that CPPFLAGS can be set per sketch level # 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) \ -I$(ARDUINO_CORE_PATH) -I$(ARDUINO_VAR_PATH)/$(VARIANT) \
$(SYS_INCLUDES) $(PLATFORM_INCLUDES) $(USER_INCLUDES) -Wall -ffunction-sections \ $(SYS_INCLUDES) $(PLATFORM_INCLUDES) $(USER_INCLUDES) -Wall -ffunction-sections \
-fdata-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 # 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 # the user to disable it if they like, by adding the negation of the flag
# (-U__PROG_TYPES_COMPAT__) to the user-provided CPPFLAGS. # (-U__PROG_TYPES_COMPAT__) to the user-provided CPPFLAGS.
CPPFLAGS := -D__PROG_TYPES_COMPAT__ $(CPPFLAGS) override CPPFLAGS := -D__PROG_TYPES_COMPAT__ $(CPPFLAGS)
ifdef DEBUG ifdef DEBUG
OPTIMIZATION_FLAGS= $(DEBUG_FLAGS) OPTIMIZATION_FLAGS= $(DEBUG_FLAGS)
@ -1076,11 +1076,15 @@ else
OPTIMIZATION_FLAGS = -O$(OPTIMIZATION_LEVEL) OPTIMIZATION_FLAGS = -O$(OPTIMIZATION_LEVEL)
endif endif
CPPFLAGS += $(OPTIMIZATION_FLAGS) override CPPFLAGS += $(OPTIMIZATION_FLAGS)
# USB IDs for the Caterina devices like leonardo or micro # USB IDs for the Caterina devices like leonardo or micro
ifneq ($(CATERINA),) 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 endif
# avr-gcc version that we can do maths on # avr-gcc version that we can do maths on