aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Strogin <stefan.strogin@gmail.com>2018-09-08 03:28:29 +0300
committerStefan Strogin <stefan.strogin@gmail.com>2018-09-08 03:49:19 +0300
commit89ff3ae2d0f69972697d437c3d514fea424d433c (patch)
treeae3a1095f6ef84586af5e6c23ba49fb7f843cf68
parent5a7166a3f54f85793c6b60662f8d12196aeaaeb0 (diff)
downloadpurple-matrix-89ff3ae2d0f69972697d437c3d514fea424d433c.tar.gz
e2e: Link with libgcrypt
Link with libgcrypt when e2e is enabled. Build for Windows is not tested. Fixes #83
-rw-r--r--Makefile2
-rw-r--r--Makefile.mingw5
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f914496..b9716cd 100644
--- a/Makefile
+++ b/Makefile
@@ -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