From 92ee374494b83c47115f6f479530e7e9678ad562 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 25 May 2013 08:28:35 -0700 Subject: Find Google maps in Subsurface's source tree 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 --- marbledata/maps/earth/googlesat/bicycle/0/0/0.png | Bin 0 -> 191 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 marbledata/maps/earth/googlesat/bicycle/0/0/0.png (limited to 'marbledata/maps/earth/googlesat/bicycle') diff --git a/marbledata/maps/earth/googlesat/bicycle/0/0/0.png b/marbledata/maps/earth/googlesat/bicycle/0/0/0.png new file mode 100644 index 000000000..febf01a9c Binary files /dev/null and b/marbledata/maps/earth/googlesat/bicycle/0/0/0.png differ -- cgit v1.2.3-70-g09d2