Modified the linux makefiles to work with MinGW by passing in BACNET_PORT=win32 from the make command. Corrected the AdapterInfo patch, and tested it.

This commit is contained in:
skarg
2008-03-10 20:44:18 +00:00
parent f86a5847ac
commit e2f7234e7d
16 changed files with 245 additions and 94 deletions
+7 -3
View File
@@ -1,5 +1,9 @@
@echo off
rem Build for Borland 5.5 tools
rem set BORLAND_DIR=c:\borland\bcc55
rem %BORLAND_DIR%\bin\make -f makefile.b32 clean
rem %BORLAND_DIR%\bin\make -f makefile.b32 all
set BORLAND_DIR=c:\borland\bcc55
c:\borland\bcc55\bin\make -f makefile.b32 clean
c:\borland\bcc55\bin\make -f makefile.b32 all
rem Build for MinGW
make BACNET_PORT=win32 OPTIMIZATION=-Os DEBUGGING= clean all
+19 -7
View File
@@ -22,19 +22,31 @@ BACNET_LIB_NAME = bacnet
BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
# Compiler Setup
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR)
LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
CFLAGS = -Wall -g $(INCLUDES) $(DEFINES)
ifeq (${BACNET_PORT},linux)
PFLAGS = -pthread
TARGET_BIN = ${TARGET}
LIBRARIES=-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME),-lc,-lgcc,-lm
endif
ifeq (${BACNET_PORT},win32)
TARGET_BIN = ${TARGET}.exe
LIBRARY1=-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
LIBRARY2=-lws2_32,-lgcc,-lm,-liphlpapi
LIBRARIES=$(LIBRARY1),$(LIBRARY2)
endif
DEBUGGING = -g
OPTIMIZATION = -O0
CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES)
LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES)
SRCS = main.c
OBJS = ${SRCS:.c=.o}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET}
size ${TARGET}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
size ${TARGET_BIN}
${TARGET}: ${OBJS} Makefile
${CC} -pthread ${OBJS} ${LFLAGS} -o $@
${TARGET_BIN}: ${OBJS} Makefile
${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
lib: ${BACNET_LIB_TARGET}
@@ -49,7 +61,7 @@ depend:
${CC} -MM ${CFLAGS} *.c >> .depend
clean:
rm -f core ${TARGET} ${OBJS} ${BACNET_LIB_TARGET}
rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET}
include: .depend
+19 -7
View File
@@ -22,8 +22,20 @@ BACNET_LIB_NAME = bacnet
BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
# Compiler Setup
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR)
LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
CFLAGS = -Wall -g $(INCLUDES) $(DEFINES)
ifeq (${BACNET_PORT},linux)
PFLAGS = -pthread
TARGET_BIN = ${TARGET}
LIBRARIES=-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME),-lc,-lgcc,-lm
endif
ifeq (${BACNET_PORT},win32)
TARGET_BIN = ${TARGET}.exe
LIBRARY1=-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
LIBRARY2=-lws2_32,-lgcc,-lm,-liphlpapi
LIBRARIES=$(LIBRARY1),$(LIBRARY2)
endif
DEBUGGING = -g
OPTIMIZATION = -O0
CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES)
LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES)
SRCS = main.c \
@@ -32,11 +44,11 @@ SRCS = main.c \
OBJS = ${SRCS:.c=.o}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET}
size ${TARGET}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
size ${TARGET_BIN}
${TARGET}: ${OBJS} Makefile
${CC} -pthread ${OBJS} ${LFLAGS} -o $@
${TARGET_BIN}: ${OBJS} Makefile
${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
lib: ${BACNET_LIB_TARGET}
@@ -51,6 +63,6 @@ depend:
${CC} -MM ${CFLAGS} *.c >> .depend
clean:
rm -f core ${TARGET} ${OBJS} ${BACNET_LIB_TARGET}
rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET}
include: .depend
+19 -7
View File
@@ -21,19 +21,31 @@ BACNET_LIB_NAME = bacnet
BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
# Compiler Setup
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR)
LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
CFLAGS = -Wall -g $(INCLUDES) $(DEFINES)
ifeq (${BACNET_PORT},linux)
PFLAGS = -pthread
TARGET_BIN = ${TARGET}
LIBRARIES=-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME),-lc,-lgcc,-lm
endif
ifeq (${BACNET_PORT},win32)
TARGET_BIN = ${TARGET}.exe
LIBRARY1=-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
LIBRARY2=-lws2_32,-lgcc,-lm,-liphlpapi
LIBRARIES=$(LIBRARY1),$(LIBRARY2)
endif
DEBUGGING = -g
OPTIMIZATION = -O0
CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES)
LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES)
SRCS = main.c
OBJS = ${SRCS:.c=.o}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET}
size ${TARGET}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
size ${TARGET_BIN}
${TARGET}: ${OBJS} Makefile
${CC} -pthread ${OBJS} ${LFLAGS} -o $@
${TARGET_BIN}: ${OBJS} Makefile
${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
lib: ${BACNET_LIB_TARGET}
@@ -48,6 +60,6 @@ depend:
${CC} -MM ${CFLAGS} *.c >> .depend
clean:
rm -f core ${TARGET} ${OBJS} ${BACNET_LIB_TARGET}
rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET}
include: .depend
+13 -7
View File
@@ -24,23 +24,29 @@ BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR)
ifeq (${BACNET_PORT},linux)
PFLAGS = -pthread
TARGET_BIN = ${TARGET}
LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
endif
ifeq (${BACNET_PORT},win32)
LIBRARIES=-lws2_32,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
TARGET_BIN = ${TARGET}.exe
LIBRARY1=-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
LIBRARY2=-lws2_32,-lgcc,-lm,-liphlpapi
LIBRARIES=$(LIBRARY1),$(LIBRARY2)
endif
CFLAGS = -Wall -g $(INCLUDES) $(DEFINES)
DEBUGGING = -g
OPTIMIZATION = -O0
CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES)
LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES)
SRCS = main.c
OBJS = ${SRCS:.c=.o}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET}
size ${TARGET}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
size ${TARGET_BIN}
${TARGET}: ${OBJS} Makefile
${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
${TARGET_BIN}: ${OBJS} Makefile
${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
lib: ${BACNET_LIB_TARGET}
@@ -55,6 +61,6 @@ depend:
${CC} -MM ${CFLAGS} *.c >> .depend
clean:
rm -f core ${TARGET} ${OBJS} ${BACNET_LIB_TARGET}
rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET}
include: .depend
+18 -6
View File
@@ -24,19 +24,31 @@ BACNET_LIB_NAME = bacnet
BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
# Compiler Setup
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR)
ifeq (${BACNET_PORT},linux)
PFLAGS = -pthread
TARGET_BIN = ${TARGET}
LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
CFLAGS = -Wall -g $(INCLUDES) $(DEFINES)
endif
ifeq (${BACNET_PORT},win32)
TARGET_BIN = ${TARGET}.exe
LIBRARY1=-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
LIBRARY2=-lws2_32,-lgcc,-lm,-liphlpapi
LIBRARIES=$(LIBRARY1),$(LIBRARY2)
endif
DEBUGGING = -g
OPTIMIZATION = -O0
CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES)
LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES)
SRCS = main.c
OBJS = ${SRCS:.c=.o}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET}
size ${TARGET}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
size ${TARGET_BIN}
${TARGET}: ${OBJS} Makefile
${CC} -pthread ${OBJS} ${LFLAGS} -o $@
${TARGET_BIN}: ${OBJS} Makefile
${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
lib: ${BACNET_LIB_TARGET}
@@ -51,6 +63,6 @@ depend:
${CC} -MM ${CFLAGS} *.c >> .depend
clean:
rm -f core ${TARGET} ${OBJS} ${BACNET_LIB_TARGET}
rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET}
include: .depend
+18 -6
View File
@@ -24,19 +24,31 @@ BACNET_LIB_NAME = bacnet
BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
# Compiler Setup
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR)
ifeq (${BACNET_PORT},linux)
PFLAGS = -pthread
TARGET_BIN = ${TARGET}
LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) -fdata-sections -ffunction-sections
endif
ifeq (${BACNET_PORT},win32)
TARGET_BIN = ${TARGET}.exe
LIBRARY1=-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
LIBRARY2=-lws2_32,-lgcc,-lm,-liphlpapi
LIBRARIES=$(LIBRARY1),$(LIBRARY2)
endif
DEBUGGING = -g
OPTIMIZATION = -O0
CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES) -fdata-sections -ffunction-sections
LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES),--gc-sections
SRCS = main.c
OBJS = ${SRCS:.c=.o}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET}
size ${TARGET}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
size ${TARGET_BIN}
${TARGET}: ${OBJS} Makefile
${CC} -pthread ${OBJS} ${LFLAGS} -o $@
${TARGET_BIN}: ${OBJS} Makefile
${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
lib: ${BACNET_LIB_TARGET}
@@ -51,6 +63,6 @@ depend:
${CC} -MM ${CFLAGS} *.c >> .depend
clean:
rm -f core ${TARGET} ${OBJS} ${BACNET_LIB_TARGET}
rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET}
include: .depend
+18 -6
View File
@@ -24,19 +24,31 @@ BACNET_LIB_NAME = bacnet
BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
# Compiler Setup
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR)
ifeq (${BACNET_PORT},linux)
PFLAGS = -pthread
TARGET_BIN = ${TARGET}
LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
CFLAGS = -Wall -g $(INCLUDES) $(DEFINES)
endif
ifeq (${BACNET_PORT},win32)
TARGET_BIN = ${TARGET}.exe
LIBRARY1=-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
LIBRARY2=-lws2_32,-lgcc,-lm,-liphlpapi
LIBRARIES=$(LIBRARY1),$(LIBRARY2)
endif
DEBUGGING = -g
OPTIMIZATION = -O0
CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES)
LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES)
SRCS = main.c
OBJS = ${SRCS:.c=.o}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET}
size ${TARGET}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
size ${TARGET_BIN}
${TARGET}: ${OBJS} Makefile
${CC} -pthread ${OBJS} ${LFLAGS} -o $@
${TARGET_BIN}: ${OBJS} Makefile
${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
lib: ${BACNET_LIB_TARGET}
@@ -51,6 +63,6 @@ depend:
${CC} -MM ${CFLAGS} *.c >> .depend
clean:
rm -f core ${TARGET} ${OBJS} ${BACNET_LIB_TARGET}
rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET}
include: .depend
+18 -6
View File
@@ -24,19 +24,31 @@ BACNET_LIB_NAME = bacnet
BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
# Compiler Setup
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR)
ifeq (${BACNET_PORT},linux)
PFLAGS = -pthread
TARGET_BIN = ${TARGET}
LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
CFLAGS = -Wall -g $(INCLUDES) $(DEFINES)
endif
ifeq (${BACNET_PORT},win32)
TARGET_BIN = ${TARGET}.exe
LIBRARY1=-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
LIBRARY2=-lws2_32,-lgcc,-lm,-liphlpapi
LIBRARIES=$(LIBRARY1),$(LIBRARY2)
endif
DEBUGGING = -g
OPTIMIZATION = -O0
CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES)
LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES)
SRCS = main.c
OBJS = ${SRCS:.c=.o}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET}
size ${TARGET}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
size ${TARGET_BIN}
${TARGET}: ${OBJS} Makefile
${CC} -pthread ${OBJS} ${LFLAGS} -o $@
${TARGET_BIN}: ${OBJS} Makefile
${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
lib: ${BACNET_LIB_TARGET}
@@ -51,6 +63,6 @@ depend:
${CC} -MM ${CFLAGS} *.c >> .depend
clean:
rm -f core ${TARGET} ${OBJS} ${BACNET_LIB_TARGET}
rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET}
include: .depend
+18 -6
View File
@@ -24,19 +24,31 @@ BACNET_LIB_NAME = bacnet
BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
# Compiler Setup
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR)
ifeq (${BACNET_PORT},linux)
PFLAGS = -pthread
TARGET_BIN = ${TARGET}
LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
CFLAGS = -Wall -g $(INCLUDES) $(DEFINES)
endif
ifeq (${BACNET_PORT},win32)
TARGET_BIN = ${TARGET}.exe
LIBRARY1=-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
LIBRARY2=-lws2_32,-lgcc,-lm,-liphlpapi
LIBRARIES=$(LIBRARY1),$(LIBRARY2)
endif
DEBUGGING = -g
OPTIMIZATION = -O0
CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES)
LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES)
SRCS = main.c
OBJS = ${SRCS:.c=.o}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET}
size ${TARGET}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
size ${TARGET_BIN}
${TARGET}: ${OBJS} Makefile
${CC} -pthread ${OBJS} ${LFLAGS} -o $@
${TARGET_BIN}: ${OBJS} Makefile
${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
lib: ${BACNET_LIB_TARGET}
@@ -51,6 +63,6 @@ depend:
${CC} -MM ${CFLAGS} *.c >> .depend
clean:
rm -f core ${TARGET} ${OBJS} ${BACNET_LIB_TARGET}
rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET}
include: .depend
+18 -6
View File
@@ -22,19 +22,31 @@ BACNET_LIB_NAME = bacnet
BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
# Compiler Setup
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR)
ifeq (${BACNET_PORT},linux)
PFLAGS = -pthread
TARGET_BIN = ${TARGET}
LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
CFLAGS = -Wall -g $(INCLUDES) $(DEFINES)
endif
ifeq (${BACNET_PORT},win32)
TARGET_BIN = ${TARGET}.exe
LIBRARY1=-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
LIBRARY2=-lws2_32,-lgcc,-lm,-liphlpapi
LIBRARIES=$(LIBRARY1),$(LIBRARY2)
endif
DEBUGGING = -g
OPTIMIZATION = -O0
CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES)
LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES)
SRCS = main.c
OBJS = ${SRCS:.c=.o}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET}
size ${TARGET}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
size ${TARGET_BIN}
${TARGET}: ${OBJS} Makefile
${CC} -pthread ${OBJS} ${LFLAGS} -o $@
${TARGET_BIN}: ${OBJS} Makefile
${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
lib: ${BACNET_LIB_TARGET}
@@ -49,6 +61,6 @@ depend:
${CC} -MM ${CFLAGS} *.c >> .depend
clean:
rm -f core ${TARGET} ${OBJS} ${BACNET_LIB_TARGET}
rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET}
include: .depend
+18 -6
View File
@@ -24,19 +24,31 @@ BACNET_LIB_NAME = bacnet
BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
# Compiler Setup
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR)
ifeq (${BACNET_PORT},linux)
PFLAGS = -pthread
TARGET_BIN = ${TARGET}
LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
CFLAGS = -Wall -g $(INCLUDES) $(DEFINES)
endif
ifeq (${BACNET_PORT},win32)
TARGET_BIN = ${TARGET}.exe
LIBRARY1=-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
LIBRARY2=-lws2_32,-lgcc,-lm,-liphlpapi
LIBRARIES=$(LIBRARY1),$(LIBRARY2)
endif
DEBUGGING = -g
OPTIMIZATION = -O0
CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES)
LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES)
SRCS = main.c
OBJS = ${SRCS:.c=.o}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET}
size ${TARGET}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
size ${TARGET_BIN}
${TARGET}: ${OBJS} Makefile
${CC} -pthread ${OBJS} ${LFLAGS} -o $@
${TARGET_BIN}: ${OBJS} Makefile
${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
lib: ${BACNET_LIB_TARGET}
@@ -51,6 +63,6 @@ depend:
${CC} -MM ${CFLAGS} *.c >> .depend
clean:
rm -f core ${TARGET} ${OBJS} ${BACNET_LIB_TARGET}
rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET}
include: .depend
+18 -6
View File
@@ -24,19 +24,31 @@ BACNET_LIB_NAME = bacnet
BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
# Compiler Setup
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR)
ifeq (${BACNET_PORT},linux)
PFLAGS = -pthread
TARGET_BIN = ${TARGET}
LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
CFLAGS = -Wall -g $(INCLUDES) $(DEFINES)
endif
ifeq (${BACNET_PORT},win32)
TARGET_BIN = ${TARGET}.exe
LIBRARY1=-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
LIBRARY2=-lws2_32,-lgcc,-lm,-liphlpapi
LIBRARIES=$(LIBRARY1),$(LIBRARY2)
endif
DEBUGGING = -g
OPTIMIZATION = -O0
CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES)
LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES)
SRCS = main.c
OBJS = ${SRCS:.c=.o}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET}
size ${TARGET}
all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
size ${TARGET_BIN}
${TARGET}: ${OBJS} Makefile
${CC} -pthread ${OBJS} ${LFLAGS} -o $@
${TARGET_BIN}: ${OBJS} Makefile
${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
lib: ${BACNET_LIB_TARGET}
@@ -51,6 +63,6 @@ depend:
${CC} -MM ${CFLAGS} *.c >> .depend
clean:
rm -f core ${TARGET} ${OBJS} ${BACNET_LIB_TARGET}
rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET}
include: .depend
+4 -3
View File
@@ -12,9 +12,10 @@
/* optional configuration for BACnet/IP datalink layers */
#if (defined(BACDL_BIP) || defined(BACDL_ALL))
#if !defined(USE_INADDR)
#define USE_INADDR 1
#endif
/* other BIP defines (define as 1 to enable):
USE_INADDR - uses INADDR_BROADCAST for broadcast and binds using INADDR_ANY
USE_CLASSADDR = uses IN_CLASSx_HOST where x=A,B,C or D for broadcast
*/
#if !defined(BBMD_ENABLED)
#define BBMD_ENABLED 1
#endif
+3 -1
View File
@@ -26,7 +26,9 @@ BACNET_INCLUDE = ../include
# compiler configuration
#STANDARDS = -std=c99
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER)
CFLAGS = -Wall -g $(STANDARDS) $(INCLUDES) $(DEFINES)
OPTIMIZATION = -O0
DEBUGGING = -g
CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(STANDARDS) $(INCLUDES) $(DEFINES)
CORE_SRC = \
$(BACNET_CORE)/apdu.c \
+17 -11
View File
@@ -82,7 +82,9 @@ static long gethostaddr(
return *(long *) host_ent->h_addr;
}
#if !defined(USE_INADDR) && !defined(USE_CLASSADDR)
#if (!defined(USE_INADDR) || (USE_INADDR == 0)) && \
(!defined(USE_CLASSADDR) || (USE_CLASSADDR == 0))
/* returns the subnet mask in network byte order */
static uint32_t getIpMaskForIpAddress( uint32_t ipAddress )
{
/* Allocate information for up to 16 NICs */
@@ -131,12 +133,12 @@ static uint32_t getIpMaskForIpAddress( uint32_t ipAddress )
static void set_broadcast_address(uint32_t net_address)
{
#if USE_INADDR
#if defined(USE_INADDR) && USE_INADDR
/* Note: sometimes INADDR_BROADCAST does not let me get
any unicast messages. Not sure why... */
(void) net_address;
net_address = net_address;
bip_set_broadcast_addr(INADDR_BROADCAST);
#elif USE_CLASSADDR
#elif defined(USE_CLASSADDR) && USE_CLASSADDR
long broadcast_address = 0;
if (IN_CLASSA(ntohl(net_address)))
@@ -155,14 +157,18 @@ static void set_broadcast_address(uint32_t net_address)
broadcast_address = INADDR_BROADCAST;
bip_set_broadcast_addr(htonl(broadcast_address));
#else
/* these are network byte order variables */
long broadcast_address = 0;
long mask = 0;
long net_mask = 0;
mask = getIpMaskForIpAddress( net_address );
broadcast_address = (ntohl(net_address) & ~mask) | mask;
bip_set_broadcast_addr(htonl(broadcast_address));
net_mask = getIpMaskForIpAddress( net_address );
if (BIP_Debug) {
struct in_addr address;
address.s_addr = net_mask;
printf("IP Mask: %s\n", inet_ntoa(address));
}
broadcast_address = (net_address & net_mask) | (~net_mask);
bip_set_broadcast_addr(broadcast_address);
#endif
}
@@ -398,7 +404,7 @@ bool bip_init(
#endif
/* bind the socket to the local port number and IP address */
sin.sin_family = AF_INET;
#if USE_INADDR
#if defined(USE_INADDR) && USE_INADDR
/* by setting sin.sin_addr.s_addr to INADDR_ANY,
I am telling the IP stack to automatically fill
in the IP address of the machine the process