From 2425109a1482baa0124566af649439c8c4fe925b Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Mon, 9 Nov 2009 09:33:45 +0000
Subject: [PATCH] None code changes: TODO, Makefile, vimrc

---
 TODO                    | 42 +++++++----------------------------------
 src/Makefile.am         | 26 +++++++++++++------------
 src/plugins/.vimrc      |  2 ++
 src/plugins/Makefile.am | 11 +++++++----
 4 files changed, 30 insertions(+), 51 deletions(-)
 create mode 100644 src/plugins/.vimrc

diff --git a/TODO b/TODO
index b1a167e..e77f061 100644
--- a/TODO
+++ b/TODO
@@ -5,42 +5,14 @@ Road plan
   DisplayLists/
   glInterleavedArrays
 * States/cities/roads overlays
+* Atmosphere
+* Mouse control
 
 Roam update
 -----------
+* Find a better way to fix great circle errors
+* Improve garbage collection (use timeout?)
+* Refactor height functions
+* Fix texture rendering at edges w/ linear filtering
 
-  x # Gis:
-  x gis_update_tiles(tiles);
-  x   for (tile in tiles)
-  x     if (need_split(tiles))
-  x       tiles << split(tile)
-  x gis_render_surface(Image *img)
-  x   polys = roam_get_intersecting_polies(img)
-  x   for (poly in plies)
-  x     render(img, poly)
-
-    # Roam:
-    on_view_change:
-      roam_update_errors(roam)
-    on_timeout:
-      split_merge:
-        if (height_func())
-           vertex_heght = roam->height_func()
-        else
-           vertex_heght = 0
-
-  x # GisPluginSrtm:
-  x on_view_change:
-  x   roam->height_func = srtm_height_func
-  x   gis_update_tiles(tiles)
-  x   for (new_tiles in tiles)
-  x     points = roam_get_intersecting_points(tile)
-  x     for (poly in plies)
-  x       render(img, poly)
-
-  x # GisPluginBmng:
-  x on_view_change:
-  x   gis_update_tiles(tiles)
-  x on_render:
-  x   for tile in tiles:
-  x     gis_render_surface(gis, tile)
+vim: ts=2 sw=2 sts=2
diff --git a/src/Makefile.am b/src/Makefile.am
index 97ec6ba..fcf5976 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,23 +54,25 @@ MAINTAINERCLEANFILES = Makefile.in
 .list.h:
 	glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@
 
-test: all
+test: all .libs/gis
 	./gis_test
 
-gdb: all
+gdb: all .libs/gis
 	gdb ./gis_test
 
-ddd: all
+ddd: all .libs/gis
 	ddd ./gis_test
 
+.libs/gis: plugins/.libs
+	ln -sf ../plugins/.libs .libs/gis
+
 memcheck: all
-	LD_LIBRARY_PATH=.libs                      \
-	G_SLICE=always-malloc                      \
-	G_DEBUG=gc-friendly,resident-modules       \
-	valgrind --track-origins=yes               \
-	         --leak-check=full                 \
-	         --leak-resolution=high            \
-	         --num-callers=100                 \
-	         --suppressions=../gtk.suppression \
-	         .libs/gis_test                    \
+	G_SLICE=always-malloc                   \
+	G_DEBUG=gc-friendly,resident-modules    \
+	valgrind --track-origins=yes            \
+	         --leak-check=full              \
+	         --leak-resolution=high         \
+	         --num-callers=50               \
+	         --suppressions=gtk.suppression \
+	         ./gis_test                     \
 	2> valgrind.out
diff --git a/src/plugins/.vimrc b/src/plugins/.vimrc
new file mode 100644
index 0000000..5de2904
--- /dev/null
+++ b/src/plugins/.vimrc
@@ -0,0 +1,2 @@
+set makeprg=make\ test
+set tw=100
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 4f59779..6e49cb8 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -7,12 +7,15 @@ LIBS            = $(top_srcdir)/src/libgis.la
 
 pluginsdir  = $(pkglibdir)
 
-plugins_LTLIBRARIES  = bmng.la srtm.la
-bmng_la_SOURCES      = bmng.c bmng.h
-srtm_la_SOURCES      = srtm.c srtm.h
+plugins_LTLIBRARIES = bmng.la srtm.la
+bmng_la_SOURCES     = bmng.c bmng.h
+srtm_la_SOURCES     = srtm.c srtm.h
+
+test:
+	( cd ../; make test )
 
 # Fixme...
 bmng_la_DEPENDENCIES = $(top_srcdir)/src/libgis.la
 srtm_la_DEPENDENCIES = $(top_srcdir)/src/libgis.la
-$(top_srcdir)/src/libgis.la:
+$(top_srcdir)/src/libgis.la: $(wildcard ../*.[ch])
 	( cd ../; make libgis.la )
-- 
2.43.2