From 842d751d28e9f5f88b23cfb04bc6c04e423501eb Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 22 Nov 2018 00:15:39 +0100 Subject: show error if the defined board is not known --- include.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include.mk b/include.mk index 66daa10..19afa95 100644 --- a/include.mk +++ b/include.mk @@ -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) -- cgit v1.2.3 From c523cf9e086233b35feb970217dea58e3dd7c372 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 23 Nov 2018 00:10:03 +0100 Subject: fix cyclic deps for external libs --- defines.mk | 1 + fastled.mk | 8 ++++++-- include.mk | 2 +- pjon.mk | 8 ++++++-- serial-pjon/Makefile | 1 - usb-fastled/Makefile | 1 - usb-pjon/Makefile | 1 - usb-rainbow/Makefile | 1 - 8 files changed, 14 insertions(+), 9 deletions(-) diff --git a/defines.mk b/defines.mk index 2993425..cec3dd5 100644 --- a/defines.mk +++ b/defines.mk @@ -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 diff --git a/fastled.mk b/fastled.mk index 64723e8..d6ea527 100644 --- a/fastled.mk +++ b/fastled.mk @@ -30,12 +30,16 @@ CXXFLAGS += -DNEED_CXX_BITS CXXFLAGS += $(FASTLED_OPTS) OBJ = $(SRC:%.cpp=%.o) +OBJ_DEP = dep-fastled--arduino-stub.o -libfastled.a: $(OBJ) - $(AR) $@ $(OBJ) +libfastled.a: $(OBJ) $(OBJ_DEP) + $(AR) $@ $(OBJ) $(OBJ_DEP) %.o: %.cpp $(CXX) -c $(CXXFLAGS) $< -o $@ +dep-fastled--%.o: $(LIB_DIR)/%.cpp + $(CXX) $(CXXFLAGS) -c $< -o $@ + clean: rm -f $(SRC:%.cpp=%.o) diff --git a/include.mk b/include.mk index 19afa95..f624fcc 100644 --- a/include.mk +++ b/include.mk @@ -225,7 +225,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 "" diff --git a/pjon.mk b/pjon.mk index 968cadf..74e9f2a 100644 --- a/pjon.mk +++ b/pjon.mk @@ -29,12 +29,16 @@ CXXFLAGS += -DARDUINO=101 CXXFLAGS += $(PJON_OPTS) OBJ = $(SRC:%.cpp=%.o) +OBJ_DEP = dep-pjon--arduino-stub.o -libpjon.a: $(OBJ) - $(AR) $@ $(OBJ) +libpjon.a: $(OBJ) $(OBJ_DEP) + $(AR) $@ $(OBJ) $(OBJ_DEP) %.o: %.cpp $(CXX) -c $(CXXFLAGS) $< -o $@ +dep-pjon--%.o: $(LIB_DIR)/%.cpp + $(CXX) $(CXXFLAGS) -c $< -o $@ + clean: rm -f $(SRC:%.cpp=%.o) 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 -- cgit v1.2.3 From d30e73bc20e8b6f59a9df73ac73a8566634054ec Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 23 Nov 2018 00:26:03 +0100 Subject: some cleanups --- fastled.mk | 11 ++++++----- pjon.mk | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/fastled.mk b/fastled.mk index d6ea527..50ac2d4 100644 --- a/fastled.mk +++ b/fastled.mk @@ -23,6 +23,7 @@ include $(SPREADAVR_PATH)/defines.mk SRC:=$(wildcard $(FASTLED_PATH)/*.cpp) +DEPLIBS := arduino-stub CXXFLAGS += -I$(FASTLED_PATH) CXXFLAGS += -DARDUINO @@ -30,16 +31,16 @@ CXXFLAGS += -DNEED_CXX_BITS CXXFLAGS += $(FASTLED_OPTS) OBJ = $(SRC:%.cpp=%.o) -OBJ_DEP = dep-fastled--arduino-stub.o +OBJ_DEPLIB = $(DEPLIBS:%=deplib-fastled--%.o) -libfastled.a: $(OBJ) $(OBJ_DEP) - $(AR) $@ $(OBJ) $(OBJ_DEP) +libfastled.a: $(OBJ) $(OBJ_DEPLIB) + $(AR) $@ $(OBJ) $(OBJ_DEPLIB) %.o: %.cpp $(CXX) -c $(CXXFLAGS) $< -o $@ -dep-fastled--%.o: $(LIB_DIR)/%.cpp +deplib-fastled--%.o: $(LIB_DIR)/%.cpp $(CXX) $(CXXFLAGS) -c $< -o $@ clean: - rm -f $(SRC:%.cpp=%.o) + rm -f $(SRC:%.cpp=%.o) $(OBJ_DEPLIB) diff --git a/pjon.mk b/pjon.mk index 74e9f2a..a8fc01c 100644 --- a/pjon.mk +++ b/pjon.mk @@ -23,22 +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_DEP = dep-pjon--arduino-stub.o +OBJ_DEPLIB = $(DEPLIBS:%=deplib-pjon--%.o) -libpjon.a: $(OBJ) $(OBJ_DEP) - $(AR) $@ $(OBJ) $(OBJ_DEP) +libpjon.a: $(OBJ) $(OBJ_DEPLIB) + $(AR) $@ $(OBJ) $(OBJ_DEPLIB) %.o: %.cpp $(CXX) -c $(CXXFLAGS) $< -o $@ -dep-pjon--%.o: $(LIB_DIR)/%.cpp +deplib-pjon--%.o: $(LIB_DIR)/%.cpp $(CXX) $(CXXFLAGS) -c $< -o $@ clean: - rm -f $(SRC:%.cpp=%.o) + rm -f $(SRC:%.cpp=%.o) $(OBJ_DEPLIB) -- cgit v1.2.3