Skip to content

Commit 2ed54ec

Browse files
applied patch provied by Paul Boven fixing USB usage
1 parent a6db6ff commit 2ed54ec

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

Arduino.mk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,11 @@ ECHO = echo
337337
SYS_LIBS = $(patsubst %,$(ARDUINO_LIB_PATH)/%,$(ARDUINO_LIBS))
338338
SYS_INCLUDES = $(patsubst %,-I%,$(SYS_LIBS))
339339
LIB_C_SRCS = $(wildcard $(patsubst %,%/*.c,$(SYS_LIBS)))
340+
LIB_AS_SRCS = $(wildcard $(patsubst %,%/*.S,$(SYS_LIBS)))
340341
LIB_CPP_SRCS = $(wildcard $(patsubst %,%/*.cpp,$(SYS_LIBS)))
341342
LIB_OBJS = $(patsubst $(ARDUINO_LIB_PATH)/%.c,$(OBJDIR)/libs/%.o,$(LIB_C_SRCS)) \
342-
$(patsubst $(ARDUINO_LIB_PATH)/%.cpp,$(OBJDIR)/libs/%.o,$(LIB_CPP_SRCS))
343+
$(patsubst $(ARDUINO_LIB_PATH)/%.cpp,$(OBJDIR)/libs/%.o,$(LIB_CPP_SRCS)) \
344+
$(patsubst $(ARDUINO_LIB_PATH)/%.S,$(OBJDIR)/libs/%.o,$(LIB_AS_SRCS))
343345

344346
CPPFLAGS = -mmcu=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) \
345347
-I. -I$(ARDUINO_CORE_PATH) -I$(ARDUINO_VAR_PATH)/$(VARIANT) \
@@ -370,6 +372,10 @@ $(OBJDIR)/libs/%.o: $(ARDUINO_LIB_PATH)/%.cpp
370372
mkdir -p $(dir $@)
371373
$(CC) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
372374

375+
$(OBJDIR)/libs/%.o: $(ARDUINO_LIB_PATH)/%.S
376+
mkdir -p $(dir $@)
377+
$(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@
378+
373379
# normal local sources
374380
# .o rules are for objects, .d for dependency tracking
375381
# there seems to be an awful lot of duplication here!!!

0 commit comments

Comments
 (0)