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
ff647f44
Commit
ff647f44
authored
14 years ago
by
rivers
Browse files
Options
Downloads
Patches
Plain Diff
Greatly simplified for areaDetector by including a Makefile it provides
parent
b9a95f6e
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
+2
-30
2 additions, 30 deletions
xxxApp/src/Makefile
with
2 additions
and
30 deletions
xxxApp/src/Makefile
+
2
−
30
View file @
ff647f44
...
...
@@ -180,37 +180,9 @@ xxx_LIBS_WIN32 += $(xxx_Common_LIBS)
# For USB support on Saturn uncomment the following line
xxx_SYS_LIBS_Linux
+=
usb
# This is needed (and provided) by areaDetector on Linux and WIN32
xxx_LIBS_WIN32
+=
PvAPI ImageLib
xxx_LIBS_Linux
+=
PvAPI ImageLib
# areaDetector provides a Makefile for things it needs and supplies
include
$(AREA_DETECTOR)/ADApp/commonDriverMakefile
# This is needed by dxp on cygwin and WIN32
xxx_SYS_LIBS_cygwin32
+=
DLPORTIO PlxApi setupapi
xxx_LIBS_WIN32
+=
DLPORTIO PlxApi
xxx_SYS_LIBS_WIN32
+=
setupapi
# This is needed by saveData and asyn VXI-11 on cygwin
xxx_SYS_LIBS_cygwin32
+=
rpc
# areaDetector needs these
xxx_SYS_LIBS_solaris
+=
tiff
xxx_LIBS_solaris
+=
jpeg sz z
xxx_LIBS_solaris
+=
NeXus hdf5_cpp hdf5
# areaDetector needs (and provides) these
xxx_LIBS_WIN32
+=
libtiff jpeg libNeXus.dll
xxx_LIBS_cygwin32
+=
libtiff jpeg libNeXus.dll
# To use versions of these libraries supplied with areaDetector use this line
xxx_LIBS_Linux
+=
NeXus mfhdf
df
hdf5 mxml
# To use system versions of these libraries use this line
#xxx_SYS_LIBS_Linux += NeXus mfhdf df hdf5 mxml
# To use versions of these libraries supplied with areaDetector use this line
xxx_LIBS_Linux
+=
tiff jpeg z
# To use system versions of these libraries use this line
#xxx_SYS_LIBS_Linux += tiff jpeg z
#===========================
...
...
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