Check for the plib version when using display lists, just to be sure.

[flightgear.git] / src / Scenery / FGTileLoader.hxx

diff --git a/src/Scenery/FGTileLoader.hxx b/src/Scenery/FGTileLoader.hxx
index f8d1ba03ba420eae160a98dd9545d66eecd23a98..3d912fa753ce73715a4bafd50534c3dba442371c 100644 (file)
--- a/src/Scenery/FGTileLoader.hxx
+++ b/src/Scenery/FGTileLoader.hxx
@@ -27,13 +27,15 @@
 #include <simgear/bucket/newbucket.hxx>
 #include <simgear/misc/sg_path.hxx>
 
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS) && ENABLE_THREADS
 #  include <simgear/threads/SGThread.hxx>
 #  include <simgear/threads/SGQueue.hxx>
 #else
 #  include <queue>
+   SG_USING_STD( queue );
 #endif
 
+
 // Forward reference.
 class FGTileEntry;
 
@@ -54,6 +56,15 @@ public:
      */
     ~FGTileLoader();
 
+#if 0 // we don't ever want to do this I don't think
+    /**
+     * Flush anything in pending load queue without doing the work
+     * Leave the free queue intact since that's are only record of
+     * things we need to remove.
+     */
+    void reinit();
+#endif
+    
     /**
      * Add a tile to the end of the load queue.
      * @param tile The tile to be loaded from disk.
@@ -86,7 +97,7 @@ private:
 
 private:
 
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS) && ENABLE_THREADS
     /**
      * FIFO queue of tiles to load from data files.
      */
@@ -98,11 +109,11 @@ private:
 #endif
 
     /**
-     * Base name of directory containing tile data file.
+     * Base names of directories containing tile data files.
      */
-    SGPath tile_path;
+    string_list tile_path;
 
-#ifdef ENABLE_THREADS
+#if defined(ENABLE_THREADS) && ENABLE_THREADS
     /**
      * Maximum number of threads to create for loading tiles.
      */
@@ -144,7 +155,7 @@ private:
      * Lock and synchronize access to tile queue.
      */
     SGMutex mutex;
-    SGCondition frame_cond;
+    SGPthreadCond frame_cond;
 
     /**
      * Thread cleanup handler.