Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
LabComm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Anders Blomdell
LabComm
Commits
26636eec
Commit
26636eec
authored
10 years ago
by
Sven Gestegård Robertz
Browse files
Options
Downloads
Patches
Plain Diff
hacked (DY)LD_LIBRARY_PATH into os_compat.mk
parent
1790d87b
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
examples/user_types/Makefile
+9
-9
9 additions, 9 deletions
examples/user_types/Makefile
lib/c/os_compat.mk
+2
-0
2 additions, 0 deletions
lib/c/os_compat.mk
with
11 additions
and
9 deletions
examples/user_types/Makefile
+
9
−
9
View file @
26636eec
...
@@ -76,19 +76,19 @@ run:
...
@@ -76,19 +76,19 @@ run:
@
java
-cp
.:
${
LCDIR
}
/lib/java/labcomm2014.jar:
${
GENDIR
}
Decoder encoded_data_j
@
java
-cp
.:
${
LCDIR
}
/lib/java/labcomm2014.jar:
${
GENDIR
}
Decoder encoded_data_j
@echo "************ running C decoder
:
*****************"
@echo "************ running C decoder
:
*****************"
@
LD_LIBRARY_PATH
=
${
LCDIR
}
/lib/c/ ./example_decoder encoded_data_j
@
${
LD_LIBRARY_PATH
_NAME
}
=
${
LCDIR
}
/lib/c/ ./example_decoder encoded_data_j
@echo "************ running python decoder (from wiki_example)
:
"
@echo "************ running python decoder (from wiki_example)
:
"
@
PYTHONPATH
=
${
LCDIR
}
/lib/python ../wiki_example/example_decoder.py encoded_data_j LabComm2014
@
PYTHONPATH
=
${
LCDIR
}
/lib/python ../wiki_example/example_decoder.py encoded_data_j LabComm2014
@echo "************ running C encoder
:
*****************"
@echo "************ running C encoder
:
*****************"
@
LD_LIBRARY_PATH
=
${
LCDIR
}
/lib/c/ ./example_encoder encoded_data_c
@
${
LD_LIBRARY_PATH
_NAME
}
=
${
LCDIR
}
/lib/c/ ./example_encoder encoded_data_c
@echo "************ running Java decoder
:
*****************"
@echo "************ running Java decoder
:
*****************"
@
java
-cp
.:
${
LCDIR
}
/lib/java/labcomm2014.jar:
${
GENDIR
}
Decoder encoded_data_c
@
java
-cp
.:
${
LCDIR
}
/lib/java/labcomm2014.jar:
${
GENDIR
}
Decoder encoded_data_c
@echo "************ running C decoder
:
*****************"
@echo "************ running C decoder
:
*****************"
@
LD_LIBRARY_PATH
=
${
LCDIR
}
/lib/c/ ./example_decoder encoded_data_c
@
${
LD_LIBRARY_PATH
_NAME
}
=
${
LCDIR
}
/lib/c/ ./example_decoder encoded_data_c
@echo "************ running python decoder (from wiki_example)
:
"
@echo "************ running python decoder (from wiki_example)
:
"
@
PYTHONPATH
=
${
LCDIR
}
/lib/python ../wiki_example/example_decoder.py encoded_data_c LabComm2014
@
PYTHONPATH
=
${
LCDIR
}
/lib/python ../wiki_example/example_decoder.py encoded_data_c LabComm2014
...
@@ -100,7 +100,7 @@ run:
...
@@ -100,7 +100,7 @@ run:
@
java
-cp
.:
${
LCDIR
}
/lib/java/labcomm2014.jar:
${
GENDIR
}
Decoder encoded_data_p
@
java
-cp
.:
${
LCDIR
}
/lib/java/labcomm2014.jar:
${
GENDIR
}
Decoder encoded_data_p
@echo "************ running C decoder
:
*****************"
@echo "************ running C decoder
:
*****************"
@
LD_LIBRARY_PATH
=
${
LCDIR
}
/lib/c/ ./example_decoder encoded_data_p
@
${
LD_LIBRARY_PATH
_NAME
}
=
${
LCDIR
}
/lib/c/ ./example_decoder encoded_data_p
@echo "************ running python decoder (from wiki_example)
:
"
@echo "************ running python decoder (from wiki_example)
:
"
PYTHONPATH
=
${
LCDIR
}
/lib/python ../wiki_example/example_decoder.py encoded_data_p LabComm2014
PYTHONPATH
=
${
LCDIR
}
/lib/python ../wiki_example/example_decoder.py encoded_data_p LabComm2014
...
@@ -118,22 +118,22 @@ runwcs: build ExampleEncoder.exe ExampleDecoder.exe
...
@@ -118,22 +118,22 @@ runwcs: build ExampleEncoder.exe ExampleDecoder.exe
@
java
-cp
.:
${
LCDIR
}
/lib/java/labcomm2014.jar:
${
GENDIR
}
Decoder encoded_data_j
@
java
-cp
.:
${
LCDIR
}
/lib/java/labcomm2014.jar:
${
GENDIR
}
Decoder encoded_data_j
@echo "************ running C decoder
:
*****************"
@echo "************ running C decoder
:
*****************"
@
LD_LIBRARY_PATH
=
${
LCDIR
}
/lib/c/ ./example_decoder encoded_data_j
@
${
LD_LIBRARY_PATH
_NAME
}
=
${
LCDIR
}
/lib/c/ ./example_decoder encoded_data_j
@echo "************ running python decoder (from wiki_example)
:
"
@echo "************ running python decoder (from wiki_example)
:
"
@
PYTHONPATH
=
${
LCDIR
}
/lib/python ../wiki_example/example_decoder.py encoded_data_j LabComm2014
@
PYTHONPATH
=
${
LCDIR
}
/lib/python ../wiki_example/example_decoder.py encoded_data_j LabComm2014
@echo "************ running C# decoder
:
*****************"
@echo "************ running C# decoder
:
*****************"
@
LD_LIBRARY_PATH
=
${
LCDIR
}
/lib/c/ mono ./ExampleDecoder.exe encoded_data_j
@
${
LD_LIBRARY_PATH
_NAME
}
=
${
LCDIR
}
/lib/c/ mono ./ExampleDecoder.exe encoded_data_j
@echo "************ running C encoder
:
*****************"
@echo "************ running C encoder
:
*****************"
@
LD_LIBRARY_PATH
=
${
LCDIR
}
/lib/c/ ./example_encoder encoded_data_c
@
${
LD_LIBRARY_PATH
_NAME
}
=
${
LCDIR
}
/lib/c/ ./example_encoder encoded_data_c
@echo "************ running Java decoder
:
*****************"
@echo "************ running Java decoder
:
*****************"
@
java
-cp
.:
${
LCDIR
}
/lib/java/labcomm2014.jar:
${
GENDIR
}
Decoder encoded_data_c
@
java
-cp
.:
${
LCDIR
}
/lib/java/labcomm2014.jar:
${
GENDIR
}
Decoder encoded_data_c
@echo "************ running C decoder
:
*****************"
@echo "************ running C decoder
:
*****************"
@
LD_LIBRARY_PATH
=
${
LCDIR
}
/lib/c/ ./example_decoder encoded_data_c
@
${
LD_LIBRARY_PATH
_NAME
}
=
${
LCDIR
}
/lib/c/ ./example_decoder encoded_data_c
@echo "************ running python decoder (from wiki_example)
:
"
@echo "************ running python decoder (from wiki_example)
:
"
@
PYTHONPATH
=
${
LCDIR
}
/lib/python ../wiki_example/example_decoder.py encoded_data_c LabComm2014
@
PYTHONPATH
=
${
LCDIR
}
/lib/python ../wiki_example/example_decoder.py encoded_data_c LabComm2014
...
@@ -148,7 +148,7 @@ runwcs: build ExampleEncoder.exe ExampleDecoder.exe
...
@@ -148,7 +148,7 @@ runwcs: build ExampleEncoder.exe ExampleDecoder.exe
@
java
-cp
.:
${
LCDIR
}
/lib/java/labcomm2014.jar:
${
GENDIR
}
Decoder encoded_data_p
@
java
-cp
.:
${
LCDIR
}
/lib/java/labcomm2014.jar:
${
GENDIR
}
Decoder encoded_data_p
@echo "************ running C decoder
:
*****************"
@echo "************ running C decoder
:
*****************"
@
LD_LIBRARY_PATH
=
${
LCDIR
}
/lib/c/ ./example_decoder encoded_data_p
@
${
LD_LIBRARY_PATH
_NAME
}
=
${
LCDIR
}
/lib/c/ ./example_decoder encoded_data_p
@echo "************ running C# decoder
:
*****************"
@echo "************ running C# decoder
:
*****************"
@
mono ./ExampleDecoder.exe encoded_data_p
@
mono ./ExampleDecoder.exe encoded_data_p
...
...
This diff is collapsed.
Click to expand it.
lib/c/os_compat.mk
+
2
−
0
View file @
26636eec
...
@@ -10,6 +10,7 @@ ifeq ($(UNAME_S),Linux)
...
@@ -10,6 +10,7 @@ ifeq ($(UNAME_S),Linux)
CFLAGS_TEST
=
$(
CFLAGS
)
-Itest
CFLAGS_TEST
=
$(
CFLAGS
)
-Itest
LDFLAGS
=
-L
..
LDFLAGS
=
-L
..
LDLIBS
=
-llabcomm
$(
LIBVERSION
)
-lrt
LDLIBS
=
-llabcomm
$(
LIBVERSION
)
-lrt
LD_LIBRARY_PATH_NAME
=
LD_LIBRARY_PATH
MAKESHARED
=
gcc
-o
$1
-shared
-Wl
,-soname,
$2
$3
-lc
-lrt
MAKESHARED
=
gcc
-o
$1
-shared
-Wl
,-soname,
$2
$3
-lc
-lrt
else
ifeq
($(UNAME_S),Darwin)
else
ifeq
($(UNAME_S),Darwin)
#CC=$(CROSS_COMPILE)clang
#CC=$(CROSS_COMPILE)clang
...
@@ -24,6 +25,7 @@ else ifeq ($(UNAME_S),Darwin)
...
@@ -24,6 +25,7 @@ else ifeq ($(UNAME_S),Darwin)
CFLAGS
+=
-std
=
c99
CFLAGS
+=
-std
=
c99
LDFLAGS
=
-L
..
LDFLAGS
=
-L
..
LDLIBS
=
-llabcomm
$(
LIBVERSION
)
LDLIBS
=
-llabcomm
$(
LIBVERSION
)
LD_LIBRARY_PATH_NAME
=
DYLD_LIBRARY_PATH
MAKESHARED
=
clang
-o
$1
-shared
-Wl
,-install_name,
$2
$3
-lc
MAKESHARED
=
clang
-o
$1
-shared
-Wl
,-install_name,
$2
$3
-lc
else
ifneq
($(findstring CYGWIN,$(UNAME_S)),)
else
ifneq
($(findstring CYGWIN,$(UNAME_S)),)
CC
=
$(
CROSS_COMPILE
)
gcc
CC
=
$(
CROSS_COMPILE
)
gcc
...
...
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