summaryrefslogtreecommitdiffstats
path: root/marbledata
AgeCommit message (Collapse)Author
2015-04-07FindMarble moved to cmake/ModulesGravatar Tomaz Canabrava
This is the correct way to deal with CMake Modules (or at least, the default way). All our custom CMakeFiles will be here. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-04-14Add a CMake based buildsystem for the tests.Gravatar Tomaz Canabrava
This commit adds a CMake based buildsystem for the tests, it separated the subsurface sources in small libraries to make testing easyer ( subsurface core, subsurface ui, subsurface profile, etc. ) There's no test yet, this however produces a compiled and executable binary *on linux*. This file shouldn't be needed on any other platform as this is not the main build system, but the test build system. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-12-11Globe: improve the flag placement and sizeGravatar Lubomir I. Ivanov
We can position our old flag in a PNG with double the size of the original flag - 48x48px, so that the pin is exactly at the center of the PNG. This way when the user clicks on a map location the pin should be placed exactly there. Patch also makes the flag bigger. Fixes #335. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-10-13Try to fix the Google Maps issueGravatar Dirk Hohndel
This is trial and error, based on a few websites describing the api. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-25Find Google maps in Subsurface's source treeGravatar Dirk Hohndel
This way the user doesn't need to move the two folders googlemaps and googlesat around in the filesystem. This only works if Subsurface is started from the build directory - it doesn't work when Subsurface is installed (and it doesn't at all address the need to install these files and bundle them as well). I'd consider this a hack to show how the real solution should work. There is one more part of this that is a hack: Marble no longer searches its default data directory; the path we set replaces the Marble system search path. Sadly, Marble doesn't support paths the way Unix thinks of them with multiple directories, separated by ':'. So this means that Marble no longer finds any of its default icons. For most of them that seems fine as I don't think lacking the icons for "manned_landing", "robotic_rover", "unmanned_hard_landing" or the various types of places of worship that Marble supports is necessarily a big issues for Subsurface, but at least the default_location icon seemed important. And since we now need to carry our own, I replaced the boring circle with a tiny dive flag. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>