- Added PI.

- Support for either IPAC R2.5 and below, or, R2.6 and above.
This commit is contained in:
Ron Sluiter
2004-02-03 20:16:49 +00:00
parent af22a808f3
commit 4d5c4e4ef7
2 changed files with 24 additions and 14 deletions
+12 -7
View File
@@ -1,7 +1,6 @@
# The WithMPF IOC can be configured either as a MPF client in a two CPU board
# configuration, or as a single CPU board with both MPF client and server on
# the same CPU board. Remove either the "# !MPF-1-CPU! #" or the
# "# !MPF-2-CPU! #" comment to configure.
# "#!" marks lines that can be uncommented.
# Choice either IPAC R2.5 and below, or, R2.6
# and above. The default is IPAC R2.6 and above.
# Makefile
TOP = ../..
@@ -20,10 +19,11 @@ WithMPF_SRCS_DEFAULT += WithMPFMain.cpp
# Support from EPICS base
WithMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
# Support from ipac
WithMPFVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib
WithMPFVx_OBJS_vxWorks += $(IPAC_BIN)/tyGSOctal
# Support from IPAC R2.5 and below.
#!WithMPFVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib
#!WithMPFVx_OBJS_vxWorks += $(IPAC_BIN)/tyGSOctal
WithMPF_LIBS += PI
WithMPF_LIBS += Acs
WithMPF_LIBS += Ims
WithMPF_LIBS += Newport
@@ -32,11 +32,16 @@ WithMPF_LIBS += motor
WithMPF_LIBS += mpfSerial mpfEpics mpf
WithMPF_LIBS += $(EPICS_BASE_IOC_LIBS)
WithMPFVx_LIBS += PI
WithMPFVx_LIBS += Acs
WithMPFVx_LIBS += Ims
WithMPFVx_LIBS += Newport
WithMPFVx_LIBS += motorCOM_mpf
WithMPFVx_LIBS += motor
# Support from IPAC R2.6 and above.
WithMPFVx_LIBS += Ipac TyGSOctal
WithMPFVx_LIBS += mpfSerial mpfEpics mpf
WithMPFVx_LIBS += $(EPICS_BASE_IOC_LIBS)
+12 -7
View File
@@ -1,7 +1,6 @@
# The WithMPF IOC can be configured either as a MPF client in a two CPU board
# configuration, or as a single CPU board with both MPF client and server on
# the same CPU board. Remove either the "# !MPF-1-CPU! #" or the
# "# !MPF-2-CPU! #" comment to configure.
# "#!" marks lines that can be uncommented.
# Choice either IPAC R2.5 and below, or, R2.6
# and above. The default is IPAC R2.6 and above.
# Makefile
TOP = ../..
@@ -20,10 +19,11 @@ WithMPF_SRCS_DEFAULT += WithMPFMain.cpp
# Support from EPICS base
WithMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
# Support from ipac
WithMPFVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib
WithMPFVx_OBJS_vxWorks += $(IPAC_BIN)/tyGSOctal
# Support from IPAC R2.5 and below.
#!WithMPFVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib
#!WithMPFVx_OBJS_vxWorks += $(IPAC_BIN)/tyGSOctal
WithMPF_LIBS += PI
WithMPF_LIBS += Acs
WithMPF_LIBS += Ims
WithMPF_LIBS += Newport
@@ -32,11 +32,16 @@ WithMPF_LIBS += motor
WithMPF_LIBS += mpfSerial mpfEpics mpf
WithMPF_LIBS += $(EPICS_BASE_IOC_LIBS)
WithMPFVx_LIBS += PI
WithMPFVx_LIBS += Acs
WithMPFVx_LIBS += Ims
WithMPFVx_LIBS += Newport
WithMPFVx_LIBS += motorCOM_mpf
WithMPFVx_LIBS += motor
# Support from IPAC R2.6 and above.
WithMPFVx_LIBS += Ipac TyGSOctal
WithMPFVx_LIBS += mpfSerial mpfEpics mpf
WithMPFVx_LIBS += $(EPICS_BASE_IOC_LIBS)