Fixed uci compile errors (#220)
* Fixed UCI=1 compile ld: warning: directory not found for option \-L/usr/local/lib,-luci' Signed-off-by: Patrick Grimm <patrick@lunatiki.de> * Fixed bsd compile error ld: unknown option: --gc-sections Signed-off-by: Patrick Grimm <patrick@lunatiki.de> * Revert "Fixed bsd compile error ld: unknown option: --gc-sections" This reverts commit e186e396dadb1875018de8b0e738c05b04c8f7d7. * Fixed UCI=1 Undefined symbols "_ucix_init" for bacserv Signed-off-by: Patrick Grimm <patrick@lunatiki.de>
This commit is contained in:
+1
-1
@@ -70,7 +70,7 @@ BACNET_PORT ?= linux
|
|||||||
ifeq (${UCI},1)
|
ifeq (${UCI},1)
|
||||||
BACNET_DEFINES += -DBAC_UCI
|
BACNET_DEFINES += -DBAC_UCI
|
||||||
UCI_LIB_DIR ?= /usr/local/lib
|
UCI_LIB_DIR ?= /usr/local/lib
|
||||||
BACNET_LIB += -L$(UCI_LIB_DIR),-luci
|
BACNET_LIB += -L$(UCI_LIB_DIR) -luci
|
||||||
endif
|
endif
|
||||||
# OS specific builds
|
# OS specific builds
|
||||||
ifeq (${BACNET_PORT},linux)
|
ifeq (${BACNET_PORT},linux)
|
||||||
|
|||||||
@@ -100,6 +100,12 @@ BACNET_BASIC_SRC ?= \
|
|||||||
$(BACNET_SRC_DIR)/bacnet/basic/npdu/s_router.c \
|
$(BACNET_SRC_DIR)/bacnet/basic/npdu/s_router.c \
|
||||||
$(BACNET_SRC_DIR)/bacnet/basic/tsm/tsm.c
|
$(BACNET_SRC_DIR)/bacnet/basic/tsm/tsm.c
|
||||||
|
|
||||||
|
# build in uci integration - use UCI=1 when invoking make
|
||||||
|
ifeq (${UCI},1)
|
||||||
|
BACNET_BASIC_SRC += \
|
||||||
|
$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/ucix/*.c)
|
||||||
|
endif
|
||||||
|
|
||||||
SRCS := $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
|
SRCS := $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
|
||||||
|
|
||||||
OBJS = ${SRCS:.c=.o}
|
OBJS = ${SRCS:.c=.o}
|
||||||
|
|||||||
Reference in New Issue
Block a user