From e0adca775beee89023db992399a78b315d613c7a Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Wed, 3 Apr 2002 17:42:12 +0000 Subject: [PATCH] Reinstated Norman Vine's TARGET_BASENAME variable in the makefiles and added prefixes and suffixes to libs and plugins. ALl this to accomodate cygwin... Also added INST_SYS_PREFIX and INST_SHARE_PREFIX for installation, as well as "standardizing" the install locations for the various platforms. --- Make/instrules | 20 +++---- Make/makedefs | 74 +++++++++++++++++--------- Make/makerules | 25 +++++---- dist/RedHatRPM/Makefile | 25 +++++++++ dist/RedHatRPM/makespec | 8 ++- dist/RedHatRPM/osg.spec | 81 ++++++++++++++++++++--------- src/Demos/Makefile | 1 + src/Demos/osgversion/Makefile | 11 ++++ src/Demos/osgversion/osgversion.cpp | 9 ++++ src/osg/Makefile | 3 +- src/osgDB/Makefile | 3 +- src/osgGLUT/Makefile | 3 +- src/osgPlugins/Makefile | 5 +- src/osgPlugins/bmp/Makefile | 3 +- src/osgPlugins/dw/Makefile | 3 +- src/osgPlugins/dx/Makefile | 3 +- src/osgPlugins/flt/Makefile | 3 +- src/osgPlugins/gif/Makefile | 3 +- src/osgPlugins/jpeg/Makefile | 3 +- src/osgPlugins/lib3ds/Makefile | 3 +- src/osgPlugins/lwo/Makefile | 3 +- src/osgPlugins/obj/Makefile | 3 +- src/osgPlugins/osg/Makefile | 3 +- src/osgPlugins/osgtgz/Makefile | 3 +- src/osgPlugins/pfb/Makefile | 3 +- src/osgPlugins/pic/Makefile | 3 +- src/osgPlugins/png/Makefile | 3 +- src/osgPlugins/quicktime/Makefile | 3 +- src/osgPlugins/rgb/Makefile | 3 +- src/osgPlugins/tga/Makefile | 3 +- src/osgPlugins/tgz/Makefile | 3 +- src/osgPlugins/tiff/Makefile | 3 +- src/osgPlugins/txp/Makefile | 3 +- src/osgPlugins/zip/Makefile | 3 +- src/osgText/Makefile | 3 +- src/osgUtil/Makefile | 3 +- src/osgUtil/RenderStage.cpp | 1 + 37 files changed, 233 insertions(+), 105 deletions(-) create mode 100755 src/Demos/osgversion/Makefile create mode 100644 src/Demos/osgversion/osgversion.cpp diff --git a/Make/instrules b/Make/instrules index d8580aa68..834b6b440 100644 --- a/Make/instrules +++ b/Make/instrules @@ -2,11 +2,11 @@ install : instbin instdev instbin : @$(MAKE) INSTSRC=$(TOPDIR)/bin INSTDEST=$(INST_DEMOS) \ - INSTALL?="$(INSTBIN)" __install + INSTALL?="$(INSTBINCMD)" __install @$(MAKE) INSTSRC=$(TOPDIR)/lib INSTDEST=$(INST_LIBS) \ - INSTALL?="$(INSTBIN)" __install + INSTALL?="$(INSTBINCMD)" __install @$(MAKE) INSTSRC=$(TOPDIR)/lib/osgPlugins INSTDEST=$(INST_PLUGINS)\ - INSTALL?="$(INSTBIN)" __install + INSTALL?="$(INSTBINCMD)" __install instdev : @@ -15,7 +15,7 @@ instdev : if [ -d $(TOPDIR)/include/$$d ]; \ then \ $(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d\ - INSTALL?="$(INSTDEV)" __install;\ + INSTALL?="$(INSTDEVCMD)" __install;\ fi\ done @for d in `ls -1 $(TOPDIR)/src/Demos | grep -v CVS`; \ @@ -23,7 +23,7 @@ instdev : if [ -d $(TOPDIR)/src/Demos/$$d ]; \ then \ $(MAKE) INSTSRC=$(TOPDIR)/src/Demos/$$d INSTDEST=$(INST_DEMO_SRC)/$$d\ - INSTALL?="$(INSTDEV)" __install;\ + INSTALL?="$(INSTDEVCMD)" __install;\ fi\ done @@ -39,11 +39,11 @@ instclean : instcleanbin instcleandev instcleanbin : @$(MAKE) INSTSRC=$(TOPDIR)/bin INSTDEST=$(INST_DEMOS) \ - INSTALL?="$(INSTBIN)" __instclean + INSTALL?="$(INSTBINCMD)" __instclean @$(MAKE) INSTSRC=$(TOPDIR)/lib INSTDEST=$(INST_LIBS) \ - INSTALL?="$(INSTBIN)" __instclean + INSTALL?="$(INSTBINCMD)" __instclean @$(MAKE) INSTSRC=$(TOPDIR)/lib/osgPlugins INSTDEST=$(INST_PLUGINS)\ - INSTALL?="$(INSTBIN)" __instclean + INSTALL?="$(INSTBINCMD)" __instclean instcleandev : @for d in `ls -1 $(TOPDIR)/include/ | grep -v CVS`; \ @@ -51,7 +51,7 @@ instcleandev : if [ -d $(TOPDIR)/include/$$d ]; \ then \ $(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d\ - INSTALL?="$(INSTDEV)" __instclean;\ + INSTALL?="$(INSTDEVCMD)" __instclean;\ fi\ done @for d in `ls -1 $(TOPDIR)/src/Demos | grep -v CVS`; \ @@ -59,7 +59,7 @@ instcleandev : if [ -d $(TOPDIR)/src/Demos/$$d ]; \ then \ $(MAKE) INSTSRC=$(TOPDIR)/src/Demos/$$d INSTDEST=$(INST_DEMO_SRC)/$$d\ - INSTALL?="$(INSTDEV)" __instclean;\ + INSTALL?="$(INSTDEVCMD)" __instclean;\ fi\ done diff --git a/Make/makedefs b/Make/makedefs index 80a070cf0..ec1ae97cb 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -28,19 +28,27 @@ BININST = bin LIBINST = lib PLUGININST = lib/osgPlugins -INST_DEMOS = /usr/share/OpenSceneGraph/bin -INST_LIBS = /usr/lib$(ARCH) -INST_PLUGINS = /usr/lib$(ARCH)/osgPlugins -INST_INCLUDE = /usr/include -INST_DEMO_SRC = /usr/share/OpenSceneGraph/src/demos -INST_DATA = /usr/share/OpenSceneGraph/data +INST_SYS_PREFIX = /usr/local +INST_LIBS = $(INST_SYS_PREFIX)/lib$(ARCH) +INST_PLUGINS = $(INST_SYS_PREFIX)/lib$(ARCH)/osgPlugins +INST_INCLUDE = $(INST_SYS_PREFIX)/include +INST_SHARE_PREFIX = /usr/share +INST_DEMOS = $(INST_SHARE_PREFIX)/OpenSceneGraph/bin +INST_DEMO_SRC = $(INST_SHARE_PREFIX)/OpenSceneGraph/src/demos +INST_DOC = $(INST_SHARE_REFIX)/OpenSceneGraph/doc +INST_DATA = $(INST_SHARE_PREFIX)/OpenSceneGraph/data LINK = ln -sf -INSTBIN = install -m 755 -INSTDEV = install -m 644 +INSTBINCMD = install -m 755 +INSTDEVCMD = install -m 644 INSTLINKBIN = $(LINK) INSTLINKDEV = $(LINK) +LIB_PREFIX = lib +LIB_EXT = so +PLUGIN_PREFIX = osgdb_ +PLUGIN_EXT = so + ALL_TARGETS = \ opt\ @@ -48,6 +56,9 @@ ALL_TARGETS = \ clean\ cleandbg\ cleanopt\ + cleanlite\ + cleanliteopt\ + cleanlitedbg\ clobber\ beautify\ docs\ @@ -60,7 +71,7 @@ ifeq ($(OS),SunOS) DEPARG = -xM1 INC += DEF += -features=extensions - OPTF = -xO2 + OPTF = -xO4 DBGF = -g SHARED = -G ifeq ($(ARCH),64) @@ -77,12 +88,17 @@ endif X_LIBS = -lXext -lXmu -lXi -lX11 SOCKET_LIBS = -lsocket -lnsl OTHER_LIBS = -lCstd - SO_EXT = so - PLUGIN_EXT = so TIFF_LIB = -ltiff -INSTBIN = cp -INSTDEV = cp + INSTBINCMD = cp + INSTDEVCMD = cp + + INST_DEMOS = /opt/OpenSceneGraph/bin + INST_LIBS = /opt/OpenSceneGrpah/lib$(ARCH) /usr/lib + INST_PLUGINS = /opt/OpenSceneGraph/lib/osgPlugins + INST_INCLUDE = /opt/OpenSceneGraph/include + INST_DEMO_SRC = /opt/OpenSceneGraph/src/demos + INST_DATA = /opt/OpenSceneGraph/data endif @@ -113,8 +129,6 @@ endif X_LIBS = -lXext -lXi -lXmu -lX11 SOCKET_LIBS = OTHER_LIBS = -lm - SO_EXT = so - PLUGIN_EXT = so # INSTLINKBIN = install -t -m 755 # INSTLINKDEV = install -t -m 644 @@ -140,8 +154,6 @@ ifeq ($(OS),Linux) X_LIBS = -lXmu -lX11 SOCKET_LIBS = OTHER_LIBS = - SO_EXT = so - PLUGIN_EXT = so endif #### FreeBSD specific definitions @@ -163,8 +175,13 @@ ifeq ($(OS),FreeBSD) X_LIBS = -lXmu -lX11 SOCKET_LIBS = OTHER_LIBS = - SO_EXT = so - PLUGIN_EXT = so + + INST_DEMOS = /usr/X11R6/bin + INST_LIBS = /usr/X11R6/lib + INST_PLUGINS = /usr/X11R6/lib/osgPlugins + INST_INCLUDE = /usr/X11R6/include + INST_DEMO_SRC = /usr/share/OpenSceneGraph/src/demos + INST_DATA = /usr/share/OpenSceneGraph/data endif #### Mac OSX specific definitions @@ -187,8 +204,8 @@ ifeq ($(OS),Darwin) X_LIBS = SOCKET_LIBS = OTHER_LIBS = -lm -ldl -lstdc++ -lobjc - SO_EXT = dylib - PLUGIN_EXT = so + LIBEXT = dylib + PLUGINEXT = so QUICKTIME_LIB = -framework QuickTime TIFF_LIB = -ltiff @@ -204,8 +221,8 @@ ifeq ($(OS),CYGWIN_NT-5.0) DBGF = -g SHARED = -shared\ -Wl,--export-all-symbols \ - -Wl,--output-def,lib$$TARGET_BASENAME.def \ - -Wl,--out-implib,$(TOPDIR)/lib/lib$$TARGET_BASENAME.a \ + -Wl,--output-def,$(LIB_PREFIX)$(TARGET_BASENAME).def \ + -Wl,--out-implib,$(TOPDIR)/lib/$(LIB_PREFIX)$(TARGET_BASENAME).a \ ARCHARGS = LINKARGS = -W -Wall @@ -233,9 +250,14 @@ ifeq ($(OS),CYGWIN_NT-5.0) -losgdb_zip SOCKET_LIBS = OTHER_LIBS = $(GL_LIBS) - SO_EXT = dll - PLUGIN_EXT = dll - LINK = cp -f + + LIB_PREFIX = cyg + LIB_EXT = dll + PLUGIN_PREFIX = osgdb_ + PLUGIN_EXT = dll + + LINK = cp -f + endif diff --git a/Make/makerules b/Make/makerules index f1af43ed1..6f7f67930 100644 --- a/Make/makerules +++ b/Make/makerules @@ -64,7 +64,6 @@ $(PLUGIN) : $(OBJS) else $(LIB) $(PLUGIN) : $(OBJS) - TARGET_BASENAME=`echo $@ | sed 's/.$(PLUGIN_EXT)//' | sed 's/lib//'`;\ $(C++) $(LDFLAGS) $(SHARED) $(OBJS) $(LIBS) -o $@ endif @@ -73,41 +72,41 @@ $(EXEC:=.dbg) : @[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR) @cd $(DEBUGDIR); \ $(MAKE) -f ../Makefile DOF=$(DBGF) TOPDIR=../${TOPDIR} \ - THISDIR=../$(THISDIR)\ - MAKEDEPEND=Makedepend $(EXEC) + THISDIR=../$(THISDIR)\ + MAKEDEPEND=Makedepend $(EXEC) @$(MAKE) LNSRC=$(DEBUGDIR)/$(EXEC) LNDEST=$(BININST)/$(EXEC) __link $(LIB:=.dbg) : @[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR) - @cd $(DEBUGDIR); \ + @cd $(DEBUGDIR);\ $(MAKE) -f ../Makefile DOF=$(DBGF) TOPDIR=../${TOPDIR} \ - THISDIR=../$(THISDIR)\ - MAKEDEPEND=Makedepend $(LIB) + THISDIR=../$(THISDIR)\ + MAKEDEPEND=Makedepend $(LIB) @$(MAKE) LNSRC=$(DEBUGDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link $(PLUGIN:=.dbg) : @[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR) @cd $(DEBUGDIR); \ $(MAKE) -f ../Makefile DOF=$(DBGF) TOPDIR=../${TOPDIR} \ - THISDIR=../$(THISDIR)\ - MAKEDEPEND=Makedepend $(PLUGIN) + THISDIR=../$(THISDIR)\ + MAKEDEPEND=Makedepend $(PLUGIN) @$(MAKE) LNSRC=$(DEBUGDIR)/$(PLUGIN) LNDEST=$(PLUGININST)/$(PLUGIN) __link $(EXEC:=.opt) : @[ -d $(OPTDIR) ] || mkdir $(OPTDIR) @cd $(OPTDIR); \ $(MAKE) -f ../Makefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ - THISDIR=../$(THISDIR)\ - MAKEDEPEND=Makedepend $(EXEC) + THISDIR=../$(THISDIR)\ + MAKEDEPEND=Makedepend $(EXEC) @$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(EXEC) __link $(LIB:=.opt) : @[ -d $(OPTDIR) ] || mkdir $(OPTDIR) - @cd $(OPTDIR); \ + @cd $(OPTDIR);\ $(MAKE) -f ../Makefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ - THISDIR=../$(THISDIR)\ - MAKEDEPEND=Makedepend $(LIB) + THISDIR=../$(THISDIR)\ + MAKEDEPEND=Makedepend $(LIB) @$(MAKE) LNSRC=$(OPTDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link $(PLUGIN:=.opt) : diff --git a/dist/RedHatRPM/Makefile b/dist/RedHatRPM/Makefile index e69de29bb..3705f4a6e 100644 --- a/dist/RedHatRPM/Makefile +++ b/dist/RedHatRPM/Makefile @@ -0,0 +1,25 @@ +TOPDIR = ../.. +include $(TOPDIR)/Make/makedefs +SHELL = /bin/sh + +all :: rpm + + +rpm : osg.spec tardist + rpm -bb --clean osg.spec + +osg.spec : version makespec + ./makespec + +tardist : + (cd $(TOPDIR)/..; \ + tar cf - ${BINDIRS} | gzip > \ + /usr/src/redhat/SOURCES/osg-${OSGVERSION}.tar.gz) + + +clean : + rm -f osg.spec + + +version : version.o + $(CXX) $(LDFLAGS) version.o -losg -o $@ diff --git a/dist/RedHatRPM/makespec b/dist/RedHatRPM/makespec index 129601057..8136dca36 100755 --- a/dist/RedHatRPM/makespec +++ b/dist/RedHatRPM/makespec @@ -38,8 +38,12 @@ list_attr_files() } [ -z "$OSGHOME" ] && (echo Please define OSGHOME; exit 1) -[ -z "$OSGVERSION" ] && (echo Please define OSGVERSION; exit 1) -[ -z "$OSGRELEASE" ] && (echo Please define OSGRELEASE; exit 1) + +OSGVERSION=`./version` +OSGRELEASE=1 + +##[ -z "$OSGVERSION" ] && (echo Please define OSGVERSION; exit 1) +##[ -z "$OSGRELEASE" ] && (echo Please define OSGRELEASE; exit 1) diff --git a/dist/RedHatRPM/osg.spec b/dist/RedHatRPM/osg.spec index 1170ede1b..7be02e51b 100644 --- a/dist/RedHatRPM/osg.spec +++ b/dist/RedHatRPM/osg.spec @@ -1,13 +1,13 @@ Summary: Open Scene Graph Name: osg -Version: 0.8.42 +Version: 0.8.44 Release: 1 Copyright: GLPL Group: Graphics -Source: osg-0.8.42.tar.gz +Source: osg-0.8.44.tar.gz URL: http://www.openscenegraph.org -Packager: Robert Osfield +Packager: %description @@ -18,24 +18,33 @@ Open Scene Graph is an open-source scene graph API. %build %install -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/bin/hangglide /usr/bin/hangglide -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/bin/osgconv /usr/bin/osgconv -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/bin/osgcube /usr/bin/osgcube -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/bin/osgimpostor /usr/bin/osgimpostor -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/bin/osgreflect /usr/bin/osgreflect -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/bin/osgtexture /usr/bin/osgtexture -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/bin/osgviews /usr/bin/osgviews -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/bin/sgv /usr/bin/sgv -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/lib/libosgDB.so /usr/lib/libosgDB.so -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/lib/libosgGLUT.so /usr/lib/libosgGLUT.so -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/lib/libosg.so /usr/lib/libosg.so -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/lib/libosgUtil.so /usr/lib/libosgUtil.so -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/lib/osgPlugins /usr/lib/osgPlugins -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/include/osg /usr/include/osg -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/include/osgDB /usr/include/osgDB -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/include/osgGLUT /usr/include/osgGLUT -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/include/osgUtil /usr/include/osgUtil -cp -rf /usr/src/redhat/BUILD/osg-0.8.42/include/osgWX /usr/include/osgWX +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/bin/CVS /usr/bin/CVS +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/bin/osgbillboard /usr/bin/osgbillboard +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/bin/osgcluster /usr/bin/osgcluster +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/bin/osgconv /usr/bin/osgconv +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/bin/osgcopy /usr/bin/osgcopy +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/bin/osgcube /usr/bin/osgcube +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/bin/osghangglide /usr/bin/osghangglide +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/bin/osgimpostor /usr/bin/osgimpostor +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/bin/osgreflect /usr/bin/osgreflect +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/bin/osgscribe /usr/bin/osgscribe +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/bin/osgstereoimage /usr/bin/osgstereoimage +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/bin/osgtexture /usr/bin/osgtexture +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/bin/osgviews /usr/bin/osgviews +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/bin/sgv /usr/bin/sgv +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/lib/CVS /usr/lib/CVS +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/lib/libosgDB.so /usr/lib/libosgDB.so +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/lib/libosgGLUT.so /usr/lib/libosgGLUT.so +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/lib/libosg.so /usr/lib/libosg.so +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/lib/libosgText.so /usr/lib/libosgText.so +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/lib/libosgUtil.so /usr/lib/libosgUtil.so +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/lib/osgPlugins /usr/lib/osgPlugins +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/include/CVS /usr/include/CVS +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/include/osg /usr/include/osg +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/include/osgDB /usr/include/osgDB +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/include/osgGLUT /usr/include/osgGLUT +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/include/osgText /usr/include/osgText +cp -rf /usr/src/redhat/BUILD/osg-0.8.44/include/osgUtil /usr/include/osgUtil @@ -43,20 +52,29 @@ cp -rf /usr/src/redhat/BUILD/osg-0.8.42/include/osgWX /usr/include/osgWX # FILES Sections %files -%attr(755, root, root) /usr/bin/hangglide +%attr(755, root, root) /usr/bin/CVS +%attr(755, root, root) /usr/bin/osgbillboard +%attr(755, root, root) /usr/bin/osgcluster %attr(755, root, root) /usr/bin/osgconv +%attr(755, root, root) /usr/bin/osgcopy %attr(755, root, root) /usr/bin/osgcube +%attr(755, root, root) /usr/bin/osghangglide %attr(755, root, root) /usr/bin/osgimpostor %attr(755, root, root) /usr/bin/osgreflect +%attr(755, root, root) /usr/bin/osgscribe +%attr(755, root, root) /usr/bin/osgstereoimage %attr(755, root, root) /usr/bin/osgtexture %attr(755, root, root) /usr/bin/osgviews %attr(755, root, root) /usr/bin/sgv +%attr(755, root, root) /usr/lib/CVS %attr(755, root, root) /usr/lib/libosgDB.so %attr(755, root, root) /usr/lib/libosgGLUT.so %attr(755, root, root) /usr/lib/libosg.so +%attr(755, root, root) /usr/lib/libosgText.so %attr(755, root, root) /usr/lib/libosgUtil.so %attr(755, root, root) /usr/lib/osgPlugins %attr(444, root, root) /usr/include/osg/AlphaFunc +%attr(444, root, root) /usr/include/osg/AnimationPath %attr(444, root, root) /usr/include/osg/Billboard %attr(444, root, root) /usr/include/osg/BoundingBox %attr(444, root, root) /usr/include/osg/BoundingSphere @@ -65,28 +83,38 @@ cp -rf /usr/src/redhat/BUILD/osg-0.8.42/include/osgWX /usr/include/osgWX %attr(444, root, root) /usr/include/osg/ClippingVolume %attr(444, root, root) /usr/include/osg/ClipPlane %attr(444, root, root) /usr/include/osg/ColorMask +%attr(444, root, root) /usr/include/osg/ColorMatrix +%attr(444, root, root) /usr/include/osg/CopyOp %attr(444, root, root) /usr/include/osg/CullFace +%attr(444, root, root) /usr/include/osg/CVS %attr(444, root, root) /usr/include/osg/Depth +%attr(444, root, root) /usr/include/osg/DisplaySettings %attr(444, root, root) /usr/include/osg/Drawable +%attr(444, root, root) /usr/include/osg/EarthSky %attr(444, root, root) /usr/include/osg/Export %attr(444, root, root) /usr/include/osg/Fog +%attr(444, root, root) /usr/include/osg/FrameStamp %attr(444, root, root) /usr/include/osg/FrontFace %attr(444, root, root) /usr/include/osg/Geode %attr(444, root, root) /usr/include/osg/GeoSet %attr(444, root, root) /usr/include/osg/GL %attr(444, root, root) /usr/include/osg/GLExtensions +%attr(444, root, root) /usr/include/osg/GLU %attr(444, root, root) /usr/include/osg/Group %attr(444, root, root) /usr/include/osg/Image %attr(444, root, root) /usr/include/osg/Impostor %attr(444, root, root) /usr/include/osg/ImpostorSprite %attr(444, root, root) /usr/include/osg/Light +%attr(444, root, root) /usr/include/osg/LightModel %attr(444, root, root) /usr/include/osg/LightSource %attr(444, root, root) /usr/include/osg/LineSegment +%attr(444, root, root) /usr/include/osg/LineStipple +%attr(444, root, root) /usr/include/osg/LineWidth %attr(444, root, root) /usr/include/osg/LOD %attr(444, root, root) /usr/include/osg/Material +%attr(444, root, root) /usr/include/osg/Math %attr(444, root, root) /usr/include/osg/Matrix -%attr(444, root, root) /usr/include/osg/MemoryAdapter -%attr(444, root, root) /usr/include/osg/mem_ptr +%attr(444, root, root) /usr/include/osg/MemoryManager %attr(444, root, root) /usr/include/osg/Node %attr(444, root, root) /usr/include/osg/NodeCallback %attr(444, root, root) /usr/include/osg/NodeVisitor @@ -96,18 +124,23 @@ cp -rf /usr/src/redhat/BUILD/osg-0.8.42/include/osgWX /usr/include/osgWX %attr(444, root, root) /usr/include/osg/Point %attr(444, root, root) /usr/include/osg/PolygonMode %attr(444, root, root) /usr/include/osg/PolygonOffset +%attr(444, root, root) /usr/include/osg/PositionAttitudeTransform +%attr(444, root, root) /usr/include/osg/Projection %attr(444, root, root) /usr/include/osg/Quat %attr(444, root, root) /usr/include/osg/Referenced %attr(444, root, root) /usr/include/osg/ref_ptr +%attr(444, root, root) /usr/include/osg/ShadeModel %attr(444, root, root) /usr/include/osg/State %attr(444, root, root) /usr/include/osg/StateAttribute %attr(444, root, root) /usr/include/osg/StateSet +%attr(444, root, root) /usr/include/osg/Statistics %attr(444, root, root) /usr/include/osg/Stencil %attr(444, root, root) /usr/include/osg/Switch %attr(444, root, root) /usr/include/osg/TexEnv %attr(444, root, root) /usr/include/osg/TexGen %attr(444, root, root) /usr/include/osg/TexMat %attr(444, root, root) /usr/include/osg/Texture +%attr(444, root, root) /usr/include/osg/TextureCubeMap %attr(444, root, root) /usr/include/osg/Timer %attr(444, root, root) /usr/include/osg/Transform %attr(444, root, root) /usr/include/osg/Transparency diff --git a/src/Demos/Makefile b/src/Demos/Makefile index 08f504de8..2675284e8 100644 --- a/src/Demos/Makefile +++ b/src/Demos/Makefile @@ -14,6 +14,7 @@ DIRS = \ osgstereoimage\ osgtexture\ osgviews\ + osgversion\ sgv LEFT_TO_DO =\ diff --git a/src/Demos/osgversion/Makefile b/src/Demos/osgversion/Makefile new file mode 100755 index 000000000..728318236 --- /dev/null +++ b/src/Demos/osgversion/Makefile @@ -0,0 +1,11 @@ +TOPDIR = ../../.. +include $(TOPDIR)/Make/makedefs + +CXXFILES =\ + osgversion.cpp\ + +LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) + +EXEC = osgversion + +include $(TOPDIR)/Make/makerules diff --git a/src/Demos/osgversion/osgversion.cpp b/src/Demos/osgversion/osgversion.cpp new file mode 100644 index 000000000..4f3ee195d --- /dev/null +++ b/src/Demos/osgversion/osgversion.cpp @@ -0,0 +1,9 @@ +#include +#include + + +int main( int argc, char **argv ) +{ + printf( "%s\n", osgGetVersion() ); + return 0; +} diff --git a/src/osg/Makefile b/src/osg/Makefile index 7968a9d43..405c121dc 100644 --- a/src/osg/Makefile +++ b/src/osg/Makefile @@ -67,6 +67,7 @@ DEF += -DSG_LIBRARY LIBS += $(GL_LIBS) $(OTHER_LIBS) -LIB = libosg.$(SO_EXT) +TARGET_BASENAME = osg +LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgDB/Makefile b/src/osgDB/Makefile index 91a6807a7..fe530b6d7 100644 --- a/src/osgDB/Makefile +++ b/src/osgDB/Makefile @@ -20,6 +20,7 @@ CXXFILES =\ LIBS += -losg $(OTHER_LIBS) $(DYNAMICLIBRARYLIB) DEF += -DOSGDB_LIBRARY -LIB = libosgDB.$(PLUGIN_EXT) +TARGET_BASENAME = osgDB +LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgGLUT/Makefile b/src/osgGLUT/Makefile index 35915185c..b40c9f67f 100644 --- a/src/osgGLUT/Makefile +++ b/src/osgGLUT/Makefile @@ -9,6 +9,7 @@ CXXFILES =\ LIBS += $(GLUT_LIB) -losgUtil -losgDB -losg $(OTHER_LIBS) DEF += -DOSGGLUT_LIBRARY -LIB = libosgGLUT.$(SO_EXT) +TARGET_BASENAME = osgGLUT +LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/Makefile b/src/osgPlugins/Makefile index cd73ba406..d0613ae21 100644 --- a/src/osgPlugins/Makefile +++ b/src/osgPlugins/Makefile @@ -1,10 +1,7 @@ TOPDIR = ../.. include $(TOPDIR)/Make/makedefs -DIRS = osg rgb lib3ds flt obj lwo dw bmp pic tga osgtgz tgz zip - -# The following are giving me problems on SUN -#DIRS += txp +DIRS = osg rgb lib3ds flt obj lwo txp dw bmp pic tga osgtgz tgz zip # comment in if you have Performer installed. # DIRS += pfb diff --git a/src/osgPlugins/bmp/Makefile b/src/osgPlugins/bmp/Makefile index 44f7fda13..8aa56ca49 100644 --- a/src/osgPlugins/bmp/Makefile +++ b/src/osgPlugins/bmp/Makefile @@ -6,6 +6,7 @@ CXXFILES =\ LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_bmp.$(PLUGIN_EXT) +TARGET_BASENAME = bmp +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/dw/Makefile b/src/osgPlugins/dw/Makefile index cae692f52..ba7d30e2a 100644 --- a/src/osgPlugins/dw/Makefile +++ b/src/osgPlugins/dw/Makefile @@ -6,6 +6,7 @@ CXXFILES =\ LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_dw.$(PLUGIN_EXT) +TARGET_BASENAME = dw +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/dx/Makefile b/src/osgPlugins/dx/Makefile index 3daf4066a..0b1c91fab 100644 --- a/src/osgPlugins/dx/Makefile +++ b/src/osgPlugins/dx/Makefile @@ -9,6 +9,7 @@ CXXFILES =\ LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_dx.$(PLUGIN_EXT) +TARGET_BASENAME = dx +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/flt/Makefile b/src/osgPlugins/flt/Makefile index 81a42ff51..8c9dffa45 100644 --- a/src/osgPlugins/flt/Makefile +++ b/src/osgPlugins/flt/Makefile @@ -47,6 +47,7 @@ INC += -I$(THISDIR) LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_flt.$(PLUGIN_EXT) +TARGET_BASENAME = flt +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/gif/Makefile b/src/osgPlugins/gif/Makefile index 3c9303a9a..bbedb46be 100644 --- a/src/osgPlugins/gif/Makefile +++ b/src/osgPlugins/gif/Makefile @@ -12,6 +12,7 @@ LINKARGS += -L/usr/freeware/lib$(ARCH) LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_gif.$(PLUGIN_EXT) +TARGET_BASENAME = gif +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/jpeg/Makefile b/src/osgPlugins/jpeg/Makefile index c282cdc94..1cf23b8e8 100644 --- a/src/osgPlugins/jpeg/Makefile +++ b/src/osgPlugins/jpeg/Makefile @@ -8,6 +8,7 @@ INC += -I/usr/local/include/ LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_jpeg.$(PLUGIN_EXT) +TARGET_BASENAME = jpeg +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/lib3ds/Makefile b/src/osgPlugins/lib3ds/Makefile index fec596cbb..79df47ff5 100644 --- a/src/osgPlugins/lib3ds/Makefile +++ b/src/osgPlugins/lib3ds/Makefile @@ -28,6 +28,7 @@ INC += -I$(THISDIR) LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_3ds.$(PLUGIN_EXT) +TARGET_BASENAME = 3ds +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/lwo/Makefile b/src/osgPlugins/lwo/Makefile index 528b1a0c2..b881a5c2e 100644 --- a/src/osgPlugins/lwo/Makefile +++ b/src/osgPlugins/lwo/Makefile @@ -10,6 +10,7 @@ INC += -I$(THISDIR) LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_lwo.$(PLUGIN_EXT) +TARGET_BASENAME = lwo +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/obj/Makefile b/src/osgPlugins/obj/Makefile index 65840c5ff..962bd5958 100644 --- a/src/osgPlugins/obj/Makefile +++ b/src/osgPlugins/obj/Makefile @@ -10,6 +10,7 @@ INC += -I$(THISDIR) LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_obj.$(PLUGIN_EXT) +TARGET_BASENAME = obj +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/osg/Makefile b/src/osgPlugins/osg/Makefile index 21ac57452..db1d9e8d3 100644 --- a/src/osgPlugins/osg/Makefile +++ b/src/osgPlugins/osg/Makefile @@ -45,6 +45,7 @@ CXXFILES =\ LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_osg.$(PLUGIN_EXT) +TARGET_BASENAME = osg +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/osgtgz/Makefile b/src/osgPlugins/osgtgz/Makefile index c0f3b6beb..6a0474d55 100644 --- a/src/osgPlugins/osgtgz/Makefile +++ b/src/osgPlugins/osgtgz/Makefile @@ -6,6 +6,7 @@ CXXFILES =\ LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_osgtgz.$(PLUGIN_EXT) +TARGET_BASENAME = osgtgz +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/pfb/Makefile b/src/osgPlugins/pfb/Makefile index b17b17db5..95a47fb8e 100644 --- a/src/osgPlugins/pfb/Makefile +++ b/src/osgPlugins/pfb/Makefile @@ -8,6 +8,7 @@ CXXFILES =\ LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_pfb.$(PLUGIN_EXT) +TARGET_BASENAME = pfb +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/pic/Makefile b/src/osgPlugins/pic/Makefile index 886b82f1f..0523ed0b3 100644 --- a/src/osgPlugins/pic/Makefile +++ b/src/osgPlugins/pic/Makefile @@ -6,6 +6,7 @@ CXXFILES =\ LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_pic.$(PLUGIN_EXT) +TARGET_BASENAME = pic +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/png/Makefile b/src/osgPlugins/png/Makefile index 64ab81ca7..ac3101ffd 100644 --- a/src/osgPlugins/png/Makefile +++ b/src/osgPlugins/png/Makefile @@ -10,6 +10,7 @@ INC += -I/usr/local/include\ LINKARGS += -L/usr/freeware/lib$(ARCH) -PLUGIN = osgdb_png.$(PLUGIN_EXT) +TARGET_BASENAME = png +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/quicktime/Makefile b/src/osgPlugins/quicktime/Makefile index 5ffdbd3b3..bdacfb40c 100644 --- a/src/osgPlugins/quicktime/Makefile +++ b/src/osgPlugins/quicktime/Makefile @@ -7,7 +7,8 @@ CXXFILES =\ LIBS += $(QUICKTIME) $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_qt.$(PLUGIN_EXT) +TARGET_BASENAME = qt +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/rgb/Makefile b/src/osgPlugins/rgb/Makefile index db1aa6661..59134d9ad 100644 --- a/src/osgPlugins/rgb/Makefile +++ b/src/osgPlugins/rgb/Makefile @@ -6,6 +6,7 @@ CXXFILES =\ LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_rgb.$(PLUGIN_EXT) +TARGET_BASENAME = rgb +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/tga/Makefile b/src/osgPlugins/tga/Makefile index a62500830..c4eeb0ff6 100644 --- a/src/osgPlugins/tga/Makefile +++ b/src/osgPlugins/tga/Makefile @@ -6,6 +6,7 @@ CXXFILES =\ LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_tga.$(PLUGIN_EXT) +TARGET_BASENAME = tga +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/tgz/Makefile b/src/osgPlugins/tgz/Makefile index 57b03ff53..6c3510342 100644 --- a/src/osgPlugins/tgz/Makefile +++ b/src/osgPlugins/tgz/Makefile @@ -6,6 +6,7 @@ CXXFILES =\ LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_tgz.$(PLUGIN_EXT) +TARGET_BASENAME = tgz +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/tiff/Makefile b/src/osgPlugins/tiff/Makefile index 5e1d9081d..a7db8deb7 100644 --- a/src/osgPlugins/tiff/Makefile +++ b/src/osgPlugins/tiff/Makefile @@ -9,6 +9,7 @@ LIBS += $(TIFF_LIB) $(OSG_LIBS) $(OTHER_LIBS) INC += -I/usr/local/include LDFLAGS += -L/usr/local/lib -PLUGIN = osgdb_tiff.$(PLUGIN_EXT) +TARGET_BASENAME = tiff +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/txp/Makefile b/src/osgPlugins/txp/Makefile index 844996a7d..3743e9d07 100644 --- a/src/osgPlugins/txp/Makefile +++ b/src/osgPlugins/txp/Makefile @@ -30,6 +30,7 @@ INC += -I$(THISDIR) LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_txp.$(PLUGIN_EXT) +TARGET_BASENAME = txp +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgPlugins/zip/Makefile b/src/osgPlugins/zip/Makefile index 4b05101ea..77bfc5859 100644 --- a/src/osgPlugins/zip/Makefile +++ b/src/osgPlugins/zip/Makefile @@ -6,6 +6,7 @@ CXXFILES =\ LIBS += $(OSG_LIBS) $(OTHER_LIBS) -PLUGIN = osgdb_zip.$(PLUGIN_EXT) +TARGET_BASENAME = zip +PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgText/Makefile b/src/osgText/Makefile index bfe110d57..1168d1fff 100644 --- a/src/osgText/Makefile +++ b/src/osgText/Makefile @@ -38,6 +38,7 @@ DEF += -DOSGTEXT_LIBRARY LINKARGS += -L/usr/local/lib\ -L/usr/freeware/lib$(ARCH) -LIB = libosgText.$(SO_EXT) +TARGET_BASENAME = osgText +LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgUtil/Makefile b/src/osgUtil/Makefile index b689cfbea..a20e05800 100644 --- a/src/osgUtil/Makefile +++ b/src/osgUtil/Makefile @@ -37,6 +37,7 @@ DEF += -DOSGUTIL_LIBRARY LIBS += -losg $(GL_LIBS) $(OTHER_LIBS) -LIB = libosgUtil.$(SO_EXT) +TARGET_BASENAME = osgUtil +LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT) include $(TOPDIR)/Make/makerules diff --git a/src/osgUtil/RenderStage.cpp b/src/osgUtil/RenderStage.cpp index 538227a39..45f67ffe4 100644 --- a/src/osgUtil/RenderStage.cpp +++ b/src/osgUtil/RenderStage.cpp @@ -1,3 +1,4 @@ +#include #include #include