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

53 Commits

Author SHA1 Message Date
James Duley
5ea8a990df OP-1792 Makefile tidy: removed repeated Qt5OpenGL.dll 2015-04-09 13:01:23 +12:00
James Duley
af06960482 OP-1792 Makefile tidy: set dependencies for copydata by using new
functions addCopyFileTarget and addCopyDirTarget
2015-04-09 13:01:22 +12:00
James Duley
3a08642b40 OP-1792 Makefile tidy: Fix up the 'copydata.pro's to depend on FORCE, not be FORCE, and be aux template, not subdirs template. 2015-03-31 14:57:43 +13:00
James Duley
5dffb1033f OP-1700 copydata doubles if called twice: reused code for all platforms. Note this may make mixed case directories on windows 2015-03-21 15:35:11 +13:00
James Duley
0e631502d8 OP-1700 copydata doubles if called twice: tidy 2015-03-21 15:26:05 +13:00
James Duley
8261017ec6 OP-1700 copydata doubles if called twice:
Fix by rm -rf directory beforehand
2015-03-21 15:08:37 +13:00
Philippe Renon
5b2eac268a OP-1656 upgraded to Qt 5.4.0 (linux) - code compiles - GCS not tested... 2015-01-02 22:22:31 +01:00
Philippe Renon
ac6e0b0699 OP-1656 upgraded to Qt 5.4.0 (windows) - code compiles - GCS not tested... 2014-12-22 21:17:52 +01:00
James Duley
5cc91467ef OP-1478 fix_win_qtc_variables: added MESAWIN_DIR variable 2014-09-14 12:50:30 +12:00
James Duley
684180ef87 OP-1478: added a qmake variable OPENSSL_DIR 2014-09-13 17:48:30 +12:00
James Duley
1bea84d7c9 added icu libs to be copied again 2014-08-26 10:30:24 +12:00
James Duley
675e1e4467 Merge branch 'next' into OP-1338_fix_specific_icu_so_version_number 2014-08-20 12:04:37 +12:00
Fredrik Larson
ab43fbe7a8 Fix missing lib 2014-08-15 21:17:01 +10:00
Fredrik Arvidsson
1558c6d735 Merge remote-tracking branch 'origin/shared/OP-1398_qt531_upgrade' into thread/OP-1400_Qt_5.3.1_Upgrade
Conflicts:
	make/tools.mk
2014-08-11 23:25:37 +02:00
m_thread
717de29648 OP-1400 Upgraded make and copydata files to use Qt 5.3.1 Opensource. 2014-08-08 13:48:36 +02:00
Philippe Renon
c60417badb OP-1398 OP-1399 Windows Qt 5.3.1 upgrade - updated ICU version from 51 to 52 in copydata.pro 2014-07-14 18:26:40 +02:00
James Duley
95676043d7 on linux check whether QT_INSTALL_LIBS are /usr/lib/* set copyqt to 0 if that is the case 2014-07-07 08:43:04 +12:00
Laurent Lalanne
05e7339ecc OP-1390 Copy only opengl32.dll 32bit version 2014-07-05 14:12:27 +02:00
James Duley
90b84b210e Revert "removed so version number from linux icu libs"
it breaks the build with qt_sdk_install

This reverts commit d437976287.
2014-07-05 23:40:37 +12:00
Laurent Lalanne
db63158bc6 OP-1390 Updated wiki link for download, removed extra space added. 2014-07-04 18:36:43 +02:00
Laurent Lalanne
99db0c5025 OP-1390 First commit - Need valid download link 2014-07-04 17:21:39 +02:00
James Duley
d437976287 removed so version number from linux icu libs 2014-07-03 19:40:41 +12:00
Alessio Morale
c83284b21e Merge remote-tracking branch 'origin/next' into shared/OP-1252_update_to_qt521 2014-04-08 11:31:23 +02:00
Philippe Renon
40f648eab1 OP-1255 Windows toolchain : upgraded Qt from version 5.1.1 to version 5.2.1
- Qt installer is now downloaded from official web site
- Qt is not anymore tweaked to contain the SDL SDK (see OP-1263)
- Installing Qt now requires 7-Zip to be available (run "./make/scripts/win_sdk_install.sh [<OpenPilot tools dir>]" to get it)
- SLD needs to be installed with "make sdl_sdk_install"
KNOWN ISSUE : GCS build fails unless V=1 command line arg is provided
2014-03-20 00:46:05 +01:00
Philippe Renon
2ee3780d08 OP-1263 SDL is now downloaded and installed independently and is not added to Qt anymore 2014-03-17 20:43:38 +01:00
Laurent Lalanne
03df524e83 OP-1257 No GCS Audio (Linux package) added mediaservice/libgstaudiodecoder.so 2014-03-09 23:31:08 +01:00
Laurent Lalanne
44905fc0a9 OP-1257 No GCS Audio (Linux package) QT5 dependencies : libqgsttools_p.so.1 2014-03-09 21:33:50 +01:00
Laurent Lalanne
2f097ab20b OP-1257 No GCS Audio (Linux package) Only one library is needed (mediaservice/libgstmediaplayer.so) 2014-03-09 19:18:09 +01:00
Laurent Lalanne
7662cd75d2 OP-1257 No GCS Audio (Linux package) Libraries needed to play sound. 2014-03-09 10:06:47 +01:00
Alessio Morale
72e674bc09 OP-1254 Update linux copydata 2014-03-08 14:20:14 +01:00
Alessio Morale
e55345223c OP-1179 fix linux packages for missing .so that causes blank about box 2014-01-19 18:12:44 +01:00
Alessio Morale
e58f66db73 Merge remote-tracking branch 'origin/amorale/OP-1160_add_prepare_target_and_hooks' into next 2014-01-18 13:56:08 +01:00
Alessio Morale
0423d4ce99 OP-1160 Copydata was pointing to OPENSSL instead of OPENSSL_DIR, added related
export in tool.mk
2014-01-14 12:50:31 +01:00
a*morale
4738e4eafc OP-1155 OSX Package: Add QtQuick plugin deployment to copydata.pro 2014-01-10 23:25:35 +01:00
Mikael Blomqvist
6379a7d937 deb package now bundles qt5 libs and goodies 2014-01-09 15:57:12 +01:00
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