From 75bfee00d46037b9d3da9363a7b6194192414159 Mon Sep 17 00:00:00 2001 From: skarg Date: Tue, 5 Jul 2011 20:00:23 +0000 Subject: [PATCH] Moved demo configuration option to Makefile. --- bacnet-stack/Makefile | 7 ++++++- bacnet-stack/include/bacdef.h | 3 --- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bacnet-stack/Makefile b/bacnet-stack/Makefile index d697d43b..1f45235b 100644 --- a/bacnet-stack/Makefile +++ b/bacnet-stack/Makefile @@ -11,7 +11,12 @@ # configuration # If BACNET_DEFINES has not already been set, configure to your needs here -BACNET_DEFINES ?= -DPRINT_ENABLED=1 -DBACAPP_ALL -DBACFILE +MY_BACNET_DEFINES = -DPRINT_ENABLED=1 +MY_BACNET_DEFINES += -DBACAPP_ALL +MY_BACNET_DEFINES += -DBACFILE +MY_BACNET_DEFINES += -DINTRINSIC_REPORTING +BACNET_DEFINES ?= $(MY_BACNET_DEFINES) + # un-comment the next line to build the routing demo application #BACNET_DEFINES += -DBAC_ROUTING diff --git a/bacnet-stack/include/bacdef.h b/bacnet-stack/include/bacdef.h index f3ff5588..8e40fb06 100644 --- a/bacnet-stack/include/bacdef.h +++ b/bacnet-stack/include/bacdef.h @@ -49,9 +49,6 @@ #define BACNET_PROTOCOL_VERSION 1 #define BACNET_PROTOCOL_REVISION 10 -/* Intrinsic reporting funcionality */ -#define INTRINSIC_REPORTING - /* largest BACnet Instance Number */ /* Also used as a device instance number wildcard address */ #define BACNET_MAX_INSTANCE (0x3FFFFF)