Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matrix-org
Olm
Commits
c09aa77c
Commit
c09aa77c
authored
Sep 05, 2016
by
Richard van der Hoff
Browse files
Avoid ldconfig in the Makefile
... because OSX doesn't support it.
parent
057ab15c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
c09aa77c
...
...
@@ -14,6 +14,7 @@ CC = gcc
EMCC
=
emcc
AFL_CC
=
afl-gcc
AFL_CXX
=
afl-g++
RELEASE_TARGET
:=
$(BUILD_DIR)
/libolm.so.
$(VERSION)
DEBUG_TARGET
:=
$(BUILD_DIR)
/libolm_debug.so.
$(VERSION)
JS_TARGET
:=
javascript/olm.js
...
...
@@ -107,7 +108,7 @@ $(RELEASE_TARGET): $(RELEASE_OBJECTS)
-Wl
,-soname,libolm.so.
$(MAJOR)
\
-Wl
,--version-script,version_script.ver
\
$(OUTPUT_OPTION)
$(RELEASE_OBJECTS)
l
dconfig
-l
$@
l
n
-sf
libolm.so.
$(VERSION)
$(BUILD_DIR)
/libolm.so.
$(MAJOR)
debug
:
$(DEBUG_TARGET)
.PHONY
:
debug
...
...
@@ -117,7 +118,7 @@ $(DEBUG_TARGET): $(DEBUG_OBJECTS)
-Wl
,-soname,libolm_debug.so.
$(MAJOR)
\
-Wl
,--version-script,version_script.ver
\
$(OUTPUT_OPTION)
$(DEBUG_OBJECTS)
l
dconfig
-l
$@
l
n
-sf
libolm_debug.so.
$(VERSION)
$(BUILD_DIR)
/libolm_debug.so.
$(MAJOR)
js
:
$(JS_TARGET)
.PHONY
:
js
...
...
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