mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Try to add required dependencies to get https working on Windows

Browse source 
This clearly isn't enough. But I simply can't seem to get this to work...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-05-11 21:54:04 -07:00
parent 4dfaccccb3
commit 5775905727
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -53,6 +53,7 @@ ifeq ($(CC), i686-w64-mingw32-gcc)
# ok, we are cross building for Windows # ok, we are cross building for Windows
LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer) LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer) LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
LIBGNUTLS = $(shell $(PKGCONFIG) --libs gnutls-extra) $(shell $(PKGCONFIG) --libs p11-kit-1)
RESFILE = packaging/windows/subsurface.res RESFILE = packaging/windows/subsurface.res
LDFLAGS += -Wl,-subsystem,windows LDFLAGS += -Wl,-subsystem,windows
LIBWINSOCK = -lwsock32 LIBWINSOCK = -lwsock32
@ -157,7 +158,7 @@ ifneq ($(strip $(LIBXSLT)),)
XSLT=-DXSLT='"$(XSLTDIR)"' XSLT=-DXSLT='"$(XSLTDIR)"'
endif 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)) MSGLANGS=$(notdir $(wildcard po/*.po))
MSGOBJS=$(addprefix share/locale/,$(MSGLANGS:.po=.UTF-8/LC_MESSAGES/subsurface.mo)) MSGOBJS=$(addprefix share/locale/,$(MSGLANGS:.po=.UTF-8/LC_MESSAGES/subsurface.mo))

5
packaging/windows/subsurface.nsi.in
View file

@ -139,6 +139,11 @@ Section
File dll\libosmgpsmap-2.dll File dll\libosmgpsmap-2.dll
File dll\libsqlite3-0.dll File dll\libsqlite3-0.dll
File dll\libgnutls-26.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 subsurface.ico
File /r share File /r share