From 893dc6d65c9383f2cef1fbf2f6e7fe6015284911 Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Thu, 4 Apr 2002 18:01:44 +0000 Subject: [PATCH] Added Norman Vine's changes for CYGWIN builds Added distrules and makerpms for building RPM distributions Removed old RedHatRPM distribution build directory Added new dist/RPM directory and placed temporary .spec files (these are generated by Make/makerpms and are not intended for stand-alone use, but they keep the directory warm and CVS happy) --- Make/distrules | 11 ++ Make/makedefs | 23 ++- Make/makerpms | 200 +++++++++++++++++++++++++ Makefile | 1 + dist/RPM/OpenSceneGraph.spec | 74 +++++++++ dist/RPM/OpenSceneGraph_dev.spec | 248 +++++++++++++++++++++++++++++++ dist/RedHatRPM/Makefile | 25 ---- dist/RedHatRPM/makespec | 88 ----------- dist/RedHatRPM/osg.spec | 153 ------------------- src/osgPlugins/dx/DXWriter.cpp | 2 +- src/osgPlugins/gif/Makefile | 2 +- src/osgPlugins/jpeg/Makefile | 2 +- src/osgPlugins/png/Makefile | 2 +- 13 files changed, 557 insertions(+), 274 deletions(-) create mode 100644 Make/distrules create mode 100644 Make/makerpms create mode 100644 dist/RPM/OpenSceneGraph.spec create mode 100644 dist/RPM/OpenSceneGraph_dev.spec delete mode 100644 dist/RedHatRPM/Makefile delete mode 100755 dist/RedHatRPM/makespec delete mode 100644 dist/RedHatRPM/osg.spec diff --git a/Make/distrules b/Make/distrules new file mode 100644 index 000000000..80f11125b --- /dev/null +++ b/Make/distrules @@ -0,0 +1,11 @@ +distribution : + @$(MAKEDIST) $(TOPDIR)\ + $(INST_LIBS)\ + $(INST_PLUGINS)\ + $(INST_INCLUDE)\ + $(INST_DEMOS)\ + $(INST_DEMO_SRC)\ + $(INST_DOC)\ + $(INST_DATA) + + diff --git a/Make/makedefs b/Make/makedefs index 587188809..0b6bc750f 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -7,6 +7,12 @@ ifeq ($(findstring IRIX,$(OS)),IRIX) OS := IRIX endif +## Make CYGWIN_XXXX CYGWIN so it's "Windows cross platform" :) +ifeq ($(findstring CYGWIN,$(OS)),CYGWIN) +OS := CYGWIN +endif + + # TOPDIR needs to be redefined for every Makefile TOPDIR ?= ../ THISDIR = . @@ -49,6 +55,7 @@ LIB_EXT = so PLUGIN_PREFIX = osgdb_ PLUGIN_EXT = so +MAKEDIST = echo " === Distribution build is not implemented yet for $(OS)"; printf "\n" ALL_TARGETS = \ opt\ @@ -149,6 +156,8 @@ ifeq ($(OS),Linux) X_LIBS = -lXmu -lX11 SOCKET_LIBS = OTHER_LIBS = + + MAKEDIST = $(TOPDIR)/Make/makerpms endif #### FreeBSD specific definitions @@ -204,7 +213,7 @@ ifeq ($(OS),Darwin) endif #### Cygwin/Mingw specific definitions -ifeq ($(OS),CYGWIN_NT-5.0) +ifeq ($(OS),CYGWIN) C++ = c++ DEPARG = -M INC += @@ -213,8 +222,8 @@ ifeq ($(OS),CYGWIN_NT-5.0) DBGF = -g SHARED = -shared\ -Wl,--export-all-symbols \ - -Wl,--output-def,$(LIB_PREFIX)$(TARGET_BASENAME).def \ - -Wl,--out-implib,$(TOPDIR)/lib/$(LIB_PREFIX)$(TARGET_BASENAME).a \ + -Wl,--output-def,lib$(TARGET_BASENAME).def \ + -Wl,--out-implib,$(TOPDIR)/lib/lib$(TARGET_BASENAME).dll.a \ ARCHARGS = LINKARGS = -W -Wall @@ -242,10 +251,16 @@ ifeq ($(OS),CYGWIN_NT-5.0) -losgdb_zip SOCKET_LIBS = OTHER_LIBS = $(GL_LIBS) + PNG_LIBS = -lpng -lz + JPEG_LIBS = -ljpeg + GIF_LIBS = -lungif + TIFF_LIB = -ltiff -lz -ljpeg + FREETYPE_LIB = -lfreetype2 + LIB_PREFIX = cyg LIB_EXT = dll - PLUGIN_PREFIX = osgdb_ + PLUGIN_PREFIX = cygosgdb_ PLUGIN_EXT = dll LINK = cp -f diff --git a/Make/makerpms b/Make/makerpms new file mode 100644 index 000000000..77dad02d9 --- /dev/null +++ b/Make/makerpms @@ -0,0 +1,200 @@ +#!/bin/sh + +die() +{ + echo $1 + exit 1 +} + + +s_install() +{ + src_DIR=$1 + mode=$2 + dst_DIR=$RPM_BUILD_DIR/`echo $3 | sed 's/\///'` + + [ -d $dst_DIR ] || mkdir -p $dst_DIR + + THISDIR=`pwd` + cd $src_DIR + for f in `ls -1` + do + if [ -f $f ] + then + install -m $mode $f $dst_DIR/$f + fi + done + cd $THISDIR +} + + +print_attr() +{ + dst_DIR=$1 + mode=$2 + t_dir=$RPM_BUILD_DIR/$dst_DIR + + THISDIR=`pwd` + cd $t_dir + for f in `ls -1` + do + [ -f $f ] && echo "%attr($mode, root, root) $dst_DIR/$f" + done + cd $THISDIR +} + +make_targz() +{ + THISDIR=`pwd` + src_dir=$1 + cd $RPM_BUILD_DIR/.. + tar cvf - $src_dir |\ + gzip > /usr/src/redhat/SOURCES/$src_dir.tar.gz + cd $THISDIR +} + +make_spec() +{ + name=$1 + cat <<-LEOF > $TOPDIR/dist/RPM/$name.spec + +Summary: A C++ scene graph API on OpenGL for real time graphics +Name: $name +Version: $REV +Release: $REL +Copyright: LGPL +Group: Graphics +Source: $name-$REV.tar.gz +URL: http://www.openscenegraph.org +Packager: `awk -f - /etc/passwd <<-EOF +BEGIN { FS=":"} +{ + if( \\$1 == "$LOGNAME" ) + print \\$5 +} +EOF` + +%description + +The Open Scene Graph is a cross-platform C++/OpenGL library for the real-time +visualization. Uses range from visual simulation, scientific modeling, virtual +reality through to games. Open Scene Graph employs good practices in software +engineering through the use of standard C++, STL and generic programming, and +design patterns. Open Scene Graph strives for high performance and quality in +graphics rendering, protability, and extensibility + +%prep + +%setup + +%build + +%install + +cd $RPM_BUILD_DIR +tar cvf - . | tar xvfC - / + +# --------------------- +# FILES Sections +%files + +LEOF +} + + +make_osg() +{ + RPM_BUILD_DIR=/usr/src/redhat/BUILD/OpenSceneGraph-$REV + rm -rf $RPM_BUILD_DIR + mkdir $RPM_BUILD_DIR + + s_install $TOPDIR/lib 755 $INST_LIBS + s_install $TOPDIR/lib/osgPlugins 744 $INST_PLUGINS + s_install $TOPDIR/bin 755 $INST_DEMOS + + make_targz OpenSceneGraph-$REV + make_spec OpenSceneGraph + + print_attr $INST_LIBS 755 >> $TOPDIR/dist/RPM/OpenSceneGraph.spec + print_attr $INST_PLUGINS 755 >> $TOPDIR/dist/RPM/OpenSceneGraph.spec + print_attr $INST_DEMOS 755 >> $TOPDIR/dist/RPM/OpenSceneGraph.spec + + rpm -bb --clean $TOPDIR/dist/RPM/OpenSceneGraph.spec + + mv /usr/src/redhat/RPMS/i386/OpenSceneGraph-$REV-$REL.i386.rpm dist/RPM +} + +make_osg_dev() +{ + RPM_BUILD_DIR=/usr/src/redhat/BUILD/OpenSceneGraph_dev-$REV + rm -rf $RPM_BUILD_DIR + mkdir $RPM_BUILD_DIR + + for d in `ls $TOPDIR/include | grep -v CVS` + do + [ -d $TOPDIR/include/$d ] && \ + s_install $TOPDIR/include/$d 644 $INST_INCLUDE/$d + done + + for d in `ls $TOPDIR/src/Demos | grep -v CVS` + do + [ -d $TOPDIR/src/Demos/$d ] && \ + s_install $TOPDIR/src/Demos/$d 644 $INST_DEMO_SRC/$d + done + + make_targz OpenSceneGraph_dev-$REV + make_spec OpenSceneGraph_dev + + for d in `ls -1 $RPM_BUILD_DIR/$INST_INCLUDE` + do + print_attr $INST_INCLUDE/$d 755 >> $TOPDIR/dist/RPM/OpenSceneGraph_dev.spec + done + + for d in `ls -1 $RPM_BUILD_DIR/$INST_DEMO_SRC` + do + print_attr $INST_DEMO_SRC/$d 755 >> $TOPDIR/dist/RPM/OpenSceneGraph_dev.spec + done + + rpm -bb --clean $TOPDIR/dist/RPM/OpenSceneGraph_dev.spec + + mv /usr/src/redhat/RPMS/i386/OpenSceneGraph_dev-$REV-$REL.i386.rpm dist/RPM +} + +if [ "`whoami`" != "root" ] +then + echo + echo " === makerpm : You must be root do make the RPM distribution." + echo + exit 1 +fi + +if [ $# -ne 8 ] +then + echo + echo makerpm : Internal Error - Bad Usage + echo + exit 1 +fi + +TOPDIR=$1 +INST_LIBS=$2 +INST_PLUGINS=$3 +INST_INCLUDE=$4 +INST_DEMOS=$5 +INST_DEMO_SRC=$6 +INST_DOC=$7 +INST_DATA=$8 + +REV="`$TOPDIR""/bin/osgversion`" +[ -z "$REV" ] && die "makerpm: requires a functional $TOPDIR/bin/osgversion" + +REL=1 + + +make_osg + +make_osg_dev + + + +exit 0 diff --git a/Makefile b/Makefile index d09514b45..ce5ed3872 100644 --- a/Makefile +++ b/Makefile @@ -5,3 +5,4 @@ DIRS = src include $(TOPDIR)/Make/makedirrules include $(TOPDIR)/Make/instrules +include $(TOPDIR)/Make/distrules diff --git a/dist/RPM/OpenSceneGraph.spec b/dist/RPM/OpenSceneGraph.spec new file mode 100644 index 000000000..b17852c24 --- /dev/null +++ b/dist/RPM/OpenSceneGraph.spec @@ -0,0 +1,74 @@ + +Summary: A C++ scene graph API on OpenGL for real time graphics +Name: OpenSceneGraph +Version: 0.8.44 +Release: 1 +Copyright: LGPL +Group: Graphics +Source: OpenSceneGraph-0.8.44.tar.gz +URL: http://www.openscenegraph.org +Packager: Don Burns + +%description + +The Open Scene Graph is a cross-platform C++/OpenGL library for the real-time +visualization. Uses range from visual simulation, scientific modeling, virtual +reality through to games. Open Scene Graph employs good practices in software +engineering through the use of standard C++, STL and generic programming, and +design patterns. Open Scene Graph strives for high performance and quality in +graphics rendering, protability, and extensibility + +%prep + +%setup + +%build + +%install + +cd /usr/src/redhat/BUILD/OpenSceneGraph-0.8.44 +tar cvf - . | tar xvfC - / + +# --------------------- +# FILES Sections +%files + +%attr(755, root, root) /usr/local/lib/libosgDB.so +%attr(755, root, root) /usr/local/lib/libosgGLUT.so +%attr(755, root, root) /usr/local/lib/libosg.so +%attr(755, root, root) /usr/local/lib/libosgText.so +%attr(755, root, root) /usr/local/lib/libosgUtil.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_3ds.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_bmp.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_dw.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_dx.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_flt.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_gif.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_jpeg.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_lwo.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_obj.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_osg.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_osgtgz.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_pfb.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_pic.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_png.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_rgb.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_tga.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_tgz.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_tiff.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_txp.so +%attr(755, root, root) /usr/local/lib/osgPlugins/osgdb_zip.so +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgbillboard +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgcluster +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgconv +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgcopy +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgcube +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/osghangglide +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgimpostor +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgreflect +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgscribe +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgstereoimage +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgtexture +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgversion +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgviews +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/sgv diff --git a/dist/RPM/OpenSceneGraph_dev.spec b/dist/RPM/OpenSceneGraph_dev.spec new file mode 100644 index 000000000..9dab94bda --- /dev/null +++ b/dist/RPM/OpenSceneGraph_dev.spec @@ -0,0 +1,248 @@ + +Summary: A C++ scene graph API on OpenGL for real time graphics +Name: OpenSceneGraph_dev +Version: 0.8.44 +Release: 1 +Copyright: LGPL +Group: Graphics +Source: OpenSceneGraph_dev-0.8.44.tar.gz +URL: http://www.openscenegraph.org +Packager: Don Burns + +%description + +The Open Scene Graph is a cross-platform C++/OpenGL library for the real-time +visualization. Uses range from visual simulation, scientific modeling, virtual +reality through to games. Open Scene Graph employs good practices in software +engineering through the use of standard C++, STL and generic programming, and +design patterns. Open Scene Graph strives for high performance and quality in +graphics rendering, protability, and extensibility + +%prep + +%setup + +%build + +%install + +cd /usr/src/redhat/BUILD/OpenSceneGraph_dev-0.8.44 +tar cvf - . | tar xvfC - / + +# --------------------- +# FILES Sections +%files + +%attr(755, root, root) /usr/local/include/osg/AlphaFunc +%attr(755, root, root) /usr/local/include/osg/AnimationPath +%attr(755, root, root) /usr/local/include/osg/Billboard +%attr(755, root, root) /usr/local/include/osg/BoundingBox +%attr(755, root, root) /usr/local/include/osg/BoundingSphere +%attr(755, root, root) /usr/local/include/osg/BoundsChecking +%attr(755, root, root) /usr/local/include/osg/Camera +%attr(755, root, root) /usr/local/include/osg/ClippingVolume +%attr(755, root, root) /usr/local/include/osg/ClipPlane +%attr(755, root, root) /usr/local/include/osg/ColorMask +%attr(755, root, root) /usr/local/include/osg/ColorMatrix +%attr(755, root, root) /usr/local/include/osg/CopyOp +%attr(755, root, root) /usr/local/include/osg/CullFace +%attr(755, root, root) /usr/local/include/osg/Depth +%attr(755, root, root) /usr/local/include/osg/DisplaySettings +%attr(755, root, root) /usr/local/include/osg/Drawable +%attr(755, root, root) /usr/local/include/osg/EarthSky +%attr(755, root, root) /usr/local/include/osg/Export +%attr(755, root, root) /usr/local/include/osg/Fog +%attr(755, root, root) /usr/local/include/osg/FrameStamp +%attr(755, root, root) /usr/local/include/osg/FrontFace +%attr(755, root, root) /usr/local/include/osg/Geode +%attr(755, root, root) /usr/local/include/osg/GeoSet +%attr(755, root, root) /usr/local/include/osg/GL +%attr(755, root, root) /usr/local/include/osg/GLExtensions +%attr(755, root, root) /usr/local/include/osg/GLU +%attr(755, root, root) /usr/local/include/osg/Group +%attr(755, root, root) /usr/local/include/osg/Image +%attr(755, root, root) /usr/local/include/osg/Impostor +%attr(755, root, root) /usr/local/include/osg/ImpostorSprite +%attr(755, root, root) /usr/local/include/osg/Light +%attr(755, root, root) /usr/local/include/osg/LightModel +%attr(755, root, root) /usr/local/include/osg/LightSource +%attr(755, root, root) /usr/local/include/osg/LineSegment +%attr(755, root, root) /usr/local/include/osg/LineStipple +%attr(755, root, root) /usr/local/include/osg/LineWidth +%attr(755, root, root) /usr/local/include/osg/LOD +%attr(755, root, root) /usr/local/include/osg/Material +%attr(755, root, root) /usr/local/include/osg/Math +%attr(755, root, root) /usr/local/include/osg/Matrix +%attr(755, root, root) /usr/local/include/osg/MemoryManager +%attr(755, root, root) /usr/local/include/osg/Node +%attr(755, root, root) /usr/local/include/osg/NodeCallback +%attr(755, root, root) /usr/local/include/osg/NodeVisitor +%attr(755, root, root) /usr/local/include/osg/Notify +%attr(755, root, root) /usr/local/include/osg/Object +%attr(755, root, root) /usr/local/include/osg/Plane +%attr(755, root, root) /usr/local/include/osg/Point +%attr(755, root, root) /usr/local/include/osg/PolygonMode +%attr(755, root, root) /usr/local/include/osg/PolygonOffset +%attr(755, root, root) /usr/local/include/osg/PositionAttitudeTransform +%attr(755, root, root) /usr/local/include/osg/Projection +%attr(755, root, root) /usr/local/include/osg/Quat +%attr(755, root, root) /usr/local/include/osg/Referenced +%attr(755, root, root) /usr/local/include/osg/ref_ptr +%attr(755, root, root) /usr/local/include/osg/ShadeModel +%attr(755, root, root) /usr/local/include/osg/State +%attr(755, root, root) /usr/local/include/osg/StateAttribute +%attr(755, root, root) /usr/local/include/osg/StateSet +%attr(755, root, root) /usr/local/include/osg/Statistics +%attr(755, root, root) /usr/local/include/osg/Stencil +%attr(755, root, root) /usr/local/include/osg/Switch +%attr(755, root, root) /usr/local/include/osg/TexEnv +%attr(755, root, root) /usr/local/include/osg/TexGen +%attr(755, root, root) /usr/local/include/osg/TexMat +%attr(755, root, root) /usr/local/include/osg/Texture +%attr(755, root, root) /usr/local/include/osg/TextureCubeMap +%attr(755, root, root) /usr/local/include/osg/Timer +%attr(755, root, root) /usr/local/include/osg/Transform +%attr(755, root, root) /usr/local/include/osg/Transparency +%attr(755, root, root) /usr/local/include/osg/Types +%attr(755, root, root) /usr/local/include/osg/Vec2 +%attr(755, root, root) /usr/local/include/osg/Vec3 +%attr(755, root, root) /usr/local/include/osg/Vec4 +%attr(755, root, root) /usr/local/include/osg/Version +%attr(755, root, root) /usr/local/include/osg/Viewport +%attr(755, root, root) /usr/local/include/osgDB/DotOsgWrapper +%attr(755, root, root) /usr/local/include/osgDB/DynamicLibrary +%attr(755, root, root) /usr/local/include/osgDB/Export +%attr(755, root, root) /usr/local/include/osgDB/Field +%attr(755, root, root) /usr/local/include/osgDB/FieldReader +%attr(755, root, root) /usr/local/include/osgDB/FieldReaderIterator +%attr(755, root, root) /usr/local/include/osgDB/FileNameUtils +%attr(755, root, root) /usr/local/include/osgDB/FileUtils +%attr(755, root, root) /usr/local/include/osgDB/Input +%attr(755, root, root) /usr/local/include/osgDB/Output +%attr(755, root, root) /usr/local/include/osgDB/ReaderWriter +%attr(755, root, root) /usr/local/include/osgDB/ReadFile +%attr(755, root, root) /usr/local/include/osgDB/Registry +%attr(755, root, root) /usr/local/include/osgDB/Version +%attr(755, root, root) /usr/local/include/osgDB/WriteFile +%attr(755, root, root) /usr/local/include/osgGLUT/Export +%attr(755, root, root) /usr/local/include/osgGLUT/glut +%attr(755, root, root) /usr/local/include/osgGLUT/GLUTEventAdapter +%attr(755, root, root) /usr/local/include/osgGLUT/Version +%attr(755, root, root) /usr/local/include/osgGLUT/Viewer +%attr(755, root, root) /usr/local/include/osgGLUT/Window +%attr(755, root, root) /usr/local/include/osgText/Export +%attr(755, root, root) /usr/local/include/osgText/Font +%attr(755, root, root) /usr/local/include/osgText/Paragraph +%attr(755, root, root) /usr/local/include/osgText/Text +%attr(755, root, root) /usr/local/include/osgText/Version +%attr(755, root, root) /usr/local/include/osgUtil/AppVisitor +%attr(755, root, root) /usr/local/include/osgUtil/CameraManipulator +%attr(755, root, root) /usr/local/include/osgUtil/CullViewState +%attr(755, root, root) /usr/local/include/osgUtil/CullVisitor +%attr(755, root, root) /usr/local/include/osgUtil/DepthSortedBin +%attr(755, root, root) /usr/local/include/osgUtil/DisplayListVisitor +%attr(755, root, root) /usr/local/include/osgUtil/DisplayRequirementsVisitor +%attr(755, root, root) /usr/local/include/osgUtil/DriveManipulator +%attr(755, root, root) /usr/local/include/osgUtil/Export +%attr(755, root, root) /usr/local/include/osgUtil/FlightManipulator +%attr(755, root, root) /usr/local/include/osgUtil/GUIActionAdapter +%attr(755, root, root) /usr/local/include/osgUtil/GUIEventAdapter +%attr(755, root, root) /usr/local/include/osgUtil/GUIEventHandler +%attr(755, root, root) /usr/local/include/osgUtil/InsertImpostorsVisitor +%attr(755, root, root) /usr/local/include/osgUtil/IntersectVisitor +%attr(755, root, root) /usr/local/include/osgUtil/NewCullVisitor +%attr(755, root, root) /usr/local/include/osgUtil/Optimizer +%attr(755, root, root) /usr/local/include/osgUtil/RenderBin +%attr(755, root, root) /usr/local/include/osgUtil/RenderGraph +%attr(755, root, root) /usr/local/include/osgUtil/RenderLeaf +%attr(755, root, root) /usr/local/include/osgUtil/RenderStage +%attr(755, root, root) /usr/local/include/osgUtil/RenderStageLighting +%attr(755, root, root) /usr/local/include/osgUtil/RenderToTextureStage +%attr(755, root, root) /usr/local/include/osgUtil/SceneView +%attr(755, root, root) /usr/local/include/osgUtil/SceneViewManipulator +%attr(755, root, root) /usr/local/include/osgUtil/SmoothingVisitor +%attr(755, root, root) /usr/local/include/osgUtil/StateSetManipulator +%attr(755, root, root) /usr/local/include/osgUtil/Tesselator +%attr(755, root, root) /usr/local/include/osgUtil/TrackballManipulator +%attr(755, root, root) /usr/local/include/osgUtil/TransformCallback +%attr(755, root, root) /usr/local/include/osgUtil/TriStripVisitor +%attr(755, root, root) /usr/local/include/osgUtil/Version +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/base.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/GliderManipulator.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/GliderManipulator.h +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/hangglide.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/hat.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/hat.h +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/Makefile.new +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/Makefile.old +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/ReaderWriterFLY.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/README +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/sky.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/tank.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/terrain.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/terrain_data.h +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/trees.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgbillboard/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgbillboard/Makefile.new +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgbillboard/Makefile.old +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgbillboard/osgbillboard.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/broadcaster.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/broadcaster.h +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/Makefile.new +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/Makefile.old +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/osgcluster.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/README +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/receiver.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/receiver.h +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgconv/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgconv/Makefile.new +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgconv/Makefile.old +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgconv/OrientationConverter.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgconv/OrientationConverter.h +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgconv/osgconv.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcopy/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcopy/Makefile.new +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcopy/Makefile.old +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcopy/osgcopy.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcube/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcube/Makefile.new +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcube/Makefile.old +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcube/osgcube.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgimpostor/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgimpostor/Makefile.new +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgimpostor/Makefile.old +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgimpostor/osgimpostor.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgimpostor/README +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgreflect/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgreflect/Makefile.new +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgreflect/Makefile.old +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgreflect/osgreflect.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgscribe/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgscribe/Makefile.new +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgscribe/Makefile.old +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgscribe/osgscribe.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgstereoimage/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgstereoimage/Makefile.new +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgstereoimage/Makefile.old +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgstereoimage/osgstereoimage.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtext/main.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtext/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtext/Makefile.new +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtext/Makefile.old +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtexture/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtexture/Makefile.new +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtexture/Makefile.old +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtexture/osgtexture.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgversion/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgversion/osgversion.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgviews/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgviews/Makefile.new +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgviews/Makefile.old +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgviews/osgviews.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/sgv/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/sgv/Makefile.new +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/sgv/Makefile.old +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/sgv/README +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/sgv/sgv.cpp diff --git a/dist/RedHatRPM/Makefile b/dist/RedHatRPM/Makefile deleted file mode 100644 index 3705f4a6e..000000000 --- a/dist/RedHatRPM/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100755 index 8136dca36..000000000 --- a/dist/RedHatRPM/makespec +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh - -list_install_files() -{ - for d in \ - ${OSGHOME}/bin\ - ${OSGHOME}/lib\ - ${OSGHOME}/include - do - dd=`basename $d` - for f in `ls -1 $d` - do - echo cp -rf \ - /usr/src/redhat/BUILD/osg-"$OSGVERSION"/$dd/$f /usr/$dd/$f - done - done -} - -list_attr_files() -{ - for d in \ - ${OSGHOME}/bin\ - ${OSGHOME}/lib - do - dd=`basename $d` - for f in $d/* - do - ff=`basename $f` - echo "%attr(755, root, root) /usr/$dd/$ff" - done - done - - for f in ${OSGHOME}/include/osg/* - do - ff=`basename $f` - echo "%attr(444, root, root) /usr/include/osg/$ff" - done -} - -[ -z "$OSGHOME" ] && (echo Please define OSGHOME; exit 1) - -OSGVERSION=`./version` -OSGRELEASE=1 - -##[ -z "$OSGVERSION" ] && (echo Please define OSGVERSION; exit 1) -##[ -z "$OSGRELEASE" ] && (echo Please define OSGRELEASE; exit 1) - - - - -cat <<-LEOF > osg.spec - -Summary: Open Scene Graph -Name: osg -Version: $OSGVERSION -Release: $OSGRELEASE -Copyright: GLPL -Group: Graphics -Source: osg-$OSGVERSION.tar.gz -URL: http://www.openscenegraph.org -Packager: `awk -f - /etc/passwd <<-EOF -BEGIN { FS=":"} -{ - if( \\$1 == "$LOGNAME" ) - print \\$5 -} -EOF` - -%description - -Open Scene Graph is an open-source scene graph API. - -%prep -%setup -%build -%install - -`list_install_files` - - - -# --------------------- -# FILES Sections -%files - -`list_attr_files` - -LEOF diff --git a/dist/RedHatRPM/osg.spec b/dist/RedHatRPM/osg.spec deleted file mode 100644 index 7be02e51b..000000000 --- a/dist/RedHatRPM/osg.spec +++ /dev/null @@ -1,153 +0,0 @@ - -Summary: Open Scene Graph -Name: osg -Version: 0.8.44 -Release: 1 -Copyright: GLPL -Group: Graphics -Source: osg-0.8.44.tar.gz -URL: http://www.openscenegraph.org -Packager: - -%description - -Open Scene Graph is an open-source scene graph API. - -%prep -%setup -%build -%install - -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 - - - -# --------------------- -# FILES Sections -%files - -%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 -%attr(444, root, root) /usr/include/osg/BoundsChecking -%attr(444, root, root) /usr/include/osg/Camera -%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/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 -%attr(444, root, root) /usr/include/osg/Notify -%attr(444, root, root) /usr/include/osg/Object -%attr(444, root, root) /usr/include/osg/Plane -%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 -%attr(444, root, root) /usr/include/osg/Types -%attr(444, root, root) /usr/include/osg/Vec2 -%attr(444, root, root) /usr/include/osg/Vec3 -%attr(444, root, root) /usr/include/osg/Vec4 -%attr(444, root, root) /usr/include/osg/Version -%attr(444, root, root) /usr/include/osg/Viewport - diff --git a/src/osgPlugins/dx/DXWriter.cpp b/src/osgPlugins/dx/DXWriter.cpp index 625d51ed4..8c7a7d18d 100644 --- a/src/osgPlugins/dx/DXWriter.cpp +++ b/src/osgPlugins/dx/DXWriter.cpp @@ -129,7 +129,7 @@ #include #else #include - #if defined(WIN32) || defined (macintosh) + #if (defined(WIN32) || defined (macintosh)) && !defined(__CYGWIN__) #include #else #include diff --git a/src/osgPlugins/gif/Makefile b/src/osgPlugins/gif/Makefile index bbedb46be..24d34ea41 100644 --- a/src/osgPlugins/gif/Makefile +++ b/src/osgPlugins/gif/Makefile @@ -10,7 +10,7 @@ INC += -I/usr/local/include\ LINKARGS += -L/usr/freeware/lib$(ARCH) -LIBS += $(OSG_LIBS) $(OTHER_LIBS) +LIBS += $(OSG_LIBS) $(GIF_LIBS) $(OTHER_LIBS) TARGET_BASENAME = gif PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) diff --git a/src/osgPlugins/jpeg/Makefile b/src/osgPlugins/jpeg/Makefile index 1cf23b8e8..691b2e6a2 100644 --- a/src/osgPlugins/jpeg/Makefile +++ b/src/osgPlugins/jpeg/Makefile @@ -6,7 +6,7 @@ CXXFILES =\ INC += -I/usr/local/include/ -LIBS += $(OSG_LIBS) $(OTHER_LIBS) +LIBS += $(OSG_LIBS) $(JPEG_LIBS) $(OTHER_LIBS) TARGET_BASENAME = jpeg PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) diff --git a/src/osgPlugins/png/Makefile b/src/osgPlugins/png/Makefile index ac3101ffd..efa7b6284 100644 --- a/src/osgPlugins/png/Makefile +++ b/src/osgPlugins/png/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ ReaderWriterPNG.cpp\ -LIBS += $(OSG_LIBS) $(OTHER_LIBS) +LIBS += $(OSG_LIBS) $(PNG_LIBS) $(OTHER_LIBS) INC += -I/usr/local/include\ -I/usr/freeware/include\