merge feature/changesAfter3_0_2; resolve conflicts
This commit is contained in:
@@ -3,22 +3,27 @@ TOP=../..
|
||||
include $(TOP)/configure/CONFIG
|
||||
#----------------------------------------
|
||||
# ADD MACRO DEFINITIONS AFTER THIS LINE
|
||||
#=============================
|
||||
|
||||
#==================================================
|
||||
# Build an IOC support library
|
||||
#
|
||||
|
||||
#=============================
|
||||
# build an ioc application
|
||||
|
||||
|
||||
DBD += exampleLink.dbd
|
||||
|
||||
exampleLink_DBD += base.dbd
|
||||
exampleLink_DBD += PVAServerRegister.dbd
|
||||
exampleLink_DBD += PVAClientRegister.dbd
|
||||
exampleLink_DBD += registerChannelProviderLocal.dbd
|
||||
exampleLink_DBD += exampleLinkRegister.dbd
|
||||
|
||||
PROD_IOC += exampleLink
|
||||
|
||||
|
||||
# <name>_registerRecordDeviceDriver.cpp will be created from <name>.dbd
|
||||
exampleLink_SRCS += exampleLink_registerRecordDeviceDriver.cpp
|
||||
exampleLink_SRCS_DEFAULT += exampleLinkMain.cpp
|
||||
exampleLink_SRCS_vxWorks += -nil-
|
||||
|
||||
|
||||
# The following adds support from base/src/vxWorks
|
||||
exampleLink_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
|
||||
|
||||
@@ -27,6 +32,7 @@ exampleLink_LIBS += pvDatabase
|
||||
exampleLink_LIBS += pvaSrv
|
||||
exampleLink_LIBS += pvAccess
|
||||
exampleLink_LIBS += pvData
|
||||
exampleLink_LIBS += Com
|
||||
exampleLink_LIBS += $(EPICS_BASE_IOC_LIBS)
|
||||
|
||||
#===========================
|
||||
|
||||
5
exampleLink/ioc/src/exampleLinkInclude.dbd
Normal file
5
exampleLink/ioc/src/exampleLinkInclude.dbd
Normal file
@@ -0,0 +1,5 @@
|
||||
include "base.dbd"
|
||||
include "PVAServerRegister.dbd"
|
||||
include "PVAClientRegister.dbd"
|
||||
include "registerChannelProviderLocal.dbd"
|
||||
registrar("exampleLinkRegister")
|
||||
Reference in New Issue
Block a user