From a41c8fcc998fe30ad43626f5e49c341b34c21283 Mon Sep 17 00:00:00 2001 From: tbrennan3 Date: Mon, 12 Sep 2011 11:50:05 +0000 Subject: [PATCH] Fixed a few problems with ptransfer in linux builds, but then relagated it to Win32 only builds (left the errors for M$-only functions like _kbhit) Added a makefile for it. --- bacnet-stack/demo/Makefile | 5 +++- bacnet-stack/demo/ptransfer/Makefile | 37 ++++++++++++++++++++++++++++ bacnet-stack/demo/ptransfer/main.c | 2 ++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 bacnet-stack/demo/ptransfer/Makefile diff --git a/bacnet-stack/demo/Makefile b/bacnet-stack/demo/Makefile index e55e925d..e1fac834 100644 --- a/bacnet-stack/demo/Makefile +++ b/bacnet-stack/demo/Makefile @@ -47,8 +47,11 @@ LFLAGS = -Wl,$(LIBRARIES) SUBDIRS = readprop writeprop readfile writefile reinit server dcc \ whohas whois ucov timesync epics readpropm \ - mstpcap ptransfer uptransfer \ + mstpcap uptransfer \ whoisrouter iamrouter initrouter +ifeq (${BACNET_PORT},win32) +SUBDIRS += ptransfer +endif ifneq (,$(findstring -DBAC_ROUTING,$(BACNET_DEFINES))) SUBDIRS += gateway diff --git a/bacnet-stack/demo/ptransfer/Makefile b/bacnet-stack/demo/ptransfer/Makefile new file mode 100644 index 00000000..3bf45d01 --- /dev/null +++ b/bacnet-stack/demo/ptransfer/Makefile @@ -0,0 +1,37 @@ +#Makefile to build BACnet Application for the Linux Port + +# tools - only if you need them. +# Most platforms have this already defined +# CC = gcc + +TARGET = ptransfer + +TARGET_BIN = ${TARGET}$(TARGET_EXT) + +SRCS = main.c + +OBJS = ${SRCS:.c=.o} + +all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN} + +${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET} + ${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@ + size $@ + cp $@ ../../bin + +lib: ${BACNET_LIB_TARGET} + +${BACNET_LIB_TARGET}: + ( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) ) + +.c.o: + ${CC} -c ${CFLAGS} $*.c -o $@ + +depend: + rm -f .depend + ${CC} -MM ${CFLAGS} *.c >> .depend + +clean: + rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET} $(TARGET).map + +include: .depend diff --git a/bacnet-stack/demo/ptransfer/main.c b/bacnet-stack/demo/ptransfer/main.c index add47fe3..0fbc7425 100644 --- a/bacnet-stack/demo/ptransfer/main.c +++ b/bacnet-stack/demo/ptransfer/main.c @@ -29,7 +29,9 @@ #include #include #include /* for time */ +#if defined(WIN32) || defined(__BORLANDC__) #include +#endif #define PRINT_ENABLED 1 #include "bacdef.h"