diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2015-07-13 01:08:26 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2015-07-13 01:08:26 +0200 |
| commit | e5b40e73a624efb25b27df700e0680aebdece9d6 (patch) | |
| tree | 78fa1cd748e5b369c729426e81a5388487b38377 | |
| parent | improved fastled example (diff) | |
some cleanup
| -rw-r--r-- | include.mk | 10 | ||||
| -rw-r--r-- | usb-fastled/Makefile | 2 |
2 files changed, 10 insertions, 2 deletions
@@ -77,6 +77,8 @@ liblufa.a: Makefile @echo "" make -f $(SPREADAVR_PATH)/lufa.mk liblufa.a make -f $(SPREADAVR_PATH)/lufa.mk clean + @echo "" + @echo "****************************************************" clean-lufa: @echo "" @@ -85,6 +87,8 @@ clean-lufa: @echo "" make -f $(SPREADAVR_PATH)/lufa.mk clean rm -f liblufa.a + @echo "" + @echo "****************************************************" build-fastled: libfastled.a @@ -96,6 +100,8 @@ libfastled.a: Makefile @echo "" make -f $(SPREADAVR_PATH)/fastled.mk libfastled.a make -f $(SPREADAVR_PATH)/fastled.mk clean + @echo "" + @echo "****************************************************" clean-fastled: @echo "" @@ -104,6 +110,8 @@ clean-fastled: @echo "" make -f $(SPREADAVR_PATH)/fastled.mk clean rm -f libfastled.a + @echo "" + @echo "****************************************************" ## project-specific objects @@ -151,7 +159,7 @@ lib-%.o: $(LIB_DIR)/%.c Makefile lib-%.o: $(LIB_DIR)/%.cpp Makefile $(CXX) $(CXXFLAGS) -c $< -o $@ -$(ELFFILE): $(OBJ) $(CXX_OBJ) $(OBJ_LIB) $(CXX_OBJ_LIB) $(EXTERNAL_LIBS:%=lib%.a) +$(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 $@ $(SIZE) $@ @echo "" diff --git a/usb-fastled/Makefile b/usb-fastled/Makefile index 5aed040..03d2c7e 100644 --- a/usb-fastled/Makefile +++ b/usb-fastled/Makefile @@ -28,7 +28,7 @@ CXX_LIBS := arduino-stub EXTERNAL_LIBS := fastled lufa SPREADAVR_PATH := .. RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc -RESET_PARAM := 'r' +RESET_PARAM := '!' FASTLED_PATH := $(SPREADAVR_PATH)/contrib/FastLED |