rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-03 11:24:10 +01:00
Code Issues Releases Activity
9,425 Commits 5 Branches 8 Tags 266 MiB
5112d465ad
Commit Graph

11 Commits

Author SHA1 Message Date
Laurent Lalanne
5112d465ad git merge next 2013-12-18 20:14:26 +01:00
Laurent Lalanne
c3421c7cf0 Old conflict in branch, fixed with original file from next 2013-10-31 00:46:12 +01:00
Laurent Lalanne
9e3d464523 Merge branch 'master' into translations_next 
Conflicts:
	ground/openpilotgcs/copydata.pro
	ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts
 2013-10-25 11:27:28 +02: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
David
86a02d693e Update copy data for ssl, readme is way out of date, changed one 
line but on a read through, it's very out of date now as things
are easier now. Might be best to link to the Wiki...
 2013-08-17 00:51:09 +10: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