Skip to content
Snippets Groups Projects
Commit 640e8f86 authored by mooney's avatar mooney
Browse files

NewportModel3, not NewportModel2

For linux target arch, usb conditional on LINUX_USB_INSTALLED


parent 476e5dc5
No related branches found
No related tags found
No related merge requests found
...@@ -192,7 +192,7 @@ xxx_Common_LIBS += optics ...@@ -192,7 +192,7 @@ xxx_Common_LIBS += optics
xxx_Common_LIBS += std xxx_Common_LIBS += std
xxx_Common_LIBS += ip xxx_Common_LIBS += ip
xxx_Common_LIBS += Acs acsTech80 Aerotech Attocube Faulhaber Ims KohzuMotor Mclennan xxx_Common_LIBS += Acs acsTech80 Aerotech Attocube Faulhaber Ims KohzuMotor Mclennan
xxx_Common_LIBS += Micos MicroMo NewFocus NewportModel2 Newport Oriel PI PIJena Parker SmartMotor xxx_Common_LIBS += Micos MicroMo NewFocus NewportModel3 Newport Oriel PI PIJena Parker SmartMotor
xxx_Common_LIBS += ThorLabs softMotor motorSimSupport motor xxx_Common_LIBS += ThorLabs softMotor motorSimSupport motor
#xxx_Common_LIBS += simDetector NDPlugin netCDF ADBase #xxx_Common_LIBS += simDetector NDPlugin netCDF ADBase
xxx_Common_LIBS += asyn xxx_Common_LIBS += asyn
...@@ -213,7 +213,6 @@ xxx_LIBS_vxWorks += ipUnidig ...@@ -213,7 +213,6 @@ xxx_LIBS_vxWorks += ipUnidig
xxx_LIBS_vxWorks += dac128V xxx_LIBS_vxWorks += dac128V
xxx_LIBS_vxWorks += quadEM xxx_LIBS_vxWorks += quadEM
xxx_LIBS_vxWorks += camac devCamac xxx_LIBS_vxWorks += camac devCamac
xxx_LIBS_vxWorks += NewportModel3
ifdef DXP ifdef DXP
xxx_LIBS_vxWorks += dxp handel xxx_LIBS_vxWorks += dxp handel
endif endif
...@@ -240,8 +239,12 @@ xxx_LIBS_Darwin += $(xxx_Common_LIBS) ...@@ -240,8 +239,12 @@ xxx_LIBS_Darwin += $(xxx_Common_LIBS)
# uncomment the following line. # uncomment the following line.
#xxx_SYS_LIBS_Linux += net pcap #xxx_SYS_LIBS_Linux += net pcap
# For USB support on Saturn uncomment the following line # For USB support on Saturn uncomment the following:
xxx_SYS_LIBS_Linux += usb ifneq ("",$(findstring linux, $(T_A)))
ifeq ($(LINUX_USB_INSTALLED), YES)
xxx_SYS_LIBS_Linux += usb
endif
endif
# areaDetector provides a Makefile for things it needs and supplies # areaDetector provides a Makefile for things it needs and supplies
# -include $(AREA_DETECTOR)/ADApp/commonDriverMakefile # -include $(AREA_DETECTOR)/ADApp/commonDriverMakefile
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment