None code changes: TODO, Makefile, vimrc

diff --git a/TODO b/TODO
index b1a167eeb519c6d577461cbe9b12b329b295cc3d..e77f061523b3e48716495b05b4b3f47891a2486b 100644 (file)
--- 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 97ec6ba438d4c633dd5fbd05b57910cb08f2b9ab..fcf59766b21684b8b0b599dcf57f16a32009d3aa 100644 (file)
--- 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 (file)
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 4f597794b8b8ccd0038c4a7c78c94d979f51609c..6e49cb82c60e95a19106a0d5aff0629e824143bd 100644 (file)
--- 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 )