Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xxx-R6-1
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
synApps_6_1_Working
xxx-R6-1
Commits
640e8f86
Commit
640e8f86
authored
13 years ago
by
mooney
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
xxxApp/src/Makefile
+7
-4
7 additions, 4 deletions
xxxApp/src/Makefile
with
7 additions
and
4 deletions
xxxApp/src/Makefile
+
7
−
4
View file @
640e8f86
...
...
@@ -192,7 +192,7 @@ xxx_Common_LIBS += optics
xxx_Common_LIBS
+=
std
xxx_Common_LIBS
+=
ip
xxx_Common_LIBS
+=
Acs acsTech80 Aerotech Attocube Faulhaber Ims KohzuMotor Mclennan
xxx_Common_LIBS
+=
Micos MicroMo NewFocus NewportModel
2
Newport Oriel PI PIJena Parker SmartMotor
xxx_Common_LIBS
+=
Micos MicroMo NewFocus NewportModel
3
Newport Oriel PI PIJena Parker SmartMotor
xxx_Common_LIBS
+=
ThorLabs softMotor motorSimSupport motor
#xxx_Common_LIBS += simDetector NDPlugin netCDF ADBase
xxx_Common_LIBS
+=
asyn
...
...
@@ -213,7 +213,6 @@ xxx_LIBS_vxWorks += ipUnidig
xxx_LIBS_vxWorks
+=
dac128V
xxx_LIBS_vxWorks
+=
quadEM
xxx_LIBS_vxWorks
+=
camac devCamac
xxx_LIBS_vxWorks
+=
NewportModel3
ifdef
DXP
xxx_LIBS_vxWorks
+=
dxp handel
endif
...
...
@@ -240,8 +239,12 @@ xxx_LIBS_Darwin += $(xxx_Common_LIBS)
# uncomment the following line.
#xxx_SYS_LIBS_Linux += net pcap
# For USB support on Saturn uncomment the following line
xxx_SYS_LIBS_Linux
+=
usb
# For USB support on Saturn uncomment the following:
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
# -include $(AREA_DETECTOR)/ADApp/commonDriverMakefile
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment