now it compiles
This commit is contained in:
@@ -1 +1,2 @@
|
||||
pvAccessApp/client/pvAccess.h
|
||||
pvAccessApp/client/pvAccess.h
|
||||
pvAccessApp/client/ChannelAccessFactory.cpp
|
||||
|
||||
@@ -2,5 +2,7 @@
|
||||
|
||||
include $(CONFIG)/RULES
|
||||
|
||||
USR_INCLUDES += -I$(PVDATA_HOME)/include
|
||||
|
||||
# Library should be rebuilt because LIBOBJS may have changed.
|
||||
$(LIBNAME): ../Makefile
|
||||
|
||||
24
pvAccessApp/client/ChannelAccessFactory.cpp
Normal file
24
pvAccessApp/client/ChannelAccessFactory.cpp
Normal file
@@ -0,0 +1,24 @@
|
||||
/*ChannelAccessFactory.cpp*/
|
||||
|
||||
#include <lock.h>
|
||||
#include "pvAccess.h"
|
||||
#include "pvData.h"
|
||||
#include "factory.h"
|
||||
|
||||
namespace epics { namespace pvAccess {
|
||||
|
||||
static ChannelAccess* channelAccess = 0;
|
||||
|
||||
|
||||
ChannelAccess * getChannelAccess() {
|
||||
static Mutex mutex = Mutex();
|
||||
Lock guard(&mutex);
|
||||
|
||||
if(channelAccess==0){
|
||||
//channelAccess = new ChannelAccessImpl();
|
||||
}
|
||||
return channelAccess;
|
||||
}
|
||||
|
||||
}}
|
||||
|
||||
@@ -4,6 +4,13 @@ include $(TOP)/configure/CONFIG
|
||||
|
||||
INC += pvAccess.h
|
||||
|
||||
LIBSRCS += ChannelAccessFactory.cpp
|
||||
|
||||
LIBRARY=pvAccessClient
|
||||
|
||||
pvAccessClient_LIBS += pvMisc
|
||||
pvMisc_DIR = $(PVDATA_HOME)/lib/$(EPICS_HOST_ARCH)
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
#----------------------------------------
|
||||
# ADD RULES AFTER THIS LINE
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user