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

504 Commits

Author SHA1 Message Date
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
Philippe Renon
90e81e6b5a LP-2 install Qt using a silent install script
tested on windows and linux 64.
2015-12-02 09:05:14 +01:00
Philippe Renon
3131c59eb4 LP-2 attempt at installing qt 5.5.1 using QtIFW devtool utility
devtool can be used to extract components and run operations
unfortunately the QtPatch operation is not available
attempt still commited for future reference
2015-12-02 09:05:14 +01:00
Philippe Renon
e8816c86c8 LP-2 upgraded to Qt 5.5.1 2015-12-02 09:05:14 +01:00
Philippe Renon
067261ed3f LP-2 upgraded to Qt 5.5.0 (excluding sdk installer) 2015-12-02 09:05:14 +01:00
Philippe Renon
396877238b LP-29 osgearth does not need the OSG_WINDOWING_SYSTEM cmake build option 2015-11-30 22:23:43 +01:00
Philippe Renon
5acaffe93c patch osg to fix mac compile error 2015-11-23 09:30:40 +01:00
Philippe Renon
ac76fc768f Merged in filnet/librepilot/filnet/LP-30_3rdparty_build_scripts (pull request #50)
LP-30 added build scripts for osg (including windows dependencies), osgearth and marble
2015-11-14 13:46:46 +01:00
Philippe Renon
8f2bebc4a2 LP-30 README.text cleanup 2015-11-05 08:43:31 +01:00
Philippe Renon
57e1122f4c LP-30 disable compilation of osgWrappers/deprecated-dotosg 2015-11-03 01:50:52 +01:00
Philippe Renon
a3a7d55176 LP-30 fixed PATH issue on windows after switching to git for windows 2.6.2
apparently environment variables, like TOOLS_DIR, set in .bashrc are messed up now (/d/path becomes D:/path)
a workaround is to set them in the Makefile config file
2015-11-03 00:43:31 +01:00
Philippe Renon
73d15be2c1 LP-30 added short readme describing how to build osgEarth 2015-11-03 00:01:01 +01:00
James Duley
8834b66858 LP-82 define packaging info once in Makefile 2015-10-18 10:21:52 +01:00
Philippe Renon
a25b31b743 LP-30 upgraded google sat version via patch 2015-09-29 21:44:20 +02:00
Philippe Renon
3a5ba9ad58 LP-30 fixed marble 2015-09-25 23:41:25 +02:00
Philippe Renon
445ca8c5ae LP-30 set marble version to 15.08.1 and added patch to fix windows compilation issue 2015-09-25 23:39:51 +02:00
Philippe Renon
8f868d9e35 LP-30 fixed some pathes 2015-09-25 23:39:50 +02:00
Alessio Morale
08e0a580ed Merged in james-duley/librepilot/LP-113_tool_installer (pull request #49)
LP-113_tool_installer
2015-09-18 20:40:08 +02:00
Philippe Renon
4891f7c5ab LP-30 fixed DYLD_LIBRARY_PATH used when building osgearth on osx 2015-09-15 22:13:30 +02:00
Philippe Renon
e8f8a52600 LP-30 fixed list of unix dev libs required to build osg/osgearth 2015-09-15 22:12:30 +02:00
James Duley
b1f1c929d7 LP-113 new tool installer: Upgrade gcc-arm-none-eabi to 4.9 2015 q2 update 2015-09-15 00:06:09 +01:00
James Duley
4a3b222192 LP-113 new tool installer: added 7z for windows 2015-09-15 00:06:09 +01:00
James Duley
84880a0b80 LP-113: add new tool install framework 2015-09-15 00:06:09 +01:00
Philippe Renon
bed35a1d33 LP-30 osg : added proper win dependencies build script 2015-09-12 20:20:40 +02:00
Philippe Renon
c3fa476404 LP-30 unset OSG_NOTIFY_LEVEL to avoid warning if not set properly 2015-09-12 18:55:35 +02:00