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
72df5301
Commit
72df5301
authored
Sep 30, 2019
by
David Baker
Browse files
Build the js objects without PIC
This confuses emscripten now
parent
57b6839c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
72df5301
...
...
@@ -81,10 +81,13 @@ CPPFLAGS += -Iinclude -Ilib \
-DOLMLIB_VERSION_PATCH
=
$(PATCH)
# we rely on <stdint.h>, which was introduced in C99
CFLAGS
+=
-Wall
-Werror
-std
=
c99
-fPIC
CXXFLAGS
+=
-Wall
-Werror
-std
=
c++11
-fPIC
CFLAGS
+=
-Wall
-Werror
-std
=
c99
CXXFLAGS
+=
-Wall
-Werror
-std
=
c++11
LDFLAGS
+=
-Wall
-Werror
CFLAGS_NATIVE
=
-fPIC
CXXFLAGS_NATIVE
=
-fPIC
EMCCFLAGS
=
--closure
1
--memory-init-file
0
-s
NO_FILESYSTEM
=
1
-s
INVOKE_RUN
=
0
-s
MODULARIZE
=
1
# Olm generally doesn't need a lot of memory to encrypt / decrypt its usual
...
...
@@ -113,12 +116,12 @@ CPPFLAGS += -MMD
### per-target variables
$(RELEASE_OBJECTS)
:
CFLAGS += $(RELEASE_OPTIMIZE_FLAGS)
$(RELEASE_OBJECTS)
:
CXXFLAGS += $(RELEASE_OPTIMIZE_FLAGS)
$(RELEASE_OBJECTS)
:
CFLAGS += $(RELEASE_OPTIMIZE_FLAGS)
$(CFLAGS_NATIVE)
$(RELEASE_OBJECTS)
:
CXXFLAGS += $(RELEASE_OPTIMIZE_FLAGS)
$(CXXFLAGS_NATIVE)
$(RELEASE_TARGET)
:
LDFLAGS += $(RELEASE_OPTIMIZE_FLAGS)
$(DEBUG_OBJECTS)
:
CFLAGS += $(DEBUG_OPTIMIZE_FLAGS)
$(DEBUG_OBJECTS)
:
CXXFLAGS += $(DEBUG_OPTIMIZE_FLAGS)
$(DEBUG_OBJECTS)
:
CFLAGS += $(DEBUG_OPTIMIZE_FLAGS)
$(CFLAGS_NATIVE)
$(DEBUG_OBJECTS)
:
CXXFLAGS += $(DEBUG_OPTIMIZE_FLAGS)
$(CXXFLAGS_NATIVE)
$(DEBUG_TARGET)
:
LDFLAGS += $(DEBUG_OPTIMIZE_FLAGS)
$(TEST_BINARIES)
:
CPPFLAGS += -Itests/include
...
...
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