timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support building as a static library

Browse source 
Signed-off-by: Andreas Zwinkau <qznc@web.de>
This commit is contained in:
Andreas Zwinkau 2017-03-16 20:20:16 +01:00 committed by Richard van der Hoff
parent 793cec0268
commit b0a010b153
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -12,8 +12,10 @@ CC = gcc
EMCC = emcc EMCC = emcc
AFL_CC = afl-gcc AFL_CC = afl-gcc
AFL_CXX = afl-g++ AFL_CXX = afl-g++
AR = ar
RELEASE_TARGET := $(BUILD_DIR)/libolm.so.$(VERSION) RELEASE_TARGET := $(BUILD_DIR)/libolm.so.$(VERSION)
STATIC_RELEASE_TARGET := $(BUILD_DIR)/libolm.a
DEBUG_TARGET := $(BUILD_DIR)/libolm_debug.so.$(VERSION) DEBUG_TARGET := $(BUILD_DIR)/libolm_debug.so.$(VERSION)
JS_TARGET := javascript/olm.js JS_TARGET := javascript/olm.js
@ -120,6 +122,12 @@ $(DEBUG_TARGET): $(DEBUG_OBJECTS)
$(OUTPUT_OPTION) $(DEBUG_OBJECTS) $(OUTPUT_OPTION) $(DEBUG_OBJECTS)
ln -sf libolm_debug.so.$(VERSION) $(BUILD_DIR)/libolm_debug.so.$(MAJOR) ln -sf libolm_debug.so.$(VERSION) $(BUILD_DIR)/libolm_debug.so.$(MAJOR)
static: $(STATIC_RELEASE_TARGET)
.PHONY: static
$(STATIC_RELEASE_TARGET): $(RELEASE_OBJECTS)
$(AR) rcs $@ $^
js: $(JS_TARGET) js: $(JS_TARGET)
.PHONY: js .PHONY: js

6
README.rst
View file

@ -46,6 +46,12 @@ To build the Xcode workspace for Objective-C bindings, run:
pod install pod install
open OLMKit.xcworkspace open OLMKit.xcworkspace
To build olm as a static library (which still needs libstdc++ dynamically) run:
.. code:: bash
make static
Release process Release process
--------------- ---------------