Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
PolyORB-HI-C
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
6
Issues
6
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TASTE
PolyORB-HI-C
Commits
b2838051
Commit
b2838051
authored
Jul 11, 2018
by
yoogx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Only define Linux_DLL platform, instead of 32/64 bits
variants. For openaadl/ocarina#162
parent
25143275
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
37 deletions
+4
-37
share/make/Makefile.am
share/make/Makefile.am
+2
-4
share/make/Makefile.linux64_dll
share/make/Makefile.linux64_dll
+0
-31
share/make/Makefile.linux_dll
share/make/Makefile.linux_dll
+2
-2
No files found.
share/make/Makefile.am
View file @
b2838051
...
...
@@ -4,12 +4,10 @@ EXTRA_DIST=$(builddir)/Makefile.common $(srcdir)/Makefile.leon3-xm3 \
$(srcdir)
/Makefile.leon.rtems
\
$(srcdir)
/Makefile.leon.rtems_posix
\
$(srcdir)
/Makefile.compcert
$(srcdir)
/Makefile.bench
\
$(srcdir)
/Makefile.linux32
\
$(srcdir)
/Makefile.linux32_dll
\
$(srcdir)
/Makefile.linux32
$(srcdir)
/Makefile.linux_dll
\
$(srcdir)
/Makefile.linux32-xenomai-native
\
$(srcdir)
/Makefile.linux32-xenomai-posix
\
$(srcdir)
/Makefile.linux64
\
$(srcdir)
/Makefile.linux64_dll
$(srcdir)
/Makefile.win32
\
$(srcdir)
/Makefile.linux64
$(srcdir)
/Makefile.win32
\
$(srcdir)
/Makefile.x86.linuxtaste
\
$(srcdir)
/Makefile.template
$(srcdir)
/Makefile.freertos
\
$(srcdir)
/Makefile.air
...
...
share/make/Makefile.linux64_dll
deleted
100644 → 0
View file @
25143275
# The goal of this target is to generate a DLL from a PolyORB-HI/C
# instead of a regular binary
POHI_CFLAGS
=
-DDLL
-fPIC
\
-DPOSIX
-m64
-D_POSIX_SOURCE
-D_GNU_SOURCE
\
$(GCC_GENERIC_FLAGS)
TARGET_LDFLAGS
=
-fPIC
-pie
-shared
\
-lpthread
-lrt
-m64
-L
$(RUNTIME_PATH)
/libs/linux64/
\
-lm
EXEEXT
=
.so
SIMULINK_LDFLAGS
=
-lm
CC
=
gcc
LD
=
gcc
GPROF
=
gprof
USE_USB_BRICK
=
$(
shell
grep
__PO_HI_NEED_DRIVER_SPACEWIRE_USB_BRICK deployment.h 2>/dev/null|wc
-l
)
ifdef
USE_GPROF
TARGET_LDFLAGS
+=
-pg
endif
ifeq
($(USE_USB_BRICK),1)
TARGET_LDFLAGS
+=
-lSpaceWireUSBAPI
-lConfigLibraryUSB
endif
target-clean
:
target-objects
:
share/make/Makefile.linux
32
_dll
→
share/make/Makefile.linux_dll
View file @
b2838051
...
...
@@ -2,11 +2,11 @@
# instead of a regular binary
POHI_CFLAGS
=
-DDLL
-fPIC
\
-DPOSIX
-
m32
-
D_POSIX_SOURCE
-D_GNU_SOURCE
\
-DPOSIX
-D_POSIX_SOURCE
-D_GNU_SOURCE
\
$(GCC_GENERIC_FLAGS)
TARGET_LDFLAGS
=
-fPIC
-pie
-shared
\
-lpthread
-lrt
-
m32
-
L
$(RUNTIME_PATH)
/libs/linux32/
\
-lpthread
-lrt
-L
$(RUNTIME_PATH)
/libs/linux32/
\
-lm
EXEEXT
=
.so
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment