diff --git a/cube/Makefile b/cube/Makefile index f6af9b4..cda4483 100644 --- a/cube/Makefile +++ b/cube/Makefile @@ -167,6 +167,7 @@ all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET # list of objects OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o))) vpath %.c $(sort $(dir $(C_SOURCES))) +OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a) # list of ASM program objects OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o))) vpath %.s $(sort $(dir $(ASM_SOURCES))) @@ -177,8 +178,8 @@ $(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR) $(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR) $(AS) -c $(CFLAGS) $< -o $@ -$(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) w5500.a Makefile - $(CC) $(OBJECTS) w5500.a $(LDFLAGS) -o $@ +$(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) Makefile + $(CC) $(OBJECTS) $(LDFLAGS) -o $@ $(SZ) $@ $(BUILD_DIR)/%.hex: $(BUILD_DIR)/%.elf | $(BUILD_DIR) diff --git a/cube/ioLibrary_Driver b/cube/ioLibrary_Driver index 181cfae..1cdb6d2 160000 --- a/cube/ioLibrary_Driver +++ b/cube/ioLibrary_Driver @@ -1 +1 @@ -Subproject commit 181cfae6cc499a859364c2171767b3e49ca3109c +Subproject commit 1cdb6d2edab0ad200e89126cb9b85abdead1435c diff --git a/tools/insertMyCode.sh b/tools/insertMyCode.sh index f0a8b08..e9c6e28 100755 --- a/tools/insertMyCode.sh +++ b/tools/insertMyCode.sh @@ -72,6 +72,7 @@ done cp $MAKEFILE $MAKEFILE_BAK echo "# $PROCESSED" > $MAKEFILE cat $MAKEFILE_BAK | \ + sed -e 's%\(# list of ASM program objects\)%OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a)\n\1%' | \ sed -e 's,\(C_SOURCES = \\\),\1\nlibmbus/mbus/mbus-protocol.c \\,' | \ sed -e 's,\(C_SOURCES = \\\),\1\n'"$SRC_EXT"' \\,' | \ sed -e 's,\(C_INCLUDES = \\\),\1\n-IUser/Inc \\,' | \