FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Solaris 'make distribution' for demo source.

Browse Source
This commit is contained in:
Don BURNS 2002-04-16 04:13:30 +00:00
parent f69e1276a9
commit 906f1de294
5 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Make/distrules
View File

@ -6,6 +6,7 @@ distribution :
$(INST_PLUGINS)\ $(INST_PLUGINS)\
$(INST_INCLUDE)\ $(INST_INCLUDE)\
$(INST_DEMOS)\ $(INST_DEMOS)\
$(INST_SRC)\
$(INST_DEMO_SRC)\ $(INST_DEMO_SRC)\
$(INST_DOC)\ $(INST_DOC)\
$(INST_DATA) $(INST_DATA)

2
Make/instrules
View File

@ -28,7 +28,6 @@ __instbin:
__instdev: __instdev:
ifeq (0,1)
@for d in `ls -1 $(TOPDIR)/include/ | grep -v CVS`; \ @for d in `ls -1 $(TOPDIR)/include/ | grep -v CVS`; \
do\ do\
if [ -d $(TOPDIR)/include/$$d ]; \ if [ -d $(TOPDIR)/include/$$d ]; \
@ -37,7 +36,6 @@ ifeq (0,1)
INSTALL?="$(INSTDEVCMD)" __install;\ INSTALL?="$(INSTDEVCMD)" __install;\
fi\ fi\
done done
endif
@$(TOPDIR)/Make/instdemosrc \ @$(TOPDIR)/Make/instdemosrc \
$(TOPDIR)\ $(TOPDIR)\
$(INST_LIBS)\ $(INST_LIBS)\

2
Make/makedefs
View File

@ -95,7 +95,7 @@ endif
LINKARGS = LINKARGS =
DYNAMICLIBRARYLIB = -ldl DYNAMICLIBRARYLIB = -ldl
OSG_LIBS = -losgGLUT -losgDB -losgUtil -losg OSG_LIBS = -losgGLUT -losgDB -losgUtil -losg
FREETYPE_LIB = -lfreetype FREETYPE_LIB = -L/usr/local/lib -lfreetype
GLUT_LIB = -lglut GLUT_LIB = -lglut
GL_LIBS = -lGLU -lGL GL_LIBS = -lGLU -lGL
X_LIBS = -lXext -lXmu -lXi -lX11 X_LIBS = -lXext -lXmu -lXi -lX11

29
Make/makepkg
View File

@ -127,16 +127,15 @@ INST_LIBS=$3
INST_PLUGINS=$4 INST_PLUGINS=$4
INST_INCLUDE=$5 INST_INCLUDE=$5
INST_DEMOS=$6 INST_DEMOS=$6
INST_DEMO_SRC=$7 INST_SRC=$7
INST_DOC=$8 INST_DEMO_SRC=$8
INST_DATA=$9 shift;shift; shift;shift; shift;shift; shift;shift;
INST_DOC=$1
INST_DATA=$2
PKGSUBDIR=dist/PKG PKGSUBDIR=dist/PKG
make_package\ make_package\
"OpenSceneGraph" \ "OpenSceneGraph" \
"Open Scene Graph - Run-time environment"\ "Open Scene Graph - Run-time environment"\
@ -145,6 +144,9 @@ make_package\
make_installable "OpenSceneGraph" make_installable "OpenSceneGraph"
#
# Capture include directories
#
SUBDIRS=`ls $TOPDIR/include | grep -v CVS` SUBDIRS=`ls $TOPDIR/include | grep -v CVS`
INSTARG="" INSTARG=""
for d in $SUBDIRS for d in $SUBDIRS
@ -153,6 +155,9 @@ do
[ -d $dd ] && INSTARG="$INSTARG $dd" [ -d $dd ] && INSTARG="$INSTARG $dd"
done done
#
# Capthre Demos subdirectories
#
SUBDIRS=`ls $TOPDIR/src/Demos | grep -v CVS` SUBDIRS=`ls $TOPDIR/src/Demos | grep -v CVS`
for d in $SUBDIRS for d in $SUBDIRS
do do
@ -160,11 +165,23 @@ do
[ -d $dd ] && INSTARG="$INSTARG $dd" [ -d $dd ] && INSTARG="$INSTARG $dd"
done done
#
# Capture Make subdirectory
#
dd="$INST_SRC"/"Make"
echo dd is $dd
ls $dd
[ -d $dd ] && INSTARG="$INSTARG $dd"
make_package\ make_package\
"OpenSceneGraph-dev"\ "OpenSceneGraph-dev"\
"Open Scene Graph - Development environment"\ "Open Scene Graph - Development environment"\
"An OpenGL based scene graph. This installation includes header files and demo program source files"\ "An OpenGL based scene graph. This installation includes header files and demo program source files"\
$INSTARG $INSTARG
make_installable "OpenSceneGraph-dev" make_installable "OpenSceneGraph-dev"

8
Make/makerpms
View File

@ -182,9 +182,11 @@ INST_LIBS=$3
INST_PLUGINS=$4 INST_PLUGINS=$4
INST_INCLUDE=$5 INST_INCLUDE=$5
INST_DEMOS=$6 INST_DEMOS=$6
INST_DEMO_SRC=$7 INST_SRC=$7
INST_DOC=$8 INST_DEMO_SRC=$8
INST_DATA=$9 shift;shift; shift;shift; shift;shift; shift;shift;
INST_DOC=$1
INST_DATA=$2
REV="`$TOPDIR""/bin/osgversion`" REV="`$TOPDIR""/bin/osgversion`"
[ -z "$REV" ] && die "makerpm: requires a functional $TOPDIR/bin/osgversion" [ -z "$REV" ] && die "makerpm: requires a functional $TOPDIR/bin/osgversion"