Added makedirdefs via a request from Bob Kheune. This allows us to edit

the DIRS cruft in a single file in the Make directory instead of having
to edit multiple files.  Also edited Makefiles that needed to include
this file.

Also cleaned up txp loader to compile with SunOS.  This needs to be retested
on other platforms.

Make/makedirdefs

@@ -0,0 +1,81 @@
+
+################################################################
+# Directories traversed from the top level
+TOP_LEVEL_DIRS = src
+
+
+################################################################
+# Directories traversed in the TOPDIR/src directory
+SRC_DIRS = \
+	osg\
+	osgUtil\
+	osgDB\
+	osgGLUT\
+	osgPlugins\
+	osgText\
+	Demos
+
+
+################################################################
+# Directories traversed in the TOPDIR/src/osgPlugins directory
+
+PLUGIN_DIRS = \
+	osg\
+	rgb\
+	lib3ds\
+	flt\
+	obj\
+	lwo\
+	txp\
+	dw\
+	bmp\
+	pic\
+	tga\
+	osgtgz\
+	tgz\
+	zip  
+
+# comment in if you have Performer installed.
+# PLUGIN_DIRS += pfb
+
+# comment in if you want Open DX support, currently not on by default
+# since we havn't yet checked compilation on all platforms yet.
+PLUGIN_DIRS += dx
+
+# comment in if you have Quicktime installed, i.e under Mac OS.
+# if in this case then its likely you'll want to comment out the below
+# png, jpeg, gif and tiff plugins.
+# PLUGIN_DIRS += quicktime
+
+# comment in if you have libpng installed.
+PLUGIN_DIRS += png
+
+# comment in if you have libjpeg installed.
+PLUGIN_DIRS += jpeg
+
+# comment in if you have libungif installed.
+PLUGIN_DIRS += gif
+
+# comment in if you have libtiff installed.
+PLUGIN_DIRS += tiff
+
+################################################################
+# Directories traversed in the TOPDIR/src/Demos directory
+
+DEMOS_DIRS = \
+	hangglide\
+	osgbillboard\
+	osgcluster\
+	osgconv\
+	osgcopy\
+	osgcube\
+	osghud\
+	osgimpostor\
+	osgreflect\
+	osgscribe\
+	osgstereoimage\
+	osgtext\
+	osgtexture\
+	osgviews\
+	osgversion\
+	sgv

Makefile

@@ -1,7 +1,8 @@
 TOPDIR = .
 include $(TOPDIR)/Make/makedefs
+include $(TOPDIR)/Make/makedirdefs
 
-DIRS = src
+DIRS = $(TOP_LEVEL_DIRS)
 
 include $(TOPDIR)/Make/makedirrules
 include $(TOPDIR)/Make/instrules

src/Demos/Makefile

@@ -1,23 +1,7 @@
 TOPDIR = ../..
 include $(TOPDIR)/Make/makedefs
+include $(TOPDIR)/Make/makedirdefs
 
-DIRS = \
-	hangglide\
-	osgbillboard\
-	osgcluster\
-	osgconv\
-	osgcopy\
-	osgcube\
-	osghud\
-	osgimpostor\
-	osgreflect\
-	osgscribe\
-	osgstereoimage\
-	osgtext\
-	osgtexture\
-	osgviews\
-	osgversion\
-	sgv
-
+DIRS = $(DEMOS_DIRS)
 
 include $(TOPDIR)/Make/makedirrules

src/Makefile

@@ -1,13 +1,7 @@
 TOPDIR = ..
 include $(TOPDIR)/Make/makedefs
+include $(TOPDIR)/Make/makedirdefs
 
-DIRS = \
-	osg\
-	osgUtil\
-	osgDB\
-	osgGLUT\
-	osgPlugins\
-	osgText\
-	Demos
+DIRS = $(SRC_DIRS)
 
 include $(TOPDIR)/Make/makedirrules

src/osgPlugins/Makefile

@@ -1,35 +1,7 @@
 TOPDIR = ../..
 include $(TOPDIR)/Make/makedefs
+include $(TOPDIR)/Make/makedirdefs
 
-#DIRS = osg rgb lib3ds flt obj lwo txp dw bmp pic tga osgtgz tgz zip  
-DIRS = osg rgb lib3ds flt obj lwo dw bmp pic tga osgtgz tgz zip  
-
-#DIRS += txp
-
-# comment in if you have Performer installed.
-# DIRS += pfb
-
-# comment in if you want Open DX support, currently not on by default
-# since we havn't yet checked compilation on all platforms yet.
-DIRS += dx
-
-# comment in if you have Quicktime installed, i.e under Mac OS.
-# if in this case then its likely you'll want to comment out the below
-# png, jpeg, gif and tiff plugins.
-# DIRS += quicktime
-
-# comment in if you have libpng installed.
-DIRS += png
-
-# comment in if you have libjpeg installed.
-DIRS += jpeg
-
-# comment in if you have libungif installed.
-DIRS += gif
-
-# comment in if you have libtiff installed.
-DIRS += tiff
-
-
+DIRS = $(PLUGIN_DIRS)
 
 include $(TOPDIR)/Make/makedirrules

src/osgPlugins/txp/trpage_read.h

@@ -77,7 +77,7 @@ private:
 #if defined(_WIN32)
     typedef std::map<trpgToken,trpgr_Token> tok_map;
 #else
-    typedef std::map<trpgToken,trpgr_Token,less<trpgToken> > tok_map;
+    typedef std::map<trpgToken,trpgr_Token,std::less<trpgToken> > tok_map;
 #endif
     tok_map tokenMap;
     trpgr_Token defCb;     // Call this when no others are called

src/osgPlugins/txp/trpage_scene.h

@@ -206,7 +206,7 @@ public:
 #if defined(_WIN32)
     typedef std::map<int,trpgReadGroupBase *> GroupMap;
 #else
-    typedef std::map<int,trpgReadGroupBase *,less<int> > GroupMap;
+    typedef std::map<int,trpgReadGroupBase *,std::less<int> > GroupMap;
 #endif
     trpgSceneGraphParser(void);
     virtual ~trpgSceneGraphParser(void) { };

src/osgPlugins/txp/trpage_sys.h

@@ -86,13 +86,8 @@ typedef double float64;
 #include <txRogueWave.h>
 #endif
 
-#if defined(_WIN32)
 #include <vector>
 #include <map>
-#else
-#include <vector.h>
-#include <map.h>
-#endif
 
 #if defined(_WIN32)     // PJM
 // Had to take this out because of an iostream conflict

src/osgPlugins/txp/trpage_write.h

@@ -251,9 +251,6 @@ public:
 
     bool isValid(void) const;
     char* getDir(void){return dir;};
-protected:
-    // Set if we're adding to an existing archive
-    bool isRegenerate;
 
     // Used to keep track of which tiles are in which file
     class TileFileEntry {
@@ -262,6 +259,10 @@ protected:
         float zmin,zmax;
         uint32 offset;  // Offset into file
     };
+protected:
+    // Set if we're adding to an existing archive
+    bool isRegenerate;
+
     class TileFile {
     public:
         int id;