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
aae064a4
Commit
aae064a4
authored
11 years ago
by
rivers
Browse files
Options
Downloads
Patches
Plain Diff
Fixed several problems on WIN32
parent
5b73a3ab
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
+6
-5
6 additions, 5 deletions
xxxApp/src/Makefile
with
6 additions
and
5 deletions
xxxApp/src/Makefile
+
6
−
5
View file @
aae064a4
...
...
@@ -115,8 +115,10 @@ ifdef STREAM
xxx_Common_LIBS
+=
stream streamSynApps
endif
ifdef
DEVIOCSTATS
ifneq
($(OS_CLASS), WIN32)
xxx_Common_DBD
+=
devIocStats.dbd iocAdmin.dbd
xxx_Common_LIBS
+=
devIocStats
endif
endif
xxx_Common_LIBS
+=
$(
EPICS_BASE_IOC_LIBS
)
...
...
@@ -133,13 +135,12 @@ ifeq (win32-x86,$(findstring win32-x86, $(T_A)))
# Canberra network support uncomment the following lines
#iocxxxWin32_DBD += mcaCanberraSupport.dbd
#xxx_LIBS_WIN32 += mcaCanberra
#xxx_
SYS_
LIBS_WIN32 +=
net pcap
#xxx_LIBS_WIN32 +=
wpcap Packet
endif
ifdef
DXP
# If you want to build parallel port or USB interfaces to Saturn and/or
# xMAP DXP,
then
uncomment
the
following
lines
# xMAP DXP, then uncomment the following lines
iocxxxWin32_DBD
+=
dxpSupport.dbd
xxx_LIBS_WIN32
+=
dxp handel
xxx_LIBS_WIN32
+=
DLPORTIO PlxApi
...
...
@@ -156,8 +157,8 @@ ifeq (windows-x64,$(findstring windows-x64, $(T_A)))
# If your host supports libpcap and libnet and you want to build Canberra network
# support uncomment the following line
iocxxxWin64_DBD
+=
mcaCanberraSupport.dbd
xxx_LIBS_WIN
64
+=
mcaCanberra
xxx_
SYS_
LIBS_WIN
64
+=
net pcap
xxx_LIBS_WIN
32
+=
mcaCanberra
xxx_LIBS_WIN
32
+=
wpcap Packet
endif
endif
...
...
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