Merge pull request #84 from steils/master

e2e: Link with libgcrypt
matrix-org · Sep 27, 2018 · f26edd5 · f26edd5
2 parents 086b9ad + 89ff3ae
commit f26edd5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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