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
4fc295bd
Commit
4fc295bd
authored
10 years ago
by
mooney
Browse files
Options
Downloads
Patches
Plain Diff
changes to build with 3.15
parent
502030cb
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
+17
-2
17 additions, 2 deletions
xxxApp/src/Makefile
with
17 additions
and
2 deletions
xxxApp/src/Makefile
+
17
−
2
View file @
4fc295bd
...
...
@@ -55,11 +55,12 @@ ifdef SNCSEQ
xxx_Common_LIBS
:=
seq
pv
$(
xxx_Common_LIBS
)
endif
endif
ifdef
AREA_DETECTOR
# areaDetector provides a Makefile for things it needs and supplies
PROD_NAME
=
xxx_Common
PROD_NAME
=
AD
-include
$(AREA_DETECTOR)/ADCore/ADApp/commonDriverMakefile
xxx_Common_DBD
+=
ADSupport.dbd NDPluginSupport.dbd
xxx_Common_LIBS
:=
$(
AD_LIBS
)
$(
xxx_Common_LIBS
)
# To add the simDetector uncomment the following lines
xxx_Common_DBD
+=
simDetectorSupport.dbd
xxx_Common_LIBS
:=
simDetector
$(
xxx_Common_LIBS
)
...
...
@@ -358,3 +359,17 @@ $(COMMON_DIR)/iocxxxCygwinInclude.dbd: $(COMMON_DIR)/xxx_Common.dbd
$(COMMON_DIR)/iocxxxVXInclude.dbd
:
$(COMMON_DIR)/xxx_Common.dbd
$(COMMON_DIR)/iocxxxLinuxInclude.dbd
:
$(COMMON_DIR)/xxx_Common.dbd
$(COMMON_DIR)/iocxxxDarwinInclude.dbd
:
$(COMMON_DIR)/xxx_Common.dbd
$(COMMON_DIR)/iocxxxWin32.dbd
:
$(COMMON_DIR)/xxx_Common.dbd
$(COMMON_DIR)/iocxxxWin64.dbd
:
$(COMMON_DIR)/xxx_Common.dbd
$(COMMON_DIR)/iocxxxCygwin.dbd
:
$(COMMON_DIR)/xxx_Common.dbd
$(COMMON_DIR)/iocxxxVX.dbd
:
$(COMMON_DIR)/xxx_Common.dbd
$(COMMON_DIR)/iocxxxLinux.dbd
:
$(COMMON_DIR)/xxx_Common.dbd
$(COMMON_DIR)/iocxxxDarwin.dbd
:
$(COMMON_DIR)/xxx_Common.dbd
iocxxxWin32.dbd$(DEP)
:
$(COMMON_DIR)/xxx_Common.dbd
iocxxxWin64.dbd$(DEP)
:
$(COMMON_DIR)/xxx_Common.dbd
iocxxxCygwin.dbd$(DEP)
:
$(COMMON_DIR)/xxx_Common.dbd
iocxxxVX.dbd$(DEP)
:
$(COMMON_DIR)/xxx_Common.dbd
iocxxxLinux.dbd$(DEP)
:
$(COMMON_DIR)/xxx_Common.dbd
iocxxxDarwin.dbd$(DEP)
:
$(COMMON_DIR)/xxx_Common.dbd
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