From 49a93076c133ee96cdbbddbda1e9f35f5ccfc6a6 Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Fri, 25 Jul 2003 23:49:03 +0000 Subject: [PATCH] Removed references to PRODUCER_INCLUDE_DIR and PRODUCER_LIB_DIR in the local makefiles. Small change in txp loader for sun build --- Make/makedefs | 11 ++++++++++- examples/osganimate/GNUmakefile | 3 +-- examples/osgautotransform/GNUmakefile | 3 +-- examples/osgbillboard/GNUmakefile | 3 +-- examples/osgcallback/GNUmakefile | 3 +-- examples/osgcameragroup/GNUmakefile | 6 +++--- examples/osgclip/GNUmakefile | 3 +-- examples/osgcluster/GNUmakefile | 3 +-- examples/osgconv/GNUmakefile | 2 +- examples/osgcopy/GNUmakefile | 3 +-- examples/osgcubemap/GNUmakefile | 3 +-- examples/osggeodemo/GNUmakefile | 3 +-- examples/osggeometry/GNUmakefile | 3 +-- examples/osghangglide/GNUmakefile | 3 +-- examples/osghud/GNUmakefile | 3 +-- examples/osgimpostor/GNUmakefile | 3 +-- examples/osgkeyboard/GNUmakefile | 3 +-- examples/osglight/GNUmakefile | 3 +-- examples/osglightpoint/GNUmakefile | 3 +-- examples/osglogo/GNUmakefile | 3 +-- examples/osgmultitexture/GNUmakefile | 3 +-- examples/osgoccluder/GNUmakefile | 3 +-- examples/osgparticle/GNUmakefile | 3 +-- examples/osgpick/GNUmakefile | 3 +-- examples/osgprerender/GNUmakefile | 3 +-- examples/osgreflect/GNUmakefile | 3 +-- examples/osgscribe/GNUmakefile | 3 +-- examples/osgsequence/GNUmakefile | 3 +-- examples/osgshaders/GNUmakefile | 3 +-- examples/osgshadowtexture/GNUmakefile | 3 +-- examples/osgshape/GNUmakefile | 3 +-- examples/osgstereoimage/GNUmakefile | 3 +-- examples/osgteapot/GNUmakefile | 3 +-- examples/osgtext/GNUmakefile | 3 +-- examples/osgtexture1D/GNUmakefile | 3 +-- examples/osgtexture2D/GNUmakefile | 3 +-- examples/osgtexture3D/GNUmakefile | 3 +-- examples/osgtexturerectangle/GNUmakefile | 3 +-- examples/osgunittests/GNUmakefile | 3 +-- examples/osgversion/GNUmakefile | 3 +-- examples/osgvertexprogram/GNUmakefile | 3 +-- examples/osgviewer/GNUmakefile | 3 +-- examples/osgwindows/GNUmakefile | 3 +-- examples/slideshow3D/GNUmakefile | 3 +-- src/osgPlugins/txp/trpage_write.h | 10 ++++++---- src/osgProducer/GNUmakefile | 3 +-- 46 files changed, 62 insertions(+), 93 deletions(-) diff --git a/Make/makedefs b/Make/makedefs index 84fb02b82..362d1c22e 100644 --- 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 diff --git a/examples/osganimate/GNUmakefile b/examples/osganimate/GNUmakefile index d37054623..da9b396b5 100644 --- 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 diff --git a/examples/osgautotransform/GNUmakefile b/examples/osgautotransform/GNUmakefile index eb748967c..020c00bd6 100644 --- 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 diff --git a/examples/osgbillboard/GNUmakefile b/examples/osgbillboard/GNUmakefile index 414439213..b86027fc5 100644 --- 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 diff --git a/examples/osgcallback/GNUmakefile b/examples/osgcallback/GNUmakefile index 6ed82ad12..e4994df16 100644 --- 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 diff --git a/examples/osgcameragroup/GNUmakefile b/examples/osgcameragroup/GNUmakefile index 399f1defd..cf98bdf89 100644 --- 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) diff --git a/examples/osgclip/GNUmakefile b/examples/osgclip/GNUmakefile index f95ecf85a..7a9f258b8 100644 --- 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 diff --git a/examples/osgcluster/GNUmakefile b/examples/osgcluster/GNUmakefile index ef7c429d6..3bafec026 100644 --- 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 diff --git a/examples/osgconv/GNUmakefile b/examples/osgconv/GNUmakefile index 85b2e4344..947448973 100644 --- 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)\ diff --git a/examples/osgcopy/GNUmakefile b/examples/osgcopy/GNUmakefile index f572dec16..01c3f7ba0 100644 --- 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 diff --git a/examples/osgcubemap/GNUmakefile b/examples/osgcubemap/GNUmakefile index 2f2cda8a4..bce7e89b3 100644 --- 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 diff --git a/examples/osggeodemo/GNUmakefile b/examples/osggeodemo/GNUmakefile index 227a6665d..43bfcc18d 100644 --- 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 diff --git a/examples/osggeometry/GNUmakefile b/examples/osggeometry/GNUmakefile index 92d6ecbba..9d3758515 100644 --- 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 diff --git a/examples/osghangglide/GNUmakefile b/examples/osghangglide/GNUmakefile index c29e06b7e..e3b59ba4e 100644 --- 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 diff --git a/examples/osghud/GNUmakefile b/examples/osghud/GNUmakefile index e0e8955a0..bf5c8f9d4 100644 --- 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 diff --git a/examples/osgimpostor/GNUmakefile b/examples/osgimpostor/GNUmakefile index e9ab09a7a..d9f615e43 100644 --- 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 diff --git a/examples/osgkeyboard/GNUmakefile b/examples/osgkeyboard/GNUmakefile index d89000939..035cba9ce 100644 --- 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 diff --git a/examples/osglight/GNUmakefile b/examples/osglight/GNUmakefile index c8f42339d..b64f3aeac 100644 --- 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 diff --git a/examples/osglightpoint/GNUmakefile b/examples/osglightpoint/GNUmakefile index c3a71be54..809b80185 100644 --- 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 diff --git a/examples/osglogo/GNUmakefile b/examples/osglogo/GNUmakefile index 7bbeac234..0365c9d99 100644 --- 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 diff --git a/examples/osgmultitexture/GNUmakefile b/examples/osgmultitexture/GNUmakefile index 94ac15406..a40df0923 100644 --- 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 diff --git a/examples/osgoccluder/GNUmakefile b/examples/osgoccluder/GNUmakefile index 3b898e168..d8309fdfc 100644 --- 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 diff --git a/examples/osgparticle/GNUmakefile b/examples/osgparticle/GNUmakefile index 18bb750db..a768bbfce 100644 --- 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 diff --git a/examples/osgpick/GNUmakefile b/examples/osgpick/GNUmakefile index 054165d57..0ad128a4c 100644 --- 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 diff --git a/examples/osgprerender/GNUmakefile b/examples/osgprerender/GNUmakefile index 6182a06b9..9b358cd37 100644 --- 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 diff --git a/examples/osgreflect/GNUmakefile b/examples/osgreflect/GNUmakefile index 51daec796..94aa12a5d 100644 --- 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 diff --git a/examples/osgscribe/GNUmakefile b/examples/osgscribe/GNUmakefile index 16e3a2da2..1e8b8d236 100644 --- 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 diff --git a/examples/osgsequence/GNUmakefile b/examples/osgsequence/GNUmakefile index 207c7046a..c9c4fecb7 100644 --- 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 diff --git a/examples/osgshaders/GNUmakefile b/examples/osgshaders/GNUmakefile index c5432bc99..cb079de3c 100644 --- 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 diff --git a/examples/osgshadowtexture/GNUmakefile b/examples/osgshadowtexture/GNUmakefile index 0a111bddc..7b0a7527b 100644 --- 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 diff --git a/examples/osgshape/GNUmakefile b/examples/osgshape/GNUmakefile index d73505342..821600351 100644 --- 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 diff --git a/examples/osgstereoimage/GNUmakefile b/examples/osgstereoimage/GNUmakefile index 7df712b5f..1dd248ccd 100644 --- 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 diff --git a/examples/osgteapot/GNUmakefile b/examples/osgteapot/GNUmakefile index a3d086e66..0477abe47 100644 --- 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 diff --git a/examples/osgtext/GNUmakefile b/examples/osgtext/GNUmakefile index 52c13079e..2c9e71b8a 100644 --- 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 diff --git a/examples/osgtexture1D/GNUmakefile b/examples/osgtexture1D/GNUmakefile index b61d6e2c6..14399080d 100644 --- 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 diff --git a/examples/osgtexture2D/GNUmakefile b/examples/osgtexture2D/GNUmakefile index ed80feb4b..839cc127b 100644 --- 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 diff --git a/examples/osgtexture3D/GNUmakefile b/examples/osgtexture3D/GNUmakefile index 9ab7e2536..880a39719 100644 --- 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 diff --git a/examples/osgtexturerectangle/GNUmakefile b/examples/osgtexturerectangle/GNUmakefile index d58ee7724..74bee3411 100644 --- 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 diff --git a/examples/osgunittests/GNUmakefile b/examples/osgunittests/GNUmakefile index c6d886cc7..4db22c51f 100644 --- 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 diff --git a/examples/osgversion/GNUmakefile b/examples/osgversion/GNUmakefile index 528227634..9a171af30 100755 --- 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 diff --git a/examples/osgvertexprogram/GNUmakefile b/examples/osgvertexprogram/GNUmakefile index 766e94a05..6e60964a4 100644 --- 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 diff --git a/examples/osgviewer/GNUmakefile b/examples/osgviewer/GNUmakefile index 9ec5f5958..5537a60c0 100644 --- 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 diff --git a/examples/osgwindows/GNUmakefile b/examples/osgwindows/GNUmakefile index 3443c1797..9270bc396 100644 --- 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 diff --git a/examples/slideshow3D/GNUmakefile b/examples/slideshow3D/GNUmakefile index 4a3a117b7..9b76da302 100644 --- 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 diff --git a/src/osgPlugins/txp/trpage_write.h b/src/osgPlugins/txp/trpage_write.h index e66bcd8db..3b82a26cc 100644 --- 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 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 diff --git a/src/osgProducer/GNUmakefile b/src/osgProducer/GNUmakefile index 9c44ca20f..7a0a9d8ae 100644 --- 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