Commit 8454a4f1 authored by whitlocb's avatar whitlocb

I merged the RC to the trunk.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7480 18c085ea-50e0-402c-830e-de6fd14e8384
parent fdd45983
......@@ -134,7 +134,7 @@ $(tmpbin)/MRUCache_test: MRUCache_test.o $(LIBSHARED)
$(CXX) -o $@ $(LDFLAGS) MRUCache_test.o
$(tmpbin)/StringHelpers_test: StringHelpers_test.o $(LIBSHARED)
$(CXX) -o $@ $(LDFLAGS) StringHelpers_test.o -lutility
$(CXX) $(INCLUDE) -o $@ StringHelpers_test.o $(LDFLAGS) @EXE_LDFLAGS@ -lutility
##
## Automatic dependency stuff
......
......@@ -6,11 +6,18 @@ if test "$BUILD_MODE" == "ComputeNode"; then
CXX="/bgsys/drivers/ppcfloor/gnu-linux/powerpc-bgp-linux/bin/g++"
CFLAGS="-O2 -fPIC"
CXXFLAGS="-O2 -fPIC"
EXE_LDFLAGS="-shared"
VISITARCH="linux-ppc64_bgp_gcc-4.1.2"
QTARCH="linux-ppc64_gcc-4.1.2"
XML2MAKEFILE_CXX="g++"
MESA_VERSION="6.4.2"
# Set the parallel options
BGP_DRIVER_PATH="/bgsys/drivers/ppcfloor"
LDFLAGS="-L$BGP_DRIVER_PATH/comm/lib $LDFLAGS"
CPPFLAGS="-DMPICH_IGNORE_CXX_SEEK -I$BGP_DRIVER_PATH/comm/include $CPPFLAGS"
MPI_LIBS="-lcxxmpich.cnk -lmpich.cnk -ldcmfcoll.cnk -ldcmf.cnk -lpthread -lrt -L$BGP_DRIVER_PATH/runtime/SPI -lSPI.cna"
else
# These are the options that are for xlc. They are right but there's an
# error somewhere that prevents libvisit_vtk from loading.
......
This diff is collapsed.
......@@ -1110,7 +1110,7 @@ if test "$enable_dbio_only" = yes; then
NON_DBIO_PARLIBS=""
else
NON_DBIO_SERLIBS="$""(NON_DBIO_SERLIBS)"
NON_DBIO_PARLIBS="$""(NON_DBIO_SERLIBS)"
NON_DBIO_PARLIBS="$""(NON_DBIO_PARLIBS)"
fi
AC_SUBST(NON_DBIO_SERLIBS)
AC_SUBST(NON_DBIO_PARLIBS)
......@@ -1305,11 +1305,17 @@ AC_SUBST(LIBCOGNOMEN, $ax_lib_cog)
# Set up some Mesa variables.
#
AC_MSG_CHECKING(for Mesa)
MESA_LIBGL="MesaGL"
if test -n "$MESA"; then
AC_MSG_RESULT(found)
MESA_DIR=$MESA
MESA_INCLUDE="-I$""(TOPDIR)/include/mesa"
MESA_LIBS="-lOSMesa -lMesaGL"
if test -e $MESA/lib/libGL.so ; then
MESA_LIBS="-lOSMesa -lGL"
MESA_LIBGL="GL"
else
MESA_LIBS="-lOSMesa -lMesaGL"
fi
else
AC_MSG_RESULT(not found)
MESA_DIR=""
......@@ -1319,6 +1325,7 @@ fi
AC_SUBST(MESA_DIR)
AC_SUBST(MESA_INCLUDE)
AC_SUBST(MESA_LIBS)
AC_SUBST(MESA_LIBGL)
#
# Check to see if we should use the mesa stub library in the viewer.
......@@ -2131,6 +2138,11 @@ case $withval in
ZLIB_LIB="-lz"
AC_DEFINE(HAVE_ZLIB_H,1)
fi
else
# have_zlib_h is empty so use the builtin version.
BUILD_ZLIB=zlib
ZLIB_LIB="-lz"
AC_DEFINE(HAVE_ZLIB_H,1)
fi
;;
builtin)
......@@ -3464,7 +3476,7 @@ if test "$UNAME" = "Linux"; then
else
LDFLAGS="-L$MESA/lib $LDFLAGS"
fi
LIBS="-lOSMesa -lMesaGL $GL_LIBS $X_LIBS $PTHREAD_LIB"
LIBS="$MESA_LIBS $GL_LIBS $X_LIBS $PTHREAD_LIB"
OSMESA_SIZE_LIMIT="4096"
AC_TRY_RUN([
#include <fstream>
......
......@@ -202,7 +202,7 @@ LIBVTKFREETYPE=libvtkfreetype.@SHLIB_LIBEXT@
LIBVTKFTGL=libvtkftgl.@SHLIB_LIBEXT@
LIBVTKSYS=libvtksys.@SHLIB_LIBEXT@
LIBVTKMPEG2ENCODE=libvtkMPEG2Encode.@SHLIB_LIBEXT@
LIBMESAGL=libMesaGL.@SHLIB_LIBEXT@
LIBMESAGL=lib@MESA_LIBGL@.@SHLIB_LIBEXT@
LIBGLU=libGLU.@SHLIB_LIBEXT@
LIBOSMESA=libOSMesa.@SHLIB_LIBEXT@
LIBPYTHON=lib@PYVERSION@.@SHLIB_LIBEXT@
......
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