diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2013-10-08 21:27:10 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago@macieira.org> | 2013-10-08 23:29:44 -0700 |
| commit | 603d65c9616ee85e0e0de1535874b981261589d2 (patch) | |
| tree | 8351347e75a3a9c2117dbdb4c0503f9fe697f199 | |
| parent | 245e29a72e47177b3337f7046b6bb0702888e3d8 (diff) | |
| download | subsurface-603d65c9616ee85e0e0de1535874b981261589d2.tar.gz | |
Deploy some Qt plugins alongside the binary
Only implemented for Windows for now. On Mac, macdeployqt copies all
imageformat plugins on its own.
Signed-off-by: Thiago Macieira <thiago@macieira.org>
| -rw-r--r-- | subsurface-install.pri | 8 | ||||
| -rw-r--r-- | subsurface.pro | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/subsurface-install.pri b/subsurface-install.pri index c71ae0ada..0615bc325 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -45,7 +45,7 @@ mac { qt_conf.commands = echo \'[Paths]\' > $@ qt_conf.commands += $${nltab}echo \'Prefix=.\' >> $@ - qt_conf.commands += $${nltab}echo \'Plugins=plugins\' >> $@ + qt_conf.commands += $${nltab}echo \'Plugins=.\' >> $@ qt_conf.target = $$PWD/packaging/windows/qt.conf install.depends += qt_conf @@ -53,6 +53,12 @@ mac { #!equals($$QMAKE_HOST.os, "Windows"): dlls.commands += OBJDUMP=`$(CC) -dumpmachine`-objdump dlls.commands += PATH=\$\$PATH:`$(CC) -print-search-dirs | $(SED) -nE \'/^libraries: =/{s///;s,/lib/?(:|\\\$\$),/bin\\1,g;p;q;}\'` dlls.commands += perl $$PWD/scripts/win-ldd.pl $(DESTDIR_TARGET) + + for(plugin, $$list($$DEPLOYMENT_PLUGIN)) { + CONFIG(debug, debug|release): dlls.commands += $$[QT_INSTALL_PLUGINS]/$${plugin}d4.dll + else: dlls.commands += $$[QT_INSTALL_PLUGINS]/$${plugin}4.dll + } + dlls.commands += $$LIBS dlls.commands += | while read name; do $(INSTALL_FILE) \$\$name $$PWD/$$WINDOWSSTAGING; done dlls.depends = $(DESTDIR_TARGET) diff --git a/subsurface.pro b/subsurface.pro index a04281941..065897233 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -136,6 +136,7 @@ MANPAGE = subsurface.1 XSLT_FILES = xslt DOC_FILES = $$OUT_PWD/Documentation/user-manual.html Documentation/images MARBLEDIR = marbledata/maps +DEPLOYMENT_PLUGIN += imageformats/qjpeg # This information will go into the Windows .rc file and linked into the .exe QMAKE_TARGET_COMPANY = subsurface team |