merge feature/changesAfter3_0_2; resolve conflicts
This commit is contained in:
@@ -3,22 +3,26 @@ TOP=../..
|
||||
include $(TOP)/configure/CONFIG
|
||||
#----------------------------------------
|
||||
# ADD MACRO DEFINITIONS AFTER THIS LINE
|
||||
#=============================
|
||||
|
||||
#==================================================
|
||||
# Build an IOC support library
|
||||
#
|
||||
|
||||
DBD += exampleServer.dbd
|
||||
|
||||
exampleServer_DBD += base.dbd
|
||||
exampleServer_DBD += PVAServerRegister.dbd
|
||||
exampleServer_DBD += registerChannelProviderLocal.dbd
|
||||
exampleServer_DBD += dbPv.dbd
|
||||
exampleServer_DBD += exampleServerRegister.dbd
|
||||
#=============================
|
||||
# build an ioc application
|
||||
|
||||
PROD_IOC += exampleServer
|
||||
|
||||
|
||||
# <name>_registerRecordDeviceDriver.cpp will be created from <name>.dbd
|
||||
exampleServer_SRCS += exampleServer_registerRecordDeviceDriver.cpp
|
||||
exampleServer_SRCS_DEFAULT += exampleServerMain.cpp
|
||||
exampleServer_SRCS_vxWorks += -nil-
|
||||
|
||||
|
||||
# The following adds support from base/src/vxWorks
|
||||
exampleServer_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
|
||||
|
||||
|
||||
5
exampleServer/ioc/src/exampleServerInclude.dbd
Normal file
5
exampleServer/ioc/src/exampleServerInclude.dbd
Normal file
@@ -0,0 +1,5 @@
|
||||
include "base.dbd"
|
||||
include "PVAServerRegister.dbd"
|
||||
include "registerChannelProviderLocal.dbd"
|
||||
include "dbPv.dbd"
|
||||
include "exampleServer.dbd"
|
||||
Reference in New Issue
Block a user