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
9c265edb
Commit
9c265edb
authored
13 years ago
by
Ron Sluiter
Browse files
Options
Downloads
Patches
Plain Diff
- Add support for darwin-x86 target.
- Fix typo on line #133. - Ignore commonDriverMakefile if not found.
parent
5a761f32
No related branches found
Branches containing commit
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
+8
-2
8 additions, 2 deletions
xxxApp/src/Makefile
with
8 additions
and
2 deletions
xxxApp/src/Makefile
+
8
−
2
View file @
9c265edb
...
...
@@ -122,6 +122,10 @@ ifeq ($(OS_CLASS), solaris)
iocxxx_solaris_DBD
+=
xxxCommonInclude.dbd
endif
ifeq
($(OS_CLASS), Darwin)
DBD
+=
iocxxxDarwin.dbd
iocxxxDarwin_DBD
+=
xxxCommonInclude.dbd
endif
...
...
@@ -130,7 +134,8 @@ xxx_SRCS_vxWorks += iocxxxVX_registerRecordDeviceDriver.cpp
xxx_SRCS_Linux
+=
iocxxxLinux_registerRecordDeviceDriver.cpp xxxMain.cpp
xxx_SRCS_WIN32
+=
iocxxxWin32_registerRecordDeviceDriver.cpp xxxMain.cpp
xxx_SRCS_cygwin32
+=
iocxxxCygwin_registerRecordDeviceDriver.cpp xxxMain.cpp
xxx_SRCS_solaris
+=
iocxxx_solaris_registerRecordDeviceDriver.cppa xxxMain.cpp
xxx_SRCS_solaris
+=
iocxxx_solaris_registerRecordDeviceDriver.cpp xxxMain.cpp
xxx_SRCS_Darwin
+=
iocxxxDarwin_registerRecordDeviceDriver.cpp xxxMain.cpp
xxx_Common_LIBS
+=
mca
xxx_Common_LIBS
+=
calc
...
...
@@ -176,6 +181,7 @@ xxx_LIBS_Linux += $(xxx_Common_LIBS)
xxx_LIBS_solaris
+=
$(
xxx_Common_LIBS
)
xxx_LIBS_cygwin32
+=
$(
xxx_Common_LIBS
)
xxx_LIBS_WIN32
+=
$(
xxx_Common_LIBS
)
xxx_LIBS_Darwin
+=
$(
xxx_Common_LIBS
)
# If the host has libnet and libpcap for mca/Canberra support
# uncomment the following line.
...
...
@@ -185,7 +191,7 @@ xxx_LIBS_WIN32 += $(xxx_Common_LIBS)
xxx_SYS_LIBS_Linux
+=
usb
# areaDetector provides a Makefile for things it needs and supplies
include
$(AREA_DETECTOR)/ADApp/commonDriverMakefile
-
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