EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

improve how calcout support is built depending on EPICS version

Browse Source
This commit is contained in:
zimoch
2018-05-23 17:51:31 +02:00
parent 1302db017b
commit f09a304204
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/CONFIG_STREAM
View File

@ -9,9 +9,12 @@ RECORDTYPES += mbboDirect mbbiDirect
RECORDTYPES += longout longin RECORDTYPES += longout longin
RECORDTYPES += stringout stringin RECORDTYPES += stringout stringin
RECORDTYPES += waveform RECORDTYPES += waveform
RECORDTYPES += calcout
RECORDTYPES += aai aao RECORDTYPES += aai aao
ifdef BASE_3_14
RECORDTYPES += calcout
endif
# Do you have synApps and want support for scalcout? # Do you have synApps and want support for scalcout?
# Then define CALC or SYNAPPS in your RELEASE file # Then define CALC or SYNAPPS in your RELEASE file
# pointing to the 'calc' module of synApps. # pointing to the 'calc' module of synApps.

3
src/Makefile.Host
View File

@ -35,6 +35,5 @@ SCRIPTS = munch.pl
include $(EPICS_BASE)/config/RULES.Host include $(EPICS_BASE)/config/RULES.Host
# create stream.dbd from all RECORDTYPES # create stream.dbd from all RECORDTYPES
# In 3.13, calcout has no device support
stream.dbd: ../CONFIG_STREAM stream.dbd: ../CONFIG_STREAM
$(PERL) ../makedbd.pl -3.13 $(filter-out calcout,$(RECORDTYPES)) > $@ $(PERL) ../makedbd.pl -3.13 $(RECORDTYPES) > $@

3
src/Makefile.Vx
View File

@ -29,8 +29,7 @@ SRCS.cc += $(patsubst %,../%,$(filter %.cc,$(STREAM_SRCS)))
SRCS.cc += $(BUSSES:%=../%Interface.cc) SRCS.cc += $(BUSSES:%=../%Interface.cc)
SRCS.cc += $(FORMATS:%=../%Converter.cc) SRCS.cc += $(FORMATS:%=../%Converter.cc)
SRCS.c += $(patsubst %,../%,$(filter %.c,$(STREAM_SRCS))) SRCS.c += $(patsubst %,../%,$(filter %.c,$(STREAM_SRCS)))
# In 3.13, calcout has no device support SRCS.c += $(patsubst %,../dev%Stream.c,$(RECORDTYPES)))
SRCS.c += $(patsubst %,../dev%Stream.c,$(filter-out calcout,$(RECORDTYPES)))
LIBOBJS = $(patsubst ../%,%.o,$(basename $(SRCS.cc) $(SRCS.c))) LIBOBJS = $(patsubst ../%,%.o,$(basename $(SRCS.cc) $(SRCS.c)))