Issue 2 move folders and use deep path include file names to prevent collisions (#4)
* moving folders and files and adjust server demo build * Fix Makefile for apps/server on Linux * fix unit test source file folders * fix datetime convert UTC functions. Add Code::Blocks project for datetime testing * added some ignore extensions * disable parallel make option * fix build for abort, dcc, and epics apps * fix build for dcc, epics, error, and getevent apps. * Fixed building of all apps * fix the ipv4 to ipv6 router app build * Change indent style from Google to Webkit * make pretty to re-format style * removed common Makefile since we already had one and two was too many * remove scripts from root folder that are no longer maintained or used * remove mercurial EOL and ignore files for git repo * remove .vscodeconfig files from repo * tweak clang-format style * clang-format src and apps with tweaked style * added clang-tidy to fix readability if braces in src * result of make tidy for src and apps * fix clang-tidy mangling * Added code::blocks project for BACnet server simulation * added code::blocks linux project for WhoIs app * update text files for EOL * fix EOL in some files * fixed make win32 apps for older gcc * Removed Borland C++ Makefile in apps. Unable to maintain support for Borland C++ compiler. * created codeblocks project for apps/epics for Windows * fixing ports/xplained to work with new data structure. * fix ports/xplained example for Atmel Studio compile * fix ports/stm32f10x example for gcc Makefile compile * fix ports/stm32f10x example for IAR EWARM compile * fix ports/xplained timer callback * fix ports/bdk_atxx_mspt build with subdirs * fix ports/bdk_atxx_mspt build with subdirs * updated git ignore for IAR build artifacts * updated gitignore for non-tracked files and folders * fixed bdk-atxx4-mstp port for Rowley Crossworks project file * fixed bdk-atxx4-mstp port for GCC AVR Makefile * fixed atmega168 port for IAR AVR and GCC AVR Makefile * fixed at91sam7s port for IAR ARM and GCC ARM Makefile * removed unmaintainable DOS, RTOS32, and atmega8 ports. Updated rx62n (untested). * changed arm7 to uip port
This commit is contained in:
+21
-26
@@ -5,10 +5,8 @@ TARGET=bacnet
|
||||
|
||||
BACNET_DIR = ../..
|
||||
BACNET_CORE = $(BACNET_DIR)/src
|
||||
BACNET_DEMO = $(BACNET_DIR)/demo
|
||||
BACNET_INCLUDE = $(BACNET_DIR)/include
|
||||
BACNET_OBJECT = $(BACNET_DIR)/demo/object
|
||||
BACNET_HANDLER = $(BACNET_DIR)/demo/handler
|
||||
BACNET_BASIC = $(BACNET_DIR)/basic
|
||||
BACNET_INCLUDE = $(BACNET_CORE)
|
||||
PLATFORM_DIR = .
|
||||
LIBRARY_STM32 = ./drivers/src
|
||||
LIBRARY_STM32_INCLUDES = ./drivers/inc
|
||||
@@ -18,8 +16,6 @@ INCLUDES = -I$(PLATFORM_DIR)
|
||||
INCLUDES += -I$(LIBRARY_STM32_INCLUDES)
|
||||
INCLUDES += -I$(LIBRARY_CMSIS)
|
||||
INCLUDES += -I$(BACNET_INCLUDE)
|
||||
INCLUDES += -I$(BACNET_OBJECT)
|
||||
INCLUDES += -I$(BACNET_HANDLER)
|
||||
|
||||
PLATFORM_SRC = \
|
||||
$(PLATFORM_DIR)/main.c \
|
||||
@@ -32,26 +28,27 @@ PLATFORM_SRC = \
|
||||
$(PLATFORM_DIR)/rs485.c \
|
||||
$(PLATFORM_DIR)/stm32f10x_it.c \
|
||||
$(PLATFORM_DIR)/system_stm32f10x.c \
|
||||
$(PLATFORM_DIR)/timer.c \
|
||||
$(PLATFORM_DIR)/timer_sys.c
|
||||
$(PLATFORM_DIR)/timer-init.c
|
||||
|
||||
DEMO_SRC = \
|
||||
$(BACNET_DEMO)/handler/h_dcc.c \
|
||||
$(BACNET_DEMO)/handler/h_npdu.c \
|
||||
$(BACNET_DEMO)/handler/h_rd.c \
|
||||
$(BACNET_DEMO)/handler/h_rp.c \
|
||||
$(BACNET_DEMO)/handler/h_rpm.c \
|
||||
$(BACNET_DEMO)/handler/h_whohas.c \
|
||||
$(BACNET_DEMO)/handler/h_whois.c \
|
||||
$(BACNET_DEMO)/handler/h_wp.c \
|
||||
$(BACNET_DEMO)/handler/noserv.c \
|
||||
$(BACNET_DEMO)/handler/s_iam.c \
|
||||
$(BACNET_DEMO)/handler/s_ihave.c \
|
||||
$(BACNET_DEMO)/handler/txbuf.c
|
||||
BASIC_SRC = \
|
||||
$(BACNET_BASIC)/service/h_dcc.c \
|
||||
$(BACNET_BASIC)/service/h_apdu.c \
|
||||
$(BACNET_BASIC)/service/h_npdu.c \
|
||||
$(BACNET_BASIC)/service/h_rd.c \
|
||||
$(BACNET_BASIC)/service/h_rp.c \
|
||||
$(BACNET_BASIC)/service/h_rpm.c \
|
||||
$(BACNET_BASIC)/service/h_whohas.c \
|
||||
$(BACNET_BASIC)/service/h_whois.c \
|
||||
$(BACNET_BASIC)/service/h_wp.c \
|
||||
$(BACNET_BASIC)/service/h_noserv.c \
|
||||
$(BACNET_BASIC)/service/s_iam.c \
|
||||
$(BACNET_BASIC)/service/s_ihave.c \
|
||||
$(BACNET_BASIC)/tsm/tsm.c \
|
||||
$(BACNET_BASIC)/sys/ringbuf.c \
|
||||
$(BACNET_BASIC)/sys/fifo.c
|
||||
|
||||
BACNET_SRC = \
|
||||
$(BACNET_CORE)/abort.c \
|
||||
$(BACNET_CORE)/apdu.c \
|
||||
$(BACNET_CORE)/bacaddr.c \
|
||||
$(BACNET_CORE)/bacapp.c \
|
||||
$(BACNET_CORE)/bacdcode.c \
|
||||
@@ -59,9 +56,8 @@ BACNET_SRC = \
|
||||
$(BACNET_CORE)/bacint.c \
|
||||
$(BACNET_CORE)/bacreal.c \
|
||||
$(BACNET_CORE)/bacstr.c \
|
||||
$(BACNET_CORE)/crc.c \
|
||||
$(BACNET_BASIC)/datalink/crc.c \
|
||||
$(BACNET_CORE)/dcc.c \
|
||||
$(BACNET_CORE)/fifo.c \
|
||||
$(BACNET_CORE)/iam.c \
|
||||
$(BACNET_CORE)/ihave.c \
|
||||
$(BACNET_CORE)/lighting.c \
|
||||
@@ -70,7 +66,6 @@ BACNET_SRC = \
|
||||
$(BACNET_CORE)/proplist.c \
|
||||
$(BACNET_CORE)/rd.c \
|
||||
$(BACNET_CORE)/reject.c \
|
||||
$(BACNET_CORE)/ringbuf.c \
|
||||
$(BACNET_CORE)/rp.c \
|
||||
$(BACNET_CORE)/rpm.c \
|
||||
$(BACNET_CORE)/whohas.c \
|
||||
@@ -104,7 +99,7 @@ STM32_SRC = \
|
||||
$(LIBRARY_STM32)/syscalls.c
|
||||
|
||||
CSRC = $(PLATFORM_SRC)
|
||||
CSRC += $(DEMO_SRC)
|
||||
CSRC += $(BASIC_SRC)
|
||||
CSRC += $(BACNET_SRC)
|
||||
CSRC += $(STM32_SRC)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user