Commit f2027067 authored by hrchilds's avatar hrchilds
Browse files

Update from October 8, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@338 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5e7811aa
......@@ -442,11 +442,15 @@ setenv LD_LIBRARYN32_PATH $QTDIR/lib:$LD_LIBRARYN32_PATH # SGI
setenv LD_LIBRARY64_PATH $QTDIR/lib:$LD_LIBRARY64_PATH # SGI
# Use the appropriate configure command based on the operating system on
# which you are building Qt.
./configure -platform aix-g++ -shared -no-largefile -qt-libpng
./configure -platform irix-cc-64 -shared -qt-libpng
./configure -platform linux-g++ -shared -qt-libpng
./configure -platform solaris-g++ -shared -qt-libpng
./configure -platform tru64-g++ -shared -qt-libpng
./configure -platform aix-g++ -shared -no-largefile -no-imgfmt-png -no-imgfmt-jpeg -no-imgfmt-mng
./configure -platform irix-cc-64 -shared -no-imgfmt-png -no-imgfmt-jpeg -no-imgfmt-mng
./configure -platform linux-g++ -shared -no-imgfmt-png -no-imgfmt-jpeg -no-imgfmt-mng
./configure -platform solaris-g++ -shared -no-imgfmt-png -no-imgfmt-jpeg -no-imgfmt-mng
./configure -platform tru64-g++ -shared -no-imgfmt-png -no-imgfmt-jpeg -no-imgfmt-mng
#
# When you build qt, not all of qt will build successfully because support
# for png, jpeg and mng are missing. This is ok because the library and
# the executables that we care about get built.
#
# On tru64 systems you will need to make the following changes to
# the file mkspecs/tru64-g++/qmake.conf:
......@@ -514,7 +518,7 @@ mkdir $VISITDIR/qt/3.3.2
mkdir $VISITDIR/qt/3.3.2/$VISITARCH
mkdir $VISITDIR/qt/3.3.2/$VISITARCH/{bin,include,lib}
mkdir $VISITDIR/qt/3.3.2/$VISITARCH/include/private
cp bin/{designer,findtr,moc,qt20fix,qtrename140} $VISITDIR/qt/3.3.2/$VISITARCH/bin
cp bin/{findtr,moc,qt20fix,qtrename140} $VISITDIR/qt/3.3.2/$VISITARCH/bin
cd include; cp *.h $VISITDIR/qt/3.3.2/$VISITARCH/include
cp private/*.h $VISITDIR/qt/3.3.2/$VISITARCH/include/private
cd ../lib;find . -print | cpio -pvmud $VISITDIR/qt/3.3.2/$VISITARCH/lib
......
......@@ -41,6 +41,9 @@
# Renamed the MOC target so it would always get rebuilt. There wasn't
# enough dependency information to determine if the Qt version changed.
#
# Eric Brugger, Tue Oct 5 10:47:23 PDT 2004
# I replaced QTDIR with QT_BIN.
#
##############################################################################
@SET_MAKE@
......@@ -52,9 +55,9 @@ NOT_DISTRIB= run_doxygen
all: mocprogram
mocprogram:
if test -n "@QTDIR@"; then \
if test -n "@QT_BIN@"; then \
$(RM) moc ; \
ln -s @QTDIR@/bin/moc moc ; \
ln -s @QT_BIN@/moc moc ; \
fi
clean:
......
......@@ -21,7 +21,9 @@ VTK=$VISITHOME/vtk/2003.10.28/ARCH
##
## Specify the location of the qt include files and libraries.
##
QTDIR=$VISITHOME/qt/3.3.2/ARCH
QT_BIN=$VISITHOME/qt/3.3.2/ARCH/bin
QT_INCLUDE=$VISITHOME/qt/3.3.2/ARCH/include
QT_LIB=$VISITHOME/qt/3.3.2/ARCH/lib
##
## Specify the location of the python include files and libraries.
......
......@@ -23,10 +23,16 @@ if test -z "$VTK"; then
fi
##
## If QTDIR is not set, use our Qt
## If QT is not set, use VisIt's Qt.
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/2.3.0/redhat_7a_ia32_qsw
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/lib
fi
##
......
......@@ -23,10 +23,16 @@ if test -z "$VTK"; then
fi
##
## If QTDIR is not set, use our Qt
## If QT is not set, use VisIt's Qt.
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/2.3.0/redhat_7a_ia32_qsw
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/lib
fi
##
......
......@@ -20,9 +20,15 @@ DEFAULT_SILO_INCLUDES=$VISITHOME/silo/include
DEFAULT_SILO_LIBRARY=$VISITHOME/silo/lib
##
## If QTDIR is not set, use VisIt's Qt.
## If QT is not set, use VisIt's Qt.
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/lib
fi
......@@ -15,9 +15,17 @@ MESA=$DAGOBAHHOME/mesa/linux
VTK=$DAGOBAHHOME/vtk/redhat_7
##
## Use Dagobah's Qt.
##
QTDIR=$DAGOBAHHOME/qt/redhat_6
## If QT is not set, use VisIt's Qt.
##
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/redhat_6/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/redhat_6/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/redhat_6/lib
fi
##
## Use Dagobah's Python.
......
......@@ -18,10 +18,16 @@ if test -z "$VTK"; then
fi
##
## If QTDIR is not set, use VisIt's Qt.
## If QT is not set, use VisIt's Qt.
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.3.2/irix64_cc_7.3.1.2_64
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/irix64_cc_7.3.1.2_64/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/irix64_cc_7.3.1.2_64/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/irix64_cc_7.3.1.2_64/lib
fi
##
......
......@@ -18,9 +18,17 @@ if test -z "$VTK"; then
fi
##
## Use VisIt's Qt.
## If QT is not set, use VisIt's Qt.
##
QTDIR=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96/lib
fi
##
## Use VisIt's Python.
......
......@@ -23,10 +23,16 @@ if test -z "$VTK"; then
fi
##
## If QTDIR is not set, use our Qt
## If QT is not set, use VisIt's Qt.
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/2.3.0/redhat_7a_ia32_qsw
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/lib
fi
##
......
......@@ -23,10 +23,16 @@ if test -z "$VTK"; then
fi
##
## If QTDIR is not set, use our Qt
## If QT is not set, use VisIt's Qt.
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/2.3.0/redhat_7a_ia32_qsw
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/lib
fi
##
......
......@@ -18,9 +18,17 @@ if test -z "$VTK"; then
fi
##
## Use VisIt's Qt.
## If QT is not set, use VisIt's Qt.
##
QTDIR=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96/lib
fi
##
## Use VisIt's Python.
......
......@@ -23,10 +23,16 @@ if test -z "$VTK"; then
fi
##
## If QTDIR is not set, use VisIt's Qt.
## If QT is not set, use VisIt's Qt.
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3/lib
fi
##
......
......@@ -23,10 +23,16 @@ if test -z "$VTK"; then
fi
##
## If QTDIR is not set, use VisIt's Qt.
## If QT is not set, use VisIt's Qt.
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3/lib
fi
##
......
......@@ -23,10 +23,16 @@ if test -z "$VTK"; then
fi
##
## If QTDIR is not set, use VisIt's Qt.
## If QT is not set, use VisIt's Qt.
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3/lib
fi
##
......
......@@ -23,10 +23,16 @@ if test -z "$VTK"; then
fi
##
## If QTDIR is not set, use VisIt's Qt.
## If QT is not set, use VisIt's Qt.
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/tru64_5_gcc_3.3.3/lib
fi
##
......
......@@ -18,9 +18,17 @@ if test -z "$VTK"; then
fi
##
## Use VisIt's Qt.
## If QT is not set, use VisIt's Qt.
##
QTDIR=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96/lib
fi
##
## Use VisIt's Python.
......
......@@ -18,18 +18,16 @@ if test -z "$VTK"; then
fi
##
## If QTDIR is not set, use VisIt's Qt.
## If QT is not set, use VisIt's Qt.
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.3.2/irix64_cc_7.4_64
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/irix64_cc_7.4_64/bin
fi
##
## If QTDIR is set to the hyper's default QTDIR, use VisIt's Qt
## because hyper's is version 2.1 which is too old.
##
if test "$QTDIR" == "/usr/local/kde/qt"; then
QTDIR=$VISITHOME/qt/3.3.2/irix64_cc_7.4_64
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/irix64_cc_7.4_64/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/irix64_cc_7.4_64/lib
fi
##
......
......@@ -23,10 +23,16 @@ if test -z "$VTK"; then
fi
##
## If QTDIR is not set, use VisIt's Qt.
## If QT is not set, use VisIt's Qt.
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.3.2/aix_5_gcc_3.1
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/aix_5_gcc_3.1/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/aix_5_gcc_3.1/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/aix_5_gcc_3.1/lib
fi
##
......
......@@ -18,9 +18,17 @@ if test -z "$VTK"; then
fi
##
## Use VisIt's Qt.
## If QT is not set, use VisIt's Qt.
##
QTDIR=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96/lib
fi
##
## Use VisIt's Python.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment