dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed mstpcap ctrl-c on Linux. Fixed mstpcap makefile on linux, while excluding cygwin.

Browse Source
This commit is contained in:
skarg
2013-09-16 18:23:18 +00:00
parent 4b21f62f38
commit 6a22a2b89c
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/Makefile
+4 -13
View File
@@ -62,24 +62,15 @@ ifeq (${BACDL_DEFINE},-DBACDL_BIP=1)
SUBDIRS += whoisrouter iamrouter initrouter readbdt
endif
# EKH: only include MSTP stuff if building targets MSTP or ALL. This allows us to compile under Cygwin, which has no support for RS485 (yet)
# I searched for a clean way of doing the 'or' operation and the best I could come up with was http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
addMSTP=
ifdef BACDL_ALL
addMSTP = true
endif
ifeq (${BACDL_DEFINE},-DBACDL_MSTP=1)
addMSTP = true
endif
ifdef addMSTP # if we want MSTP
ifeq (${BACNET_PORT},linux) # AND we are compiling under linux/cygwin
SUBDIRS += mstpcap mstpcrc
ifeq (${BACNET_PORT},linux)
ifneq (${OSTYPE},cygwin)
SUBDIRS += mstpcap mstpcrc
#SUBDIRS += router
endif
endif
ifeq (${BACNET_PORT},win32)
SUBDIRS += ptransfer mstpcap mstpcrc
SUBDIRS += ptransfer mstpcap mstpcrc
endif
.PHONY : all gateway router clean