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

528 Commits

Author SHA1 Message Date
Philippe Renon
566a7fa17d LP-338 upgrade to Qt 5.6.1 2016-07-04 09:11:28 +02:00
Philippe Renon
504594112f LP-335 add support for address sanitizer (asan) 2016-06-14 22:05:01 +02:00
Lalanne Laurent
e2c971d4d3 Merged in james-duley/librepilot/qt-env (pull request #247)
Make qt56-env.sh be sourced automatically
2016-05-23 20:22:33 +02:00
James Duley
128b1ef5dd Make qt56-env.sh be sourced automatically 2016-05-20 08:27:47 +01:00
James Duley
88d52c1dc5 Make sure version-info is always updated when needed
by doing it every time but only writing if different
2016-05-16 21:46:59 +01:00
Fredrik Arvidsson
159e220e8f LP-208 Changed some variable names in make files. Updated text in installer script. 2016-03-24 16:11:52 +01:00
Fredrik Arvidsson
4e74160d3f LP-208 Changed Qt download paths to get Qt 5.6.0 release.
Updated MD5 paths to grab the md5sums.txt file instead of a file with the same name as the binary installer. The md5sums.txt file contains all md5 checksums for the file in the same directory.
Updated tools.mk to grep in the md5 file for the row with the name of the file of interest.
Added makefile variables for the Qt version for easier upgrades in the future.
Updated the qt installer script to use Qt5.6
Removed Linux x32 installer since it is not provided anymore.
Fixed compiler errors caused by Qt5.6 using C++11 as default.
2016-03-24 15:01:26 +01:00
Philippe Renon
85815e2f4c tools.mk: cleanup QT_SDK_PREFIX usage 2016-02-17 23:43:13 +01:00
Philippe Renon
0966410649 tools.mk: define and use TOOLS_URL 2016-02-17 23:43:05 +01:00
Philippe Renon
736a5410a8 msys2: set MINGW_DIR to /mingw[32|64]
PYTHON_DIR, OSG_SDK_DIR, etc., now point to MINGW_DIR
2016-02-17 23:42:58 +01:00
Philippe Renon
0bf15c17bd hotfix : patch osg 3.5.1 to fix compile error on osx 2016-02-12 22:27:32 +01:00
Philippe Renon
05d806f6f1 LP-29 upgrade to osg 3.5.1 to match version used on windows 2016-02-09 00:13:38 +01:00
Philippe Renon
b1292a695b LP-29 switch to using tags instead of branches...
so now using osg 3.4.0 and osgearth 2.7 tags (instead of 3.4 and 2.7 branches)
also do shallow clone to save on band width and disk space
2016-02-09 00:13:07 +01:00
Fredrik Arvidsson
b6a3a32ce4 This upgrades google test to 1.7.0 and fixes some issues in make files. 2016-01-31 22:04:59 +01:00
James Duley
16d52016e1 hotfix: use msys2 osg, disable osgearth by default 2016-01-31 12:02:58 +00:00
Philippe Renon
b62c8c6a17 Merged in filnet/librepilot/msys2_tidy_up (pull request #166)
msys2_tidy_up (continued)
2016-01-30 15:28:49 +01:00
Fredrik Arvidsson
56bd378183 Merged in james-duley/librepilot/unit_tests (pull request #168)
LP-223: Fix up unit tests
2016-01-30 10:09:19 +01:00
James Duley
010adebba9 LP-223: Fix up unit tests
The were missed when the flight makefiles were moved
2016-01-27 22:17:24 +00:00
Philippe Renon
e5685dcfa6 LP-222 hotfix: osg 3.4 was updated and LP patch for osg needs to be modified to reflect that 2016-01-27 21:38:16 +01:00
Philippe Renon
92ef64bc7b make: misc cleanups 2016-01-27 08:54:45 +01:00
Philippe Renon
e645477849 marble: don't build with qt webkit (crashes GCS otherwise)
needs to be investigated further as removing webkit breaks some things in marble (like viewing wikipedia articles)
2016-01-27 08:53:46 +01:00
Philippe Renon
4981721c60 marble: port marble.mk to msys2 2016-01-27 08:52:03 +01:00
Philippe Renon
a6b5a78229 make: variablize Qt version 2016-01-27 08:50:48 +01:00
Philippe Renon
e7629dcedf windows: make sure to use mingw32-make when invoking cmake to build third party libraries 2016-01-27 08:46:16 +01:00
Philippe Renon
9d753905d1 hotfix: fix syntax error in version-info.py 2016-01-24 14:19:21 +01:00
Philippe Renon
596f3cb272 Merged in james-duley/librepilot/LP-111_UAVO_hash_only_xml_files (pull request #159)
LP-111 UAVO hash only xml files
2016-01-24 13:55:04 +01:00
Philippe Renon
6e0afc771e windows: avoid "missing cc command" message on each make invocation 2016-01-23 14:41:36 +01:00
Philippe Renon
e3926b9c08 LP-218 revert to using mesa opengl32.dll (msys2 provided one crashes GCS) 2016-01-23 14:41:33 +01:00
Philippe Renon
e42539347b windows: remove obsolete sdl_install and openssl_install make targets (now provided by msys2) 2016-01-23 01:55:34 +01:00
James Duley
8188f935e9 LP-111 UAVO hash only xml files 2016-01-19 22:37:08 +00:00
Philippe Renon
0bdb37dcf5 LP-29 hotfix: fix osgearth build on linux 2016-01-16 00:20:36 +01:00
Philippe Renon
30fb84c9b4 LP-29 remove cmake and msys
affects windows only
added CMAKE make variable set to system cmake
2016-01-14 03:02:38 +01:00
Philippe Renon
2d59530f6e LP-29 further adaptations to msys2
fix list of mingw provided dependencies
fix path handling
other related cleanups
2016-01-14 03:02:17 +01:00
Philippe Renon
c0613fe6d0 Adapted osgearth branch to msys2
Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration

# Conflicts:
#	Makefile
#	ground/gcs/src/libs/osgearth/copydata.pro
#	make/tools.mk
2016-01-12 02:32:16 +01:00
Philippe Renon
3d7558c28b LP-29 split osg and osgearth SDKs and make osgearth optional 2016-01-10 22:33:57 +01:00
Brian Webb
25a8a35ed5 LP-187 Msys2: Removes unnecessary targets from Windows SDK targets and updates CONTRIBUTING.md 2016-01-10 17:11:46 +00:00
James Duley
672749d0d7 LP-187 MSYS2: add arch to installer filename 2016-01-10 17:11:46 +00:00
James Duley
9c0b8d3f71 Add Make function to get architecture 2016-01-10 17:11:46 +00:00
James Duley
86c262d708 nsis packaging remove extra template layer
And make required fixes which include an extra
function in version-info.py:
${VERSION_FOR_NUM} e.g. 15.09.1.12344
2016-01-10 17:11:46 +00:00
James Duley
0020ab7a12 LP-187 MSYS2: add system_path make function 2016-01-10 17:11:46 +00:00
Philippe Renon
72c7623a1b Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration
# Conflicts:
#	ground/gcs/src/libs/osgearth/osgearth.pro
2016-01-06 22:16:32 +01:00
Philippe Renon
9d2e1dcc1f LP-2 osg is now installed when doing make build_sdk_install 2015-12-14 22:14:22 +01:00
Philippe Renon
ab8a470580 LP-2 make osg use Qt 5.5.1 2015-12-14 22:14:22 +01:00
Philippe Renon
95ea26c396 Merge branch 'next' of bitbucket.org:librepilot/librepilot into filnet/LP-29_osgearth_integration
# Conflicts:
#	ground/gcs/src/libs/osgearth/osgearth.pro
2015-12-10 00:17:10 +01:00
Philippe Renon
0efa0131e1 LP-30 fix minor compilation warning about copy constructor 2015-12-03 00:06:48 +01:00
Philippe Renon
060da52bd2 LP-2 remove unused QT_SDK_INSTALLER_DAT from top Makefile 2015-12-02 09:05:14 +01:00
Philippe Renon
69ee68ddfe LP-2 move ARM SDK install to proper place (out of the middle of the Qt stuff) 2015-12-02 09:05:14 +01:00
Philippe Renon
11f851cdcf LP-2 fix MAC_QT_INSTALL_TEMPLATE 2015-12-02 09:05:14 +01:00
Philippe Renon
d5e97fffe1 LP-2 fix MAC_QT_INSTALL_TEMPLATE 2015-12-02 09:05:14 +01:00
Philippe Renon
3d8493a38a LP-2 remove LINUX_QT_INSTALL_TEMPLATE 2015-12-02 09:05:14 +01:00