diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-09-27 11:58:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-27 11:58:41 +0100 |
| commit | f26edd53ff81b21530d06e687ae223e15a015d79 (patch) | |
| tree | 4a38c6e6c90dc1d6cab81594cc01c58ae8bc16ff | |
| parent | 086b9addb96689e41d4260e88e52676e2b20abdb (diff) | |
| parent | 89ff3ae2d0f69972697d437c3d514fea424d433c (diff) | |
| download | purple-matrix-f26edd53ff81b21530d06e687ae223e15a015d79.tar.gz | |
Merge pull request #84 from steils/master
e2e: Link with libgcrypt
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.mingw | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -10,7 +10,7 @@ LDLIBS+=$(shell $(PKG_CONFIG) --libs $(LIBS)) LDLIBS+=-lhttp_parser ifndef MATRIX_NO_E2E -LDLIBS+=-lolm +LDLIBS+=-lolm -lgcrypt endif PLUGIN_DIR_PURPLE = $(shell $(PKG_CONFIG) --variable=plugindir purple) diff --git a/Makefile.mingw b/Makefile.mingw index 33170c7..95722d9 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -14,8 +14,9 @@ LDLIBS += -L$(HTTP_PARSER_TOP) -lhttp_parser -static-libgcc ifndef MATRIX_NO_E2E OLM_TOP ?= $(WIN32_DEV_TOP)/olm -CFLAGS += -I$(OLM_TOP)/include -LDLIBS+= -L$(OLM_TOP)/build -lolm +GCRYPT_TOP ?= $(WIN32_DEV_TOP)/libgcrypt +CFLAGS += -I$(OLM_TOP)/include -I$(GCRYPT_TOP)/src +LDLIBS += -L$(OLM_TOP)/build -lolm -L$(GCRYPT_TOP)/bin -lgcrypt endif |