Bugfix/router mstp builds (#630)
* Fixed example app router-ipv6 to build under ports/win32 * Fixed example app router-mstp to build under ports/win32 with MinGW * Added win32 builds of router-ipv6 and router-mstp to the Github pipeline
This commit is contained in:
+14
-6
@@ -23,6 +23,9 @@ INCLUDES = -I$(BACNET_SRC_DIR)
|
||||
CFLAGS += $(WARNINGS) $(DEBUGGING) $(OPTIMIZATION) $(BACNET_DEFINES) $(INCLUDES)
|
||||
CFLAGS += -ffunction-sections -fdata-sections
|
||||
|
||||
APPS_ENVIRONMENT_SRC = \
|
||||
$(BACNET_SRC_DIR)/bacnet/datalink/dlenv.c
|
||||
|
||||
PORT_ARCNET_SRC = \
|
||||
$(BACNET_PORT_DIR)/arcnet.c
|
||||
|
||||
@@ -60,19 +63,19 @@ PORT_NONE_SRC = \
|
||||
$(BACNET_SRC_DIR)/bacnet/datalink/datalink.c
|
||||
|
||||
ifeq (${BACDL_DEFINE},-DBACDL_BIP=1)
|
||||
BACNET_PORT_SRC = ${PORT_BIP_SRC}
|
||||
BACNET_PORT_SRC = ${PORT_BIP_SRC} ${APPS_ENVIRONMENT_SRC}
|
||||
endif
|
||||
ifeq (${BACDL_DEFINE},-DBACDL_BIP6=1)
|
||||
BACNET_PORT_SRC = ${PORT_BIP6_SRC}
|
||||
BACNET_PORT_SRC = ${PORT_BIP6_SRC} ${APPS_ENVIRONMENT_SRC}
|
||||
endif
|
||||
ifeq (${BACDL_DEFINE},-DBACDL_MSTP=1)
|
||||
BACNET_PORT_SRC = ${PORT_MSTP_SRC}
|
||||
BACNET_PORT_SRC = ${PORT_MSTP_SRC} ${APPS_ENVIRONMENT_SRC}
|
||||
endif
|
||||
ifeq (${BACDL_DEFINE},-DBACDL_ARCNET=1)
|
||||
BACNET_PORT_SRC = ${PORT_ARCNET_SRC}
|
||||
BACNET_PORT_SRC = ${PORT_ARCNET_SRC} ${APPS_ENVIRONMENT_SRC}
|
||||
endif
|
||||
ifeq (${BACDL_DEFINE},-DBACDL_ETHERNET=1)
|
||||
BACNET_PORT_SRC = ${PORT_ETHERNET_SRC}
|
||||
BACNET_PORT_SRC = ${PORT_ETHERNET_SRC} ${APPS_ENVIRONMENT_SRC}
|
||||
endif
|
||||
ifeq (${BACDL_DEFINE},-DBACDL_NONE=1)
|
||||
BACNET_PORT_SRC = ${PORT_NONE_SRC}
|
||||
@@ -80,12 +83,17 @@ endif
|
||||
ifeq (${BACDL_DEFINE},-DBACDL_ALL=1)
|
||||
BACNET_PORT_SRC = ${PORT_ALL_SRC}
|
||||
endif
|
||||
ifeq (${BACDL},bip-mstp)
|
||||
BACNET_PORT_SRC = ${PORT_BIP_SRC} ${PORT_MSTP_SRC}
|
||||
endif
|
||||
ifeq (${BACDL},bip-bip6)
|
||||
BACNET_PORT_SRC = ${PORT_BIP_SRC} ${PORT_BIP6_SRC}
|
||||
endif
|
||||
ifneq (${BACDL_DEFINE},)
|
||||
CFLAGS += ${BACDL_DEFINE}
|
||||
endif
|
||||
|
||||
BACNET_PORT_SRC += \
|
||||
$(BACNET_SRC_DIR)/bacnet/datalink/dlenv.c \
|
||||
$(BACNET_PORT_DIR)/mstimer-init.c \
|
||||
$(BACNET_PORT_DIR)/datetime-init.c
|
||||
|
||||
|
||||
Reference in New Issue
Block a user