diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-11 21:54:04 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-05-11 21:54:04 -0700 |
| commit | 5775905727150b4f2f5556b84814acdc46e2d717 (patch) | |
| tree | 1d74c8831f4a71b9e054c4863c397bf43a9f2f2d | |
| parent | 4dfaccccb3186f7d223892bc473e7e0148473456 (diff) | |
| download | subsurface-5775905727150b4f2f5556b84814acdc46e2d717.tar.gz | |
Try to add required dependencies to get https working on Windows
This clearly isn't enough. But I simply can't seem to get this to work...
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | packaging/windows/subsurface.nsi.in | 5 |
2 files changed, 7 insertions, 1 deletions
@@ -53,6 +53,7 @@ ifeq ($(CC), i686-w64-mingw32-gcc) # ok, we are cross building for Windows LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer) LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer) + LIBGNUTLS = $(shell $(PKGCONFIG) --libs gnutls-extra) $(shell $(PKGCONFIG) --libs p11-kit-1) RESFILE = packaging/windows/subsurface.res LDFLAGS += -Wl,-subsystem,windows LIBWINSOCK = -lwsock32 @@ -157,7 +158,7 @@ ifneq ($(strip $(LIBXSLT)),) XSLT=-DXSLT='"$(XSLTDIR)"' endif -LIBS = $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGTK) $(LIBGCONF2) $(LIBDIVECOMPUTER) $(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) +LIBS = $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGTK) $(LIBGCONF2) $(LIBDIVECOMPUTER) $(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) $(LIBGNUTLS) MSGLANGS=$(notdir $(wildcard po/*.po)) MSGOBJS=$(addprefix share/locale/,$(MSGLANGS:.po=.UTF-8/LC_MESSAGES/subsurface.mo)) diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in index f27f7207e..822f4c05c 100644 --- a/packaging/windows/subsurface.nsi.in +++ b/packaging/windows/subsurface.nsi.in @@ -139,6 +139,11 @@ Section File dll\libosmgpsmap-2.dll File dll\libsqlite3-0.dll File dll\libgnutls-26.dll + File dll\libgnutls-extra-26.dll + File dll\libgnutls-openssl-27.dll + File dll\libgnutlsxx-27.dll + File dll\libp11-kit-0.dll + File mydll\libgiognutls.dll File subsurface.ico File /r share |