1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Commit Graph

18 Commits

Author SHA1 Message Date
Fredrik Arvidsson
07c7faa144 Merge remote-tracking branch 'origin/shared/OP-1109_qtquick2' into next
Conflicts:
	artwork/PFD/pfd.svg
2013-12-03 22:47:12 +01:00
Philippe Renon
56c404e778 OP-1132 added new openssl-install that downloads and install the required SSL libraries for Windows
the missing SSLEAY32.DLL and LIBEAY32.DLL are copied to GCS bin dir
OpenSSL version 1.0.1e was downloaded from http://slproweb.com/products/Win32OpenSSL.html
2013-12-01 23:17:48 +01:00
Fredrik Larrson
0afbed5995 Doh, stupid type in comment, sorry. 2013-11-18 20:13:05 +11:00
Fredrik Larrson
d8772c5529 Clean this up, so debug DDLs don't hang around in a release and vice versa 2013-11-18 20:04:11 +11:00
Fredrik Larrson
1edfd56d48 For controls and Dialogs, use Copydir directive as all qml files are
needed and this is the "easy way", the other solution is to list every
single qml file by hand, these will likely be added to in upcomming
releases of Qt and cause maintaince.

The downside is three debug DLLs get copied also, if required I can expand
copydata.pro to delete them after the copy if required.

As we are making some changes to the build system, this at least enables
working builds of QtQuick2, if before packaging we do not have a better
solution, I will make sure the extra debug DLLs are removed.
2013-11-16 19:18:36 +11:00
Fredrik Larrson
e53db99d89 Add private shared QtQuick types 2013-11-16 05:57:39 +11:00
Fredrik Larrson
f1dd376b79 Standard QtQuick2 working, welcome, PFD etc 2013-11-16 04:35:09 +11:00
Fredrik Larrson
d868c12a09 QtQuick2 DLLs copied, fixed directory name with missing period also 2013-11-16 04:11:53 +11:00
Fredrik Larrson
85387f000a Only make controls directory once 2013-11-16 03:46:04 +11:00
Fredrik Larrson
16c157591b Create QtQuick directories 2013-11-16 03:42:11 +11:00
Philippe Renon
89e261c3f8 OP-1109: added required DLLs 2013-11-14 22:41:39 +01:00
Philippe Renon
a9a089d40d [OP-835] Qt 5.1.0 - adapt copydata.pro to Qt 5.1.0 (Windows only)
- list of DLLs to copy is different and includes additional DLLs (Qt5SerialPort, Qt5Multimedia, ...)
- removal of phonon plugin (replaced by multimedia)
- prefer DLLs from Qt rather than from MinGW when possible (more robust)
- now supports Debug builds
2013-09-15 23:24:49 +02:00
Oleg Semyonov
5bb6b56b4a OP-772: Normalize line endings 2013-04-05 23:46:56 +03:00
James Cotton
5e20705347 Windows copy data: Use the environmental $$(QTMINGW) variable to locate
files to copy into the package.  This makes it more robust against various
relative locations of mingw and qt.

It may be necessary to move all SDL-related files (SDL.dll, static libraries
and include files) from, for instance, .\QtSDK\Desktop\Qt\4.8.1\mingw\bin
to .\QtSDK\mingw\bin to be found.

Conflicts:

	ground/gcs/copydata.pro
	ground/gcs/src/plugins/hitl/aerosimrc/src/plugin.pro
2013-02-03 01:06:07 +02:00
Oleg Semyonov
fc51680e6c Windows packaging: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible) 2012-07-29 23:08:59 +03:00
Oleg Semyonov
4b06f68f11 Need to link a few new libraries for the QML stuff (windows) 2012-02-16 01:16:09 +02:00
Oleg Semyonov
f676859854 package: (win) make SDL.dll mandatory for packaging, add some comments 2011-05-28 11:46:06 +03:00
Oleg Semyonov
cbdba940b5 OP-483: remove gcs/packaging subdirectory (not required anymore) 2011-05-19 13:08:54 +03:00