From a3e2d61f56f0d09f90aa479aa60ff9f0ec813817 Mon Sep 17 00:00:00 2001 From: skarg Date: Sat, 8 Mar 2008 15:08:27 +0000 Subject: [PATCH] Modified linux makefiles for compiling with MinGW. Not successful yet (except under codeblocks). --- bacnet-stack/demo/dcc/Makefile | 5 +-- bacnet-stack/demo/epics/Makefile | 5 +-- bacnet-stack/demo/readfile/Makefile | 3 +- bacnet-stack/demo/readprop/Makefile | 13 +++++-- bacnet-stack/demo/reinit/Makefile | 5 +-- bacnet-stack/demo/server/Makefile | 5 +-- bacnet-stack/demo/timesync/Makefile | 5 +-- bacnet-stack/demo/ucov/Makefile | 5 +-- bacnet-stack/demo/whohas/Makefile | 5 +-- bacnet-stack/demo/whois/Makefile | 5 +-- bacnet-stack/demo/writefile/Makefile | 5 +-- bacnet-stack/demo/writeprop/Makefile | 5 +-- bacnet-stack/lib/Makefile | 51 +++++++++++++++++++++++----- 13 files changed, 85 insertions(+), 32 deletions(-) diff --git a/bacnet-stack/demo/dcc/Makefile b/bacnet-stack/demo/dcc/Makefile index 216579f3..c2562ffc 100644 --- a/bacnet-stack/demo/dcc/Makefile +++ b/bacnet-stack/demo/dcc/Makefile @@ -12,7 +12,8 @@ BACNET_DEFINES = -DBACFILE=1 -DPRINT_ENABLED=1 -DBACAPP_ALL DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories -BACNET_PORT = ../../ports/linux +BACNET_PORT = linux +BACNET_PORT_DIR = ../../ports/${BACNET_PORT} BACNET_INCLUDE = ../../include # BACnet Library @@ -20,7 +21,7 @@ BACNET_LIB_DIR = ../../lib BACNET_LIB_NAME = bacnet BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a # Compiler Setup -INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) +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) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/epics/Makefile b/bacnet-stack/demo/epics/Makefile index 82ddbad6..43bbdabc 100644 --- a/bacnet-stack/demo/epics/Makefile +++ b/bacnet-stack/demo/epics/Makefile @@ -12,15 +12,16 @@ BACNET_DEFINES = -DBACFILE=1 -DPRINT_ENABLED=1 -DBACAPP_ALL DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories +BACNET_PORT = linux +BACNET_PORT_DIR = ../../ports/${BACNET_PORT} BACNET_SOURCE = ../../src -BACNET_PORT = ../../ports/linux BACNET_INCLUDE = ../../include # BACnet Library BACNET_LIB_DIR = ../../lib BACNET_LIB_NAME = bacnet BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a # Compiler Setup -INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) +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) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/readfile/Makefile b/bacnet-stack/demo/readfile/Makefile index ee45b1d7..41fda9e8 100644 --- a/bacnet-stack/demo/readfile/Makefile +++ b/bacnet-stack/demo/readfile/Makefile @@ -12,7 +12,8 @@ BACNET_DEFINES = -DBACFILE=1 -DPRINT_ENABLED=1 -DBACAPP_ALL DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories -BACNET_PORT = ../../ports/linux +BACNET_PORT = linux +BACNET_PORT_DIR = ../../ports/${BACNET_PORT} BACNET_INCLUDE = ../../include # BACnet Library BACNET_LIB_DIR = ../../lib diff --git a/bacnet-stack/demo/readprop/Makefile b/bacnet-stack/demo/readprop/Makefile index 5d49e0a8..f4bcd041 100644 --- a/bacnet-stack/demo/readprop/Makefile +++ b/bacnet-stack/demo/readprop/Makefile @@ -13,15 +13,22 @@ BACNET_DEFINES = -DBACFILE=1 -DPRINT_ENABLED=1 -DBACAPP_ALL DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories -BACNET_PORT = ../../ports/linux +BACNET_PORT = linux +BACNET_PORT_DIR = ../../ports/${BACNET_PORT} BACNET_INCLUDE = ../../include # BACnet Library BACNET_LIB_DIR = ../../lib BACNET_LIB_NAME = bacnet BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a # Compiler Setup -INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) +INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR) +ifeq (${BACNET_PORT},linux) +PFLAGS = -pthread 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) +endif CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) @@ -33,7 +40,7 @@ all: ${BACNET_LIB_TARGET} Makefile ${TARGET} size ${TARGET} ${TARGET}: ${OBJS} Makefile - ${CC} -pthread ${OBJS} ${LFLAGS} -o $@ + ${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@ lib: ${BACNET_LIB_TARGET} diff --git a/bacnet-stack/demo/reinit/Makefile b/bacnet-stack/demo/reinit/Makefile index 5997aa19..1bd88a6a 100644 --- a/bacnet-stack/demo/reinit/Makefile +++ b/bacnet-stack/demo/reinit/Makefile @@ -14,7 +14,8 @@ BACNET_DEFINES = -DBACFILE=1 -DPRINT_ENABLED=1 -DBACAPP_ALL DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories -BACNET_PORT = ../../ports/linux +BACNET_PORT = linux +BACNET_PORT_DIR = ../../ports/${BACNET_PORT} BACNET_INCLUDE = ../../include # BACnet Library @@ -22,7 +23,7 @@ BACNET_LIB_DIR = ../../lib BACNET_LIB_NAME = bacnet BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a # Compiler Setup -INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) +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) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/server/Makefile b/bacnet-stack/demo/server/Makefile index f37400c5..08b8dda8 100644 --- a/bacnet-stack/demo/server/Makefile +++ b/bacnet-stack/demo/server/Makefile @@ -14,7 +14,8 @@ BACNET_DEFINES = -DPRINT_ENABLED=1 -DBACAPP_ALL DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories -BACNET_PORT = ../../ports/linux +BACNET_PORT = linux +BACNET_PORT_DIR = ../../ports/${BACNET_PORT} BACNET_INCLUDE = ../../include # BACnet Library @@ -22,7 +23,7 @@ BACNET_LIB_DIR = ../../lib BACNET_LIB_NAME = bacnet BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a # Compiler Setup -INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) +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) -fdata-sections -ffunction-sections LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES),--gc-sections diff --git a/bacnet-stack/demo/timesync/Makefile b/bacnet-stack/demo/timesync/Makefile index a71b088e..822d9b20 100644 --- a/bacnet-stack/demo/timesync/Makefile +++ b/bacnet-stack/demo/timesync/Makefile @@ -14,7 +14,8 @@ BACNET_DEFINES = -DBACFILE=1 -DPRINT_ENABLED=1 -DBACAPP_ALL DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories -BACNET_PORT = ../../ports/linux +BACNET_PORT = linux +BACNET_PORT_DIR = ../../ports/${BACNET_PORT} BACNET_INCLUDE = ../../include # BACnet Library @@ -22,7 +23,7 @@ BACNET_LIB_DIR = ../../lib BACNET_LIB_NAME = bacnet BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a # Compiler Setup -INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) +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) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/ucov/Makefile b/bacnet-stack/demo/ucov/Makefile index 6bad65aa..296dc508 100644 --- a/bacnet-stack/demo/ucov/Makefile +++ b/bacnet-stack/demo/ucov/Makefile @@ -14,7 +14,8 @@ BACNET_DEFINES = -DBACFILE=1 -DPRINT_ENABLED=1 -DBACAPP_ALL DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories -BACNET_PORT = ../../ports/linux +BACNET_PORT = linux +BACNET_PORT_DIR = ../../ports/${BACNET_PORT} BACNET_INCLUDE = ../../include # BACnet Library @@ -22,7 +23,7 @@ BACNET_LIB_DIR = ../../lib BACNET_LIB_NAME = bacnet BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a # Compiler Setup -INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) +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) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/whohas/Makefile b/bacnet-stack/demo/whohas/Makefile index d9bd6b9a..f9820d2c 100644 --- a/bacnet-stack/demo/whohas/Makefile +++ b/bacnet-stack/demo/whohas/Makefile @@ -14,7 +14,8 @@ BACNET_DEFINES = -DBACFILE=1 -DPRINT_ENABLED=1 -DBACAPP_ALL DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories -BACNET_PORT = ../../ports/linux +BACNET_PORT = linux +BACNET_PORT_DIR = ../../ports/${BACNET_PORT} BACNET_INCLUDE = ../../include # BACnet Library @@ -22,7 +23,7 @@ BACNET_LIB_DIR = ../../lib BACNET_LIB_NAME = bacnet BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a # Compiler Setup -INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) +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) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/whois/Makefile b/bacnet-stack/demo/whois/Makefile index 961aef33..e3fadeb5 100644 --- a/bacnet-stack/demo/whois/Makefile +++ b/bacnet-stack/demo/whois/Makefile @@ -12,7 +12,8 @@ BACNET_DEFINES = -DBACFILE=1 -DPRINT_ENABLED=1 -DBACAPP_ALL DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories -BACNET_PORT = ../../ports/linux +BACNET_PORT = linux +BACNET_PORT_DIR = ../../ports/${BACNET_PORT} BACNET_INCLUDE = ../../include # BACnet Library @@ -20,7 +21,7 @@ BACNET_LIB_DIR = ../../lib BACNET_LIB_NAME = bacnet BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a # Compiler Setup -INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) +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) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/writefile/Makefile b/bacnet-stack/demo/writefile/Makefile index 4b1e2c6d..a7dd1cac 100644 --- a/bacnet-stack/demo/writefile/Makefile +++ b/bacnet-stack/demo/writefile/Makefile @@ -14,7 +14,8 @@ BACNET_DEFINES = -DBACFILE=1 -DPRINT_ENABLED=1 -DBACAPP_ALL DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories -BACNET_PORT = ../../ports/linux +BACNET_PORT = linux +BACNET_PORT_DIR = ../../ports/${BACNET_PORT} BACNET_INCLUDE = ../../include # BACnet Library @@ -22,7 +23,7 @@ BACNET_LIB_DIR = ../../lib BACNET_LIB_NAME = bacnet BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a # Compiler Setup -INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) +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) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/writeprop/Makefile b/bacnet-stack/demo/writeprop/Makefile index ec2cc874..adccbb5a 100644 --- a/bacnet-stack/demo/writeprop/Makefile +++ b/bacnet-stack/demo/writeprop/Makefile @@ -14,7 +14,8 @@ BACNET_DEFINES = -DBACFILE=1 -DPRINT_ENABLED=1 -DBACAPP_ALL DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories -BACNET_PORT = ../../ports/linux +BACNET_PORT = linux +BACNET_PORT_DIR = ../../ports/${BACNET_PORT} BACNET_INCLUDE = ../../include # BACnet Library @@ -22,7 +23,7 @@ BACNET_LIB_DIR = ../../lib BACNET_LIB_NAME = bacnet BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a # Compiler Setup -INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) +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) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/lib/Makefile b/bacnet-stack/lib/Makefile index 34f43546..1b60e8a5 100644 --- a/bacnet-stack/lib/Makefile +++ b/bacnet-stack/lib/Makefile @@ -16,14 +16,16 @@ BACNET_DEFINES=-DPRINT_ENABLED=1 -DBACAPP_ALL -DBACFILE BACDL_DEFINE=-DBACDL_BIP=1 DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # directories -BACNET_PORT = ../ports/linux +BACNET_PORT = linux +BACNET_PORT_DIR = ../ports/${BACNET_PORT} + BACNET_OBJECT = ../demo/object BACNET_HANDLER = ../demo/handler BACNET_CORE = ../src BACNET_INCLUDE = ../include # compiler configuration #STANDARDS = -std=c99 -INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) CFLAGS = -Wall -g $(STANDARDS) $(INCLUDES) $(DEFINES) CORE_SRC = \ @@ -103,17 +105,50 @@ OBJECT_SRC = \ $(BACNET_OBJECT)/mso.c \ $(BACNET_OBJECT)/bacfile.c -PORT_SRC = \ - $(BACNET_PORT)/bip-init.c \ - $(BACNET_PORT)/ethernet.c \ - $(BACNET_PORT)/arcnet.c \ - $(BACNET_PORT)/dlmstp.c \ - $(BACNET_PORT)/rs485.c \ +PORT_ARCNET_SRC = \ + $(BACNET_PORT_DIR)/arcnet.c + +PORT_MSTP_SRC = \ + $(BACNET_PORT_DIR)/dlmstp.c \ + $(BACNET_PORT_DIR)/rs485.c \ $(BACNET_CORE)/mstp.c \ $(BACNET_CORE)/crc.c \ + +PORT_ETHERNET_SRC = \ + $(BACNET_PORT_DIR)/ethernet.c + +PORT_BIP_SRC = \ + $(BACNET_PORT_DIR)/bip-init.c \ $(BACNET_CORE)/bvlc.c \ $(BACNET_CORE)/bip.c +PORT_ALL_SRC = \ + $(BACNET_PORT_DIR)/arcnet.c \ + $(BACNET_PORT_DIR)/dlmstp.c \ + $(BACNET_PORT_DIR)/rs485.c \ + $(BACNET_CORE)/mstp.c \ + $(BACNET_CORE)/crc.c \ + $(BACNET_PORT_DIR)/ethernet.c \ + $(BACNET_PORT_DIR)/bip-init.c \ + $(BACNET_CORE)/bvlc.c \ + $(BACNET_CORE)/bip.c + +ifeq (${BACDL_DEFINE},-DBACDL_BIP=1) +PORT_SRC = ${PORT_BIP_SRC} +endif +ifdef BACDL_MSTP +PORT_SRC = ${PORT_MSTP_SRC} +endif +ifdef BACDL_ARCNET +PORT_SRC = ${PORT_ARCNET_SRC} +endif +ifdef BACDL_ETHERNET +PORT_SRC = ${PORT_ETHERNET_SRC} +endif +ifdef BACDL_ALL +PORT_SRC = ${PORT_ALL_SRC} +endif + SRCS = ${CORE_SRC} ${PORT_SRC} ${HANDLER_SRC} ${OBJECT_SRC} OBJS = ${SRCS:.c=.o}