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
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
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
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
0bdb37dcf5
LP-29 hotfix: fix osgearth build on linux
2016-01-16 00:20:36 +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
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
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
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
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
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
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
Philippe Renon
3ca2634109
LP-30 don't copy now non existant googlesat/bicycle
2015-09-08 23:15:24 +02:00
Philippe Renon
6af2d6920d
LP-30 fixed lib path when building osgearth on osx
2015-09-08 23:06:42 +02:00
Philippe Renon
225097fbcb
LP-30 use .patch extension instead of .diff for patch files
2015-09-08 22:53:47 +02:00
Philippe Renon
7b443715ae
LP-30 don't package non existant LibrePilotReadme.txt with marble
2015-09-08 22:52:52 +02:00
Philippe Renon
59636cb2ec
LP-30 get marble maps from gitlab
2015-09-08 22:45:07 +02:00
Philippe Renon
9436bae7c8
LP-30 fixed linux 64 packaging issue
2015-09-08 09:12:30 +02:00
Philippe Renon
ca1fa5fe3e
LP-30 removed references to OP and other minor cleanups
2015-09-06 17:05:29 +02:00
Philippe Renon
9658ba3500
LP-30 removed old commented out scruff from osg win script
2015-09-06 16:50:45 +02:00
Philippe Renon
54edce6e1c
LP-30 added build scripts for osg (including windows dependencies), osgearth and marble
2015-09-05 19:10:54 +02:00
