From 7dd27d374ff8b1393b4ff1cc7a877234aae7b419 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 16 Feb 2021 11:52:20 +0100 Subject: [PATCH] changes, fixes --- cube/Makefile | 10 +++++----- cube/User/Src/counter.c | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cube/Makefile b/cube/Makefile index 64a0839..7b2041f 100644 --- a/cube/Makefile +++ b/cube/Makefile @@ -86,7 +86,7 @@ Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \ Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c \ Core/Src/system_stm32f1xx.c -ifeq ($(NETWORK), "LAN") +ifeq ($(NETWORK), LAN) C_SOURCES += \ User/Src/ports.c \ User/Src/wizHelper.c \ @@ -159,7 +159,7 @@ C_INCLUDES = \ -IDrivers/CMSIS/Include -ifeq ($(NETWORK), "LAN") +ifeq ($(NETWORK), LAN) C_INCLUDES += \ -IioLibrary_Driver/Internet/SNTP \ -IioLibrary_Driver/Internet/DNS \ @@ -204,7 +204,7 @@ all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o))) vpath %.c $(sort $(dir $(C_SOURCES))) -ifeq ($(NETWORK), "LAN") +ifeq ($(NETWORK), LAN) OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a) endif @@ -212,7 +212,7 @@ endif OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o))) vpath %.s $(sort $(dir $(ASM_SOURCES))) -ifeq ($(NETWORK), "LAN") +ifeq ($(NETWORK), LAN) $(BUILD_DIR)/w5500.a: (cd ioLibrary_Driver && $(MAKE) && cp w5500.a ../$(BUILD_DIR) && cd ..) endif @@ -247,4 +247,4 @@ clean: ####################################### -include $(wildcard $(BUILD_DIR)/*.d) -# *** EOF *** \ No newline at end of file +# *** EOF *** diff --git a/cube/User/Src/counter.c b/cube/User/Src/counter.c index 1805580..5c90b76 100644 --- a/cube/User/Src/counter.c +++ b/cube/User/Src/counter.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include