Tweaks so tile loading still works in non-threaded mode.

diff --git a/src/Scenery/FGTileLoader.cxx b/src/Scenery/FGTileLoader.cxx
index 6a787926fba57af17dd65a125091d6b39285e61a..17cc52fc3b39c7cc9ba29c7bab946c9300ff39a9 100644 (file)
--- a/src/Scenery/FGTileLoader.cxx
+++ b/src/Scenery/FGTileLoader.cxx
@@ -29,6 +29,9 @@
 #include "tileentry.hxx"
 #include "tilemgr.hxx"
 
+extern ssgBranch *terrain;
+extern ssgBranch *ground;
+
 /**
  * 
  */
@@ -87,6 +90,7 @@ FGTileLoader::add( FGTileEntry* tile )
     tile_queue.push( tile );
 #else
     tile->load( tile_path, true );
+    tile->add_ssg_nodes( terrain, ground );
 #endif // ENABLE_THREADS
 }
 

diff --git a/src/Scenery/FGTileLoader.hxx b/src/Scenery/FGTileLoader.hxx
index b5fb759c7474655836bc85b7e958e586507f5b38..75b3a0c3d9370989c5039579a52c5b7136b86b1b 100644 (file)
--- a/src/Scenery/FGTileLoader.hxx
+++ b/src/Scenery/FGTileLoader.hxx
@@ -77,11 +77,13 @@ private:
 
 private:
 
+#ifdef ENABLE_THREADS
     /**
      * FIFO queue of tiles to load from data files.
      */
     SGBlockingQueue< FGTileEntry* > tile_queue;
-    
+#endif
+
     /**
      * Base name of directory containing tile data file.
      */

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8c7ab12810c2d1545c9fcb04567c14a805407eb7..af1db71cbd946f1418b5b3a032031e2bc7ca5fb6 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,5 @@
-bin_PROGRAMS = est-epsilon gl-info test-gethostname test-mktime test-up
+bin_PROGRAMS = est-epsilon gl-info test-gethostname test-mktime test-text \
+       test-up
 
 est_epsilon_SOURCES = est-epsilon.c
 est_epsilon_LDADD = $(base_LIBS)
@@ -12,5 +13,8 @@ test_gethostname_LDADD = $(base_LIBS)
 test_mktime_SOURCES = test-mktime.cxx
 test_mktime_LDADD = $(base_LIBS)
 
+test_text_SOURCES = test-text.cxx
+test_text_LDADD = $(base_LIBS)
+
 test_up_SOURCES = test-up.cxx
 test_up_LDADD = -lsgmath -lsgdebug -lplibsg $(base_LIBS)