diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-09-17 15:05:10 -0400 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-09-17 15:05:10 -0400 |
| commit | b473604ee8a86ca963fd9faafaf0bfc0125bf652 (patch) | |
| tree | 35fb21e3f52a1f8ac06c04540fd0a4ca6e608534 | |
| parent | a7ceb695f57a88d280719c4763c8d5eb4b6ab03e (diff) | |
| download | subsurface-b473604ee8a86ca963fd9faafaf0bfc0125bf652.tar.gz | |
Update installer so we can cross-build for Windows
Marble doesn't work, yet (Google Maps aren't loaded), but at least
Subsurface starts under Windows with the installer built.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | Rules.mk | 2 | ||||
| -rw-r--r-- | packaging/windows/subsurface.nsi.in | 49 |
3 files changed, 16 insertions, 36 deletions
@@ -144,6 +144,7 @@ else NSIFILE = $(WINDOWSSTAGING)/$(NAME).nsi MAKENSIS = makensis XSLTDIR = .\\xslt + TARGET = $(NAME).exe endif LIBS = $(LIBQT) $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGCONF2) $(LIBDIVECOMPUTER) \ @@ -41,7 +41,7 @@ ALL_OBJS = $(OBJS) $(MOC_OBJS) # Files for using Qt Creator CREATOR_FILES = $(NAME).config $(NAME).creator $(NAME).files $(NAME).includes -all: $(NAME) doc +all: $(TARGET) doc $(TARGET): gen_version_file $(ALL_OBJS) $(MSGOBJS) $(INFOPLIST) @$(PRETTYECHO) ' LINK' $(TARGET) diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in index 34566dd7c..90981fdf6 100644 --- a/packaging/windows/subsurface.nsi.in +++ b/packaging/windows/subsurface.nsi.in @@ -101,49 +101,28 @@ Section File ..\..\subsurface.exe File /r ..\..\xslt File dll\iconv.dll - File dll\libatk-1.0-0.dll - File dll\libcairo-2.dll File dll\libdivecomputer-0.dll - File dll\libffi-6.dll - File dll\libfontconfig-1.dll - File dll\libfreetype-6.dll - File mydll\freetype6.dll - File mydll\freetype-config - File dll\libgdk-win32-2.0-0.dll - File dll\libgdk_pixbuf-2.0-0.dll - File dll\libgio-2.0-0.dll - File dll\libglib-2.0-0.dll - File dll\libgmodule-2.0-0.dll - File dll\libgobject-2.0-0.dll - File dll\libgthread-2.0-0.dll - File dll\libgtk-win32-2.0-0.dll File dll\libintl-8.dll - File dll\libjasper-1.dll - File dll\libjpeg-62.dll - File mydll\libpango-1.0-0.dll - File mydll\libpangocairo-1.0-0.dll - File mydll\libpangoft2-1.0-0.dll - File mydll\libpangowin32-1.0-0.dll - File dll\libpixman-1-0.dll File dll\libpng15-15.dll - File dll\libtiff-3.dll File dll\libusb-1.0.dll File dll\libxml2-2.dll File dll\libxslt-1.dll - File dll\libexpat-1.dll - File dll\pthreadGC2.dll File dll\zlib1.dll - File dll\libzip-1.dll - File dll\libbz2-1.dll - File dll\libsoup-2.4-1.dll - File dll\libosmgpsmap-2.dll + File dll\libzip-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 dll\libgcc_s_sjlj-1.dll + File dll\libstdc++-6.dll + File dll\QtCore4.dll + File dll\QtGui4.dll + File dll\QtNetwork4.dll + File dll\QtSvg4.dll + File dll\QtWebKit4.dll + File dll\QtDeclarative4.dll + File dll\QtScript4.dll + File dll\QtSql4.dll + File dll\QtXmlPatterns4.dll + File dll\QtXml4.dll + File dll\libmarblewidget.dll File subsurface.ico File /r share |