Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

e2e: Link with libgcrypt #84

Merged
merged 1 commit into from
Sep 27, 2018
Merged

e2e: Link with libgcrypt #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions Makefile.mingw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down