Commit 88f8d5b1 authored by Anthony Léonard's avatar Anthony Léonard Committed by Olivier SOLDANO

include libraries for SQLite support

Project file and nsis script are both modified to include correct
libraries and install paths for SQLite support.

This database is not used by the client itself but by LRC as its new
storage backend. It is thus required to ship some Qt and SQLite DLLs
with Ring.

Change-Id: I7d9c3065485bf6cbfc73a1edcca3fa816233e394
Reviewed-by: default avatarOlivier Soldano <olivier.soldano@savoirfairelinux.com>
parent 2100f1c4
......@@ -265,7 +265,7 @@ win32 {
QTRUNTIME.files = $$RUNTIMEDIR/Qt5Core.dll $$RUNTIMEDIR/Qt5Widgets.dll \
$$RUNTIMEDIR/Qt5Gui.dll $$RUNTIMEDIR/Qt5Svg.dll \
$$RUNTIMEDIR/Qt5Xml.dll $$RUNTIMEDIR/Qt5WinExtras.dll \
$$RUNTIMEDIR/Qt5Network.dll
$$RUNTIMEDIR/Qt5Network.dll $$RUNTIMEDIR/Qt5Sql.dll
QTRUNTIME.path = $$OUT_PWD/release
QTDEPSRUNTIME.files = $$RUNTIMEDIR/zlib1.dll \
......@@ -275,7 +275,8 @@ win32 {
$$RUNTIMEDIR/libpcre16-0.dll $$RUNTIMEDIR/libpng16-16.dll \
$$RUNTIMEDIR/libjpeg-62.dll $$RUNTIMEDIR/iconv.dll \
$$RUNTIMEDIR/libidn-11.dll $$RUNTIMEDIR/liblzma-5.dll \
$$RUNTIMEDIR/libGLESv2.dll $$RUNTIMEDIR/libbz2-1.dll
$$RUNTIMEDIR/libGLESv2.dll $$RUNTIMEDIR/libbz2-1.dll \
$$RUNTIMEDIR/libsqlite3-0.dll
QTDEPSRUNTIME.path = $$OUT_PWD/release
QTPLATFORMS.files = $$[QT_INSTALL_PLUGINS]/platforms/qwindows.dll
......@@ -284,12 +285,15 @@ win32 {
QTPLUGINIMAGE.files = $$[QT_INSTALL_PLUGINS]/imageformats/
QTPLUGINIMAGE.path = $$OUT_PWD/release
QTSQLDRIVERS.files = $$[QT_INSTALL_PLUGINS]/sqldrivers/qsqlite.dll
QTSQLDRIVERS.path = $$OUT_PWD/release/sqldrivers
LIBSTD.files = $$RUNTIMEDIR/libgcc_s_sjlj-1.dll $$RUNTIMEDIR/libstdc++-6.dll \
$$RUNTIMEDIR/libwinpthread-1.dll $$RUNTIMEDIR/libgcc_s_seh-1.dll
LIBSTD.path = $$OUT_PWD/release
INSTALLS += RINGTONES PACKAGING LICENSE RUNTIME LRC_TRANSLATION QTRUNTIME QTDEPSRUNTIME \
QTPLUGINIMAGE QTPLATFORMS LIBSTD
QTPLUGINIMAGE QTPLATFORMS QTSQLDRIVERS LIBSTD
DEFINES += ENABLE_AUTOUPDATE
LIBS += -L$${RING}/lib -lWinSparkle
......
......@@ -146,6 +146,8 @@ section "install"
file platforms/*
setOutPath $INSTDIR\imageformats
file imageformats/*
setOutPath $INSTDIR\sqldrivers
file sqldrivers/*
setOutPath $INSTDIR\ringtones
file ringtones/*
setOutPath $INSTDIR\share\ring\translations
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment