diff options
| author | Dr. David Alan Gilbert <dave@treblig.org> | 2016-12-28 18:42:03 +0000 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dave@treblig.org> | 2018-02-25 02:08:49 +0000 |
| commit | 80e4e298d5bfae66bc9895dd5d902e57fe760d81 (patch) | |
| tree | 2623e4e566235c6059bdc2a2d73f2a1a6296f534 /Makefile.mingw | |
| parent | ca2f214e252b2aa176a59b8b7e3f1b52e8df445e (diff) | |
| download | purple-matrix-80e4e298d5bfae66bc9895dd5d902e57fe760d81.tar.gz | |
e2e: Link with libolm
Windows build not tested.
Note that libolm doesn't currently have the pkgconf magic.
Compile with make -DMATRIX_NO_E2E to disable olm linking
and e2e in general.
Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
Diffstat (limited to 'Makefile.mingw')
| -rw-r--r-- | Makefile.mingw | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile.mingw b/Makefile.mingw index 1745354..33170c7 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -12,6 +12,13 @@ CFLAGS += -I$(PIDGIN_TREE_TOP)/libpurple -I$(JSON_GLIB_TOP)/include/json-glib-1. LDLIBS += -L$(PIDGIN_TREE_TOP)/libpurple -lpurple -L$(JSON_GLIB_TOP)/lib -ljson-glib-1.0 -L$(GLIB_TOP)/bin -lglib-2.0-0 -lgobject-2.0-0 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 +endif + + PLUGIN_DIR_PURPLE = "C:\Program Files (x86)\Pidgin\plugins" DATA_ROOT_DIR_PURPLE = "C:\Program Files (x86)\Pidgin" |