Removed references to PRODUCER_INCLUDE_DIR and PRODUCER_LIB_DIR in the

local makefiles. Small change in txp loader for sun build
2003-07-25 23:49:03 +00:00
parent e26ef983c4
commit 49a93076c1
46 changed files with 62 additions and 93 deletions
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -113,6 +113,14 @@ ifneq ("$(OPENTHREADS_LIB_DIR)","")
 LDFLAGS += -L$(OPENTHREADS_LIB_DIR)
 endif

+ifneq ("$(PRODUCER_INC_DIR)","")
+INC += -I$(PRODUCER_INC_DIR)
+endif
+
+ifneq ("$(PRODUCER_LIB_DIR)","")
+LDFLAGS += -L$(PRODUCER_LIB_DIR)
+endif
+

 RECURSIVE_TARGETS = \
 	  opt\
@@ -157,7 +165,7 @@ ifeq ($(OS),SunOS)
    JPEG_LIBS         = -ljpeg 
    PNG_LIBS          = -lpng -lz 
    FREETYPE_LIB      = -lfreetype
-    OTHER_LIBS        = 
+    OTHER_LIBS        =  -lOpenThreads

  #### using forte compilers (default)
  else
@@ -193,6 +201,7 @@ ifeq ($(OS),SunOS)
    INSTDEVCMD        = cp
    INST_LOCATION     = /opt/OpenSceneGraph
    MAKEDIST          = $(TOPDIR)/Make/makepkg
+    OTHER_LIBS        =  -lOpenThreads
 endif

 #### IRIX Specific definitions
--- a/examples/osganimate/GNUmakefile
+++ b/examples/osganimate/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osganimate

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC      += -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgautotransform/GNUmakefile
+++ b/examples/osgautotransform/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osgautotransform

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC 	 +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgbillboard/GNUmakefile
+++ b/examples/osgbillboard/GNUmakefile
@@ -13,7 +13,6 @@ INSTFILES = \

 EXEC = osgbillboard

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC 	 +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgcallback/GNUmakefile
+++ b/examples/osgcallback/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osgcallback

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC      += -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgcameragroup/GNUmakefile
+++ b/examples/osgcameragroup/GNUmakefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	osgcameragroup.cpp\

-LIBS     += -losgProducer -lProducer -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
+LIBS     += -losgProducer -lProducer -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) -lOpenThreads

 INSTFILES = \
 	$(CXXFILES)\
@@ -12,8 +12,8 @@ INSTFILES = \

 EXEC = osgcameragroup

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR) -L/usr/X11R6/lib
+INC      += -I/usr/X11R6/include 
+LDFLAGS  += -L/usr/X11R6/lib


 ifeq ($(USE_OPEN_THREAD),1)
--- a/examples/osgclip/GNUmakefile
+++ b/examples/osgclip/GNUmakefile
@@ -12,7 +12,6 @@ INSTFILES = \

 EXEC = osgclip

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgcluster/GNUmakefile
+++ b/examples/osgcluster/GNUmakefile
@@ -21,7 +21,6 @@ INSTFILES = \
 EXEC = osgcluster


-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgconv/GNUmakefile
+++ b/examples/osgconv/GNUmakefile
@@ -10,7 +10,7 @@ CXXFILES =\
 HEADERFILES = \
 	OrientationConverter.h

-LIBS     += -losg -losgUtil -losgGA -losgDB $(GL_LIBS) $(OTHER_LIBS) 
+LIBS     += -losg -losgUtil -losgGA -losgDB $(GL_LIBS) $(OTHER_LIBS)  

 INSTFILES = \
 	$(CXXFILES)\
--- a/examples/osgcopy/GNUmakefile
+++ b/examples/osgcopy/GNUmakefile
@@ -12,7 +12,6 @@ INSTFILES = \

 EXEC = osgcopy

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgcubemap/GNUmakefile
+++ b/examples/osgcubemap/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osgcubemap

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 

--- a/examples/osggeodemo/GNUmakefile
+++ b/examples/osggeodemo/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osggeodemo

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 

--- a/examples/osggeometry/GNUmakefile
+++ b/examples/osggeometry/GNUmakefile
@@ -12,7 +12,6 @@ INSTFILES = \

 EXEC = osggeometry

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osghangglide/GNUmakefile
+++ b/examples/osghangglide/GNUmakefile
@@ -27,7 +27,6 @@ INSTFILES = \

 EXEC = osghangglide

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osghud/GNUmakefile
+++ b/examples/osghud/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osghud

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgimpostor/GNUmakefile
+++ b/examples/osgimpostor/GNUmakefile
@@ -13,7 +13,6 @@ INSTFILES = \

 EXEC = osgimpostor

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgkeyboard/GNUmakefile
+++ b/examples/osgkeyboard/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osgkeyboard

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 

--- a/examples/osglight/GNUmakefile
+++ b/examples/osglight/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osglight

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 

--- a/examples/osglightpoint/GNUmakefile
+++ b/examples/osglightpoint/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osglightpoint

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/includ

 include $(TOPDIR)/Make/makerules 

--- a/examples/osglogo/GNUmakefile
+++ b/examples/osglogo/GNUmakefile
@@ -12,7 +12,6 @@ INSTFILES = \

 EXEC = osglogo

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgmultitexture/GNUmakefile
+++ b/examples/osgmultitexture/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osgmultitexture

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgoccluder/GNUmakefile
+++ b/examples/osgoccluder/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osgoccluder

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgparticle/GNUmakefile
+++ b/examples/osgparticle/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osgparticle

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgpick/GNUmakefile
+++ b/examples/osgpick/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osgpick

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include 
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include 

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgprerender/GNUmakefile
+++ b/examples/osgprerender/GNUmakefile
@@ -12,7 +12,6 @@ INSTFILES = \

 EXEC = osgprerender

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgreflect/GNUmakefile
+++ b/examples/osgreflect/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osgreflect

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgscribe/GNUmakefile
+++ b/examples/osgscribe/GNUmakefile
@@ -12,7 +12,6 @@ INSTFILES = \

 EXEC = osgscribe

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgsequence/GNUmakefile
+++ b/examples/osgsequence/GNUmakefile
@@ -12,7 +12,6 @@ INSTFILES = \

 EXEC = osgsequence

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgshaders/GNUmakefile
+++ b/examples/osgshaders/GNUmakefile
@@ -13,8 +13,7 @@ INSTFILES = \

 EXEC = osgshaders

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include 
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include 

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgshadowtexture/GNUmakefile
+++ b/examples/osgshadowtexture/GNUmakefile
@@ -13,7 +13,6 @@ INSTFILES = \

 EXEC = osgshadowtexture

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgshape/GNUmakefile
+++ b/examples/osgshape/GNUmakefile
@@ -12,7 +12,6 @@ INSTFILES = \

 EXEC = osgshape

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgstereoimage/GNUmakefile
+++ b/examples/osgstereoimage/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osgstereoimage

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgteapot/GNUmakefile
+++ b/examples/osgteapot/GNUmakefile
@@ -12,7 +12,6 @@ INSTFILES = \

 EXEC = osgteapot

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgtext/GNUmakefile
+++ b/examples/osgtext/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osgtext

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgtexture1D/GNUmakefile
+++ b/examples/osgtexture1D/GNUmakefile
@@ -12,7 +12,6 @@ INSTFILES = \

 EXEC = osgtexture1D

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgtexture2D/GNUmakefile
+++ b/examples/osgtexture2D/GNUmakefile
@@ -12,7 +12,6 @@ INSTFILES = \

 EXEC = osgtexture2D

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgtexture3D/GNUmakefile
+++ b/examples/osgtexture3D/GNUmakefile
@@ -12,7 +12,6 @@ INSTFILES = \

 EXEC = osgtexture3D

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgtexturerectangle/GNUmakefile
+++ b/examples/osgtexturerectangle/GNUmakefile
@@ -12,7 +12,6 @@ INSTFILES = \

 EXEC = osgtexturerectangle

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgunittests/GNUmakefile
+++ b/examples/osgunittests/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osgunittests

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgversion/GNUmakefile
+++ b/examples/osgversion/GNUmakefile
@@ -12,7 +12,6 @@ INSTFILES = \

 EXEC = osgversion

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgvertexprogram/GNUmakefile
+++ b/examples/osgvertexprogram/GNUmakefile
@@ -12,7 +12,6 @@ INSTFILES = \

 EXEC = osgvertexprogram

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgviewer/GNUmakefile
+++ b/examples/osgviewer/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osgviewer

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include 
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include 

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgwindows/GNUmakefile
+++ b/examples/osgwindows/GNUmakefile
@@ -12,8 +12,7 @@ INSTFILES = \

 EXEC = osgwindows

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include 
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include 

 include $(TOPDIR)/Make/makerules 

--- a/examples/slideshow3D/GNUmakefile
+++ b/examples/slideshow3D/GNUmakefile
@@ -16,8 +16,7 @@ INSTFILES = \

 EXEC = slideshow3D

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include -I/usr/include/libxml2
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC +=  -I/usr/X11R6/include -I/usr/include/libxml2

 include $(TOPDIR)/Make/makerules 

--- a/src/osgPlugins/txp/trpage_write.h
+++ b/src/osgPlugins/txp/trpage_write.h
@@ -268,11 +268,7 @@ public:
 	bool isValid(void) const;
 	const char *getErrMess() 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 {
 	public:
 		int x,y,lod;    // Identifying info for tile
@@ -285,6 +281,12 @@ protected:
 		std::vector<TileFileEntry> tiles;
 	};

+protected:
+	// Set if we're adding to an existing archive
+	bool isRegenerate;
+
+	// Used to keep track of which tiles are in which file
+
 	trpgEndian ness,cpuNess;
 	int version;
 	// Fed in from the outside
--- a/src/osgProducer/GNUmakefile
+++ b/src/osgProducer/GNUmakefile
@@ -16,7 +16,6 @@ DEF  += -DOSGPRODUCER_LIBRARY
 TARGET_BASENAME = osgProducer
 LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT)

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC += -I/usr/X11R6/include
    
 include $(TOPDIR)/Make/makerules