diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2018-11-23 00:26:11 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2018-11-23 00:26:11 +0100 |
| commit | 52ac882517b2f564e91068c8cf3fd51bd715a78d (patch) | |
| tree | 233c8c8ad61a3abaf5bd3ccccbf97ceb0ea3b7a3 | |
| parent | added makro USES_RADIOHEAD if the library is used (diff) | |
| parent | some cleanups (diff) | |
Merge branch 'master' into radiohead
| -rw-r--r-- | defines.mk | 1 | ||||
| -rw-r--r-- | fastled.mk | 11 | ||||
| -rw-r--r-- | include.mk | 5 | ||||
| -rw-r--r-- | pjon.mk | 11 | ||||
| -rw-r--r-- | serial-pjon/Makefile | 1 | ||||
| -rw-r--r-- | usb-fastled/Makefile | 1 | ||||
| -rw-r--r-- | usb-pjon/Makefile | 1 | ||||
| -rw-r--r-- | usb-rainbow/Makefile | 1 |
8 files changed, 21 insertions, 11 deletions
@@ -156,6 +156,7 @@ ifeq ($(BOARD_TYPE),elecrow32u4lora) PROG_TYPE := avr109 AVRDUDE_PORT := /dev/ttyACM0 LUFA_BOARD = NONE + ARDUINO_PINS = leonardo endif ifeq ($(BOARD_TYPE),arduinoProMicro) MCU := atmega32u4 @@ -23,6 +23,7 @@ include $(SPREADAVR_PATH)/defines.mk SRC:=$(wildcard $(FASTLED_PATH)/*.cpp) +DEPLIBS := arduino-stub CXXFLAGS += -I$(FASTLED_PATH) CXXFLAGS += -DARDUINO @@ -30,12 +31,16 @@ CXXFLAGS += -DNEED_CXX_BITS CXXFLAGS += $(FASTLED_OPTS) OBJ = $(SRC:%.cpp=%.o) +OBJ_DEPLIB = $(DEPLIBS:%=deplib-fastled--%.o) -libfastled.a: $(OBJ) - $(AR) $@ $(OBJ) +libfastled.a: $(OBJ) $(OBJ_DEPLIB) + $(AR) $@ $(OBJ) $(OBJ_DEPLIB) %.o: %.cpp $(CXX) -c $(CXXFLAGS) $< -o $@ +deplib-fastled--%.o: $(LIB_DIR)/%.cpp + $(CXX) $(CXXFLAGS) -c $< -o $@ + clean: - rm -f $(SRC:%.cpp=%.o) + rm -f $(SRC:%.cpp=%.o) $(OBJ_DEPLIB) @@ -24,6 +24,9 @@ ifndef SPREADAVR_PATH SPREADAVR_PATH := .. endif include $(SPREADAVR_PATH)/defines.mk +ifndef MCU +$(error Unknown board: '$(BOARD_TYPE)') +endif ## project-specific objects SRC := $(OBJ:%.o=%.c) @@ -252,7 +255,7 @@ lib-%.o: $(LIB_DIR)/%.cpp Makefile $(CXX) $(CXXFLAGS) -c $< -o $@ $(ELFFILE): $(OBJ_LIB) $(CXX_OBJ_LIB) $(EXTERNAL_LIBS:%=lib%.a) $(OBJ) $(CXX_OBJ) - $(CC) $(LDFLAGS) $(OBJ) $(CXX_OBJ) $(OBJ_LIB) $(CXX_OBJ_LIB) $(EXTERNAL_LIBS:%=-l%) -o $@ + $(CC) $(LDFLAGS) $(OBJ) $(CXX_OBJ) $(OBJ_LIB) $(CXX_OBJ_LIB) $(EXTERNAL_LIBS:%=-l%) -o $@ $(SIZE) $@ @echo "" @@ -23,18 +23,23 @@ include $(SPREADAVR_PATH)/defines.mk SRC:=$(wildcard $(PJON_PATH)/*.cpp) +DEPLIBS := arduino-stub CXXFLAGS += -I$(PJON_PATH) CXXFLAGS += -DARDUINO=101 CXXFLAGS += $(PJON_OPTS) OBJ = $(SRC:%.cpp=%.o) +OBJ_DEPLIB = $(DEPLIBS:%=deplib-pjon--%.o) -libpjon.a: $(OBJ) - $(AR) $@ $(OBJ) +libpjon.a: $(OBJ) $(OBJ_DEPLIB) + $(AR) $@ $(OBJ) $(OBJ_DEPLIB) %.o: %.cpp $(CXX) -c $(CXXFLAGS) $< -o $@ +deplib-pjon--%.o: $(LIB_DIR)/%.cpp + $(CXX) $(CXXFLAGS) -c $< -o $@ + clean: - rm -f $(SRC:%.cpp=%.o) + rm -f $(SRC:%.cpp=%.o) $(OBJ_DEPLIB) diff --git a/serial-pjon/Makefile b/serial-pjon/Makefile index be3dd35..392ffdb 100644 --- a/serial-pjon/Makefile +++ b/serial-pjon/Makefile @@ -24,7 +24,6 @@ NAME := serial-pjon BOARD_TYPE := arduino2009v2 OBJ := $(NAME).o LIBS := util led serialio -CXX_LIBS := arduino-stub EXTERNAL_LIBS := pjon SPREADAVR_PATH := .. diff --git a/usb-fastled/Makefile b/usb-fastled/Makefile index e660cb3..ccb6f8d 100644 --- a/usb-fastled/Makefile +++ b/usb-fastled/Makefile @@ -24,7 +24,6 @@ NAME := usb-fastled BOARD_TYPE := minimus32 CXX_OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial usbio -CXX_LIBS := arduino-stub EXTERNAL_LIBS := fastled lufa SPREADAVR_PATH := .. RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc_nowait diff --git a/usb-pjon/Makefile b/usb-pjon/Makefile index 76e4831..448c8c4 100644 --- a/usb-pjon/Makefile +++ b/usb-pjon/Makefile @@ -24,7 +24,6 @@ NAME := usb-pjon BOARD_TYPE := teensy2 CXX_OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial usbio -CXX_LIBS := arduino-stub EXTERNAL_LIBS := lufa pjon SPREADAVR_PATH := .. diff --git a/usb-rainbow/Makefile b/usb-rainbow/Makefile index 18296ab..c5fcf14 100644 --- a/usb-rainbow/Makefile +++ b/usb-rainbow/Makefile @@ -24,7 +24,6 @@ NAME := usb-rainbow BOARD_TYPE := minimus32 CXX_OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial usbio -CXX_LIBS := arduino-stub EXTERNAL_LIBS := fastled lufa SPREADAVR_PATH := .. RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc_nowait |