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
376ea6e2
Commit
376ea6e2
authored
9 years ago
by
rivers
Browse files
Options
Downloads
Patches
Plain Diff
Add support for areaDetector and devIocStats on Windows
parent
45e935c6
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
+20
-2
20 additions, 2 deletions
xxxApp/src/Makefile
with
20 additions
and
2 deletions
xxxApp/src/Makefile
+
20
−
2
View file @
376ea6e2
...
...
@@ -131,10 +131,8 @@ ifdef STREAM
endif
ifdef
DEVIOCSTATS
ifneq
($(OS_CLASS), WIN32)
xxx_Common_DBD
+=
devIocStats.dbd iocAdmin.dbd
xxx_Common_LIBS
:=
devIocStats
$(
xxx_Common_LIBS
)
endif
endif
ifdef
ETHERIP
...
...
@@ -184,6 +182,16 @@ ifeq (win32-x86,$(findstring win32-x86, $(T_A)))
xxx_SYS_LIBS_WIN32
+=
setupapi
endif
ifdef
AREA_DETECTOR
# areaDetector provides a Makefile for things it needs and supplies
PROD_NAME
=
AD
-include
$(ADCORE)/ADApp/commonDriverMakefile
iocxxxWin32_DBD
+=
ADSupport.dbd NDPluginSupport.dbd
xxx_LIBS_WIN32
+=
$(
AD_LIBS
)
# To add the simDetector uncomment the following lines
iocxxxLinux_DBD
+=
simDetectorSupport.dbd
xxx_LIBS_WIN32
+=
simDetector
endif
endif
ifeq
(windows-x64,$(findstring windows-x64, $(T_A)))
...
...
@@ -198,6 +206,16 @@ ifeq (windows-x64,$(findstring windows-x64, $(T_A)))
xxx_LIBS_WIN32
+=
wpcap Packet
endif
ifdef
AREA_DETECTOR
# areaDetector provides a Makefile for things it needs and supplies
PROD_NAME
=
AD
-include
$(ADCORE)/ADApp/commonDriverMakefile
iocxxxWin64_DBD
+=
ADSupport.dbd NDPluginSupport.dbd
xxx_LIBS_WIN32
+=
$(
AD_LIBS
)
# To add the simDetector uncomment the following lines
iocxxxLinux_DBD
+=
simDetectorSupport.dbd
xxx_LIBS_WIN32
+=
simDetector
endif
endif
ifeq
($(EPICS_HOST_ARCH), cygwin-x86)
...
...
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