Commit be1d6a0b authored by miller86's avatar miller86

re-factoring visit_vtk/full into two libs; the original and a new rendering...

re-factoring visit_vtk/full into two libs; the original and a new rendering lib that has GL dependencies

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@6150 18c085ea-50e0-402c-830e-de6fd14e8384
parent 520cbd63
......@@ -67,8 +67,8 @@ SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libavtddf
LIBS_FOR_MACOSX_PREBINDING=$(ZLIB_LIB) $(GLEW_LIBS)
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS)
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS)
##
## Standard targets...
......
......@@ -183,7 +183,7 @@ SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libdatabase
LIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS)
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lplugin -lexpr -lparser -lutility -lvisit_vtk -llightweight_visit_vtk $(LIBS_FOR_MACOSX_PREBINDING)
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lplugin -lexpr -lparser -lutility -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk $(LIBS_FOR_MACOSX_PREBINDING)
SERLIBS=$(COMMONLIBS) -lmir_ser -lpipeline_ser -lavtmath_ser $(VTK_LIBS)
PARLIBS=$(COMMONLIBS) -lmir_par -lpipeline_par -lavtmath_par $(VTK_LIBS) @SHLIB_MPI_LIBS@
......
......@@ -443,7 +443,7 @@ PAROBJ=$(SRC:.C=_par.o)
LIB=libexpressions
SERLIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) -lavtfilters_ser -lavtddf_ser
PARLIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) -lavtfilters_par -lavtddf_par
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lutility -lplugin -lvisit_vtk -llightweight_visit_vtk -lavtview
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lutility -lplugin -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lavtview
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser -ldatabase_ser -lmir_ser $(VTK_LIBS) $(SERLIBS_FOR_MACOSX_PREBINDING) $(X_LIBS) @LIBS@
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par -ldatabase_par -lmir_par $(VTK_LIBS) $(PARLIBS_FOR_MACOSX_PREBINDING) $(X_LIBS) @LIBS@ @SHLIB_MPI_LIBS@
......
......@@ -80,8 +80,8 @@ LIB=libavtwriter
LIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS)
SER_LIBS_FOR_MACOSX_PREBINDING=-lplotter_ser
PAR_LIBS_FOR_MACOSX_PREBINDING=-lplotter_par
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(SER_LIBS_FOR_MACOSX_PREBINDING) $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(PAR_LIBS_FOR_MACOSX_PREBINDING) $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(SER_LIBS_FOR_MACOSX_PREBINDING) $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(PAR_LIBS_FOR_MACOSX_PREBINDING) $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
##
## Standard targets...
......
......@@ -162,7 +162,7 @@ SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libavtfilters
LIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS)
COMMONLIBS=-ldbatts -lstate -lcomm -lmisc -lavtexceptions -lexpr -lparser -lutility -lavtview -lvisit_vtk -llightweight_visit_vtk $(LIBS_FOR_MACOSX_PREBINDING)
COMMONLIBS=-ldbatts -lstate -lcomm -lmisc -lavtexceptions -lexpr -lparser -lutility -lavtview -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk $(LIBS_FOR_MACOSX_PREBINDING)
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser $(VTK_LIBS)
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par $(VTK_LIBS)
......
......@@ -215,8 +215,8 @@ SEROBJ=$(SRC:.C=.o) $(SEROPENGL_OBJ) $(SERMESA_OBJ)
PAROBJ=$(SRC:.C=_par.o) $(PAROPENGL_OBJ) $(PARMESA_OBJ)
LIB=libplotter
LIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(GL_LIBS) $(ZLIB_LIB) $(GLEW_LIBS)
SERLIBS=-ldbatts -lmisc -lcomm -lstate -lexpr -lparser -lutility -lpipeline_ser -lavtview -lavtmath_ser -lavtfilters_ser -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lmisc -lcomm -lstate -lexpr -lparser -lutility -lpipeline_par -lavtview -lavtmath_par -lavtfilters_par -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_par $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
SERLIBS=-ldbatts -lmisc -lcomm -lstate -lexpr -lparser -lutility -lpipeline_ser -lavtview -lavtmath_ser -lavtfilters_ser -lavtexceptions -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lmisc -lcomm -lstate -lexpr -lparser -lutility -lpipeline_par -lavtview -lavtmath_par -lavtfilters_par -lavtexceptions -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_par $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
##
## Standard targets...
......
......@@ -77,7 +77,7 @@ CPPFLAGS=@COMPONENT_CPPFLAGS@ @CPPFLAGS@ @VTKQT_CPPFLAGS@
OBJ=$(SRC:.C=.o)
LIB=libqtviswindow
LIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS)
LIBS=-ldbatts -lviswindow_ser -lpipeline_ser -lavtfilters_ser -lavtmath_ser -lavtview -lavtexceptions -lplotter_ser -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser -lmisc -lstate -lcomm -lexpr -lparser -lutility $(LIBS_FOR_MACOSX_PREBINDING) @VTKQT_LIBS@ $(VTK_LIBS) $(X_LIBS)
LIBS=-ldbatts -lviswindow_ser -lpipeline_ser -lavtfilters_ser -lavtmath_ser -lavtview -lavtexceptions -lplotter_ser -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser -lmisc -lstate -lcomm -lexpr -lparser -lutility $(LIBS_FOR_MACOSX_PREBINDING) @VTKQT_LIBS@ $(VTK_LIBS) $(X_LIBS)
##
## Standard targets...
......
......@@ -285,7 +285,7 @@ PAROBJ=$(SRC:.C=_par.o)
LIB=libquery
SERLIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) -lavtddf_ser -lavtshapelets_ser
PARLIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) -lavtddf_par -lavtshapelets_par
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lutility -lplugin -lavtview -lvisit_vtk -llightweight_visit_vtk
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lutility -lplugin -lavtview -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser -lavtfilters_ser -lexpressions_ser -ldatabase_ser -lmir_ser $(SERLIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS) @LIBS@
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par -lavtfilters_par -lexpressions_par -ldatabase_par -lmir_par $(PARLIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS) @LIBS@ @SHLIB_MPI_LIBS@
......
......@@ -61,8 +61,8 @@ SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libavtshapelets
LIBS_FOR_MACOSX_PREBINDING=$(ZLIB_LIB) $(GLEW_LIBS)
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS)
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS)
##
## Standard targets...
......
......@@ -64,7 +64,7 @@ CPPFLAGS=-I../../include/visit @COMPONENT_CPPFLAGS@ @CPPFLAGS@
OBJ=$(SRC:.C=.o)
LIB=libavtview
LIBS=-lavtexceptions -lstate -lmisc -lcomm -lutility -lvisit_vtk -llightweight_visit_vtk $(VTK_LIBS) $(MESA_LIBS)
LIBS=-lavtexceptions -lstate -lmisc -lcomm -lutility -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk $(VTK_LIBS) $(MESA_LIBS)
##
## Standard targets...
......
......@@ -237,8 +237,8 @@ SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libviswindow
LIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(GL_LIBS) $(ZLIB_LIB) $(GLEW_LIBS)
SERLIBS=-ldbatts -lpipeline_ser -lavtfilters_ser -lavtmath_ser -lavtexceptions -lavtview -lmisc -lstate -lcomm -lexpr -lparser -lutility -lplotter_ser -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser @VTKQT_LIBS@ $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtfilters_par -lavtmath_par -lavtexceptions -lavtview -lmisc -lstate -lcomm -lexpr -lparser -lutility -lplotter_par -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_par @VTKQT_LIBS@ $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
SERLIBS=-ldbatts -lpipeline_ser -lavtfilters_ser -lavtmath_ser -lavtexceptions -lavtview -lmisc -lstate -lcomm -lexpr -lparser -lutility -lplotter_ser -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser @VTKQT_LIBS@ $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtfilters_par -lavtmath_par -lavtexceptions -lavtview -lmisc -lstate -lcomm -lexpr -lparser -lutility -lplotter_par -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_par @VTKQT_LIBS@ $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
##
## Standard targets...
......
......@@ -5901,13 +5901,14 @@ else
echo "${ECHO_T}no" >&6
fi
echo "$as_me:$LINENO: checking for library containing strerror" >&5
echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
if test "${ac_cv_search_strerror+set}" = set; then
echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
if test "${ac_cv_lib_cposix_strerror+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_func_search_save_LIBS=$LIBS
ac_cv_search_strerror=no
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcposix $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
......@@ -5952,80 +5953,24 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_search_strerror="none required"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test "$ac_cv_search_strerror" = no; then
for ac_lib in cposix; do
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char strerror ();
int
main ()
{
strerror ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_search_strerror="-l$ac_lib"
break
ac_cv_lib_cposix_strerror=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_cposix_strerror=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
done
LIBS=$ac_check_lib_save_LIBS
fi
LIBS=$ac_func_search_save_LIBS
echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
if test $ac_cv_lib_cposix_strerror = yes; then
LIBS="$LIBS -lcposix"
fi
echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
echo "${ECHO_T}$ac_cv_search_strerror" >&6
if test "$ac_cv_search_strerror" != no; then
test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
fi
BUILD_FORTRAN=""
......@@ -10172,7 +10117,7 @@ ac_x_header_dirs='
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Xlib.h.
# Guess where to find include files, by looking for Intrinsic.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
......@@ -10180,7 +10125,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <X11/Xlib.h>
#include <X11/Intrinsic.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
......@@ -10207,7 +10152,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
if test -r "$ac_dir/X11/Intrinsic.h"; then
ac_x_includes=$ac_dir
break
fi
......@@ -10221,18 +10166,18 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
LIBS="-lXt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <X11/Xlib.h>
#include <X11/Intrinsic.h>
int
main ()
{
XrmInitialize ()
XtMalloc (0)
;
return 0;
}
......@@ -11843,7 +11788,7 @@ case $UNAME in
SHLIB_ESERLIBS="$""(ESERLIBS) -Wl,-install_name,@executable_path/../plugins/$""(PLUGINDIR)/libE$""(PLUGINNAME)_ser.dylib,-compatibility_version,$COMPATIBILITY_VERSION,-current_version,$COMPATIBILITY_VERSION"
SHLIB_EPARLIBS="$""(EPARLIBS) -Wl,-install_name,@executable_path/../plugins/$""(PLUGINDIR)/libE$""(PLUGINNAME)_par.dylib,-compatibility_version,$COMPATIBILITY_VERSION,-current_version,$COMPATIBILITY_VERSION"
PREBIND_LIBS="$""(PREBIND_LIBS) $""(GLEW_LIBS) $""(MESA_LIBS) -lvisit_vtk"
PREBIND_LIBS="$""(PREBIND_LIBS) $""(GLEW_LIBS) $""(MESA_LIBS) -lrendering_visit_vtk"
;;
esac
# these might be overridden in a config-site file and thus must be set last
......@@ -19858,6 +19803,7 @@ TOOLS_FILES="tools/Makefile
VISIT_VTK_FILES="visit_vtk/Makefile
visit_vtk/lightweight/Makefile
visit_vtk/full/Makefile
visit_vtk/rendering/Makefile
visit_vtk/parallel/Makefile"
COMPONENT_FILES="avt/Makefile
avt/DBAtts/Makefile
......
......@@ -3639,7 +3639,7 @@ case $UNAME in
SHLIB_ESERLIBS="$""(ESERLIBS) -Wl,-install_name,@executable_path/../plugins/$""(PLUGINDIR)/libE$""(PLUGINNAME)_ser.dylib,-compatibility_version,$COMPATIBILITY_VERSION,-current_version,$COMPATIBILITY_VERSION"
SHLIB_EPARLIBS="$""(EPARLIBS) -Wl,-install_name,@executable_path/../plugins/$""(PLUGINDIR)/libE$""(PLUGINNAME)_par.dylib,-compatibility_version,$COMPATIBILITY_VERSION,-current_version,$COMPATIBILITY_VERSION"
PREBIND_LIBS="$""(PREBIND_LIBS) $""(GLEW_LIBS) $""(MESA_LIBS) -lvisit_vtk"
PREBIND_LIBS="$""(PREBIND_LIBS) $""(GLEW_LIBS) $""(MESA_LIBS) -lrendering_visit_vtk"
;;
esac
# these might be overridden in a config-site file and thus must be set last
......@@ -3999,6 +3999,7 @@ TOOLS_FILES="tools/Makefile
VISIT_VTK_FILES="visit_vtk/Makefile
visit_vtk/lightweight/Makefile
visit_vtk/full/Makefile
visit_vtk/rendering/Makefile
visit_vtk/parallel/Makefile"
COMPONENT_FILES="avt/Makefile
avt/DBAtts/Makefile
......
......@@ -279,6 +279,9 @@
# Brad Whitlock, Tue Dec 2 12:28:19 PST 2008
# I changed the enginewrapper targets so they can have an rpath built in.
#
# Mark C. Miller, Tue Jan 27 18:03:23 PST 2009
# Removed refs to $(FILIB) which was for the FAST INTERVAL LIBRARY and
# was replaced by some Boost builtin libs.
##############################################################################
##
......@@ -295,7 +298,7 @@ CPPFLAGS= -I@tmpinc@ @ENGINE_CPPFLAGS@ @PLATFORM_CPPFLAGS@ @CPPFLAGS@ \
-I. -I../../include/visit
COMMONLIBS=-L../../lib -lplugin -lavtview \
-lvisit_vtk -llightweight_visit_vtk \
-lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk \
-lenginerpc -lutility -lmisc -lcomm -lstate \
-ldbatts -lavtexceptions -lexpr -lexpr -lparser \
$(VISIT_VTK_LDFLAGS)
......@@ -305,14 +308,14 @@ SERLIBS=$(COMMONLIBS) -lviswindow_ser -lplotter_ser -lmir_ser -lavtwriter_ser \
-lexpressions_ser -lavtfilters_ser -lpipeline_ser \
-lengineparstate_ser -lparallel_visit_vtk_ser \
$(GLEW_LIBS) @VTKQT_LIBS@ $(VTK_LIBS) $(MESA_LIBS) $(GL_LIBS) $(X_LIBS) $(ZLIB_LIB) \
$(FILIB_LIBS) @LIBS@ @PTHREAD_LIB@ @TCMALLOC_LIB@
@LIBS@ @PTHREAD_LIB@ @TCMALLOC_LIB@
PARLIBS=$(COMMONLIBS) -lviswindow_par -lplotter_par -lmir_par -lavtwriter_par \
-lavtddf_par -lavtivp_par -lavtmath_par -lavtshapelets_par -ldatabase_par -lquery_par\
-lexpressions_par -lavtfilters_par -lpipeline_par \
-lengineparstate_par -lparallel_visit_vtk_par \
$(GLEW_LIBS) @VTKQT_LIBS@ $(VTK_LIBS) $(MESA_LIBS) $(GL_LIBS) $(X_LIBS) \
$(ZLIB_LIB) $(FILIB_LIBS) @LIBS@ @PTHREAD_LIB@ @TCMALLOC_LIB@
$(ZLIB_LIB) @LIBS@ @PTHREAD_LIB@ @TCMALLOC_LIB@
SERLIBDEP=../../lib/libplugin.@SHLIB_LIBEXT@ ../../lib/libplotter_ser.@SHLIB_LIBEXT@ \
../../lib/libdatabase_ser.@SHLIB_LIBEXT@ ../../lib/libpipeline_ser.@SHLIB_LIBEXT@ \
......
../../visit_vtk/full/InitVTK.h
\ No newline at end of file
../../visit_vtk/rendering/InitVTK.h
\ No newline at end of file
../../visit_vtk/rendering/rendering_visit_vtk_exports.h
\ No newline at end of file
../../visit_vtk/full/vtkBackgroundActor.h
\ No newline at end of file
../../visit_vtk/rendering/vtkBackgroundActor.h
\ No newline at end of file
../../visit_vtk/full/vtkDashedXorGridMapper2D.h
\ No newline at end of file
../../visit_vtk/rendering/vtkDashedXorGridMapper2D.h
\ No newline at end of file
../../visit_vtk/full/vtkLineLegend.h
\ No newline at end of file
../../visit_vtk/rendering/vtkLineLegend.h
\ No newline at end of file
../../visit_vtk/full/vtkRubberBandMapper2D.h
\ No newline at end of file
../../visit_vtk/rendering/vtkRubberBandMapper2D.h
\ No newline at end of file
../../visit_vtk/full/vtkTexturedBackgroundActor.h
\ No newline at end of file
../../visit_vtk/rendering/vtkTexturedBackgroundActor.h
\ No newline at end of file
../../visit_vtk/full/vtkTimeSliderActor.h
\ No newline at end of file
../../visit_vtk/rendering/vtkTimeSliderActor.h
\ No newline at end of file
../../visit_vtk/full/vtkTriad2D.h
\ No newline at end of file
../../visit_vtk/rendering/vtkTriad2D.h
\ No newline at end of file
../../visit_vtk/full/vtkVerticalScalarBarActor.h
\ No newline at end of file
../../visit_vtk/rendering/vtkVerticalScalarBarActor.h
\ No newline at end of file
../../visit_vtk/full/vtkVerticalScalarBarWithOpacityActor.h
\ No newline at end of file
../../visit_vtk/rendering/vtkVerticalScalarBarWithOpacityActor.h
\ No newline at end of file
../../visit_vtk/full/vtkVisItAxisActor.h
\ No newline at end of file
../../visit_vtk/rendering/vtkVisItAxisActor.h
\ No newline at end of file
../../visit_vtk/full/vtkVisItAxisActor2D.h
\ No newline at end of file
../../visit_vtk/rendering/vtkVisItAxisActor2D.h
\ No newline at end of file
../../visit_vtk/full/vtkVisItCubeAxesActor.h
\ No newline at end of file
../../visit_vtk/rendering/vtkVisItCubeAxesActor.h
\ No newline at end of file
../../visit_vtk/full/vtkVisItDataSetMapper.h
\ No newline at end of file
../../visit_vtk/rendering/vtkVisItDataSetMapper.h
\ No newline at end of file
../../visit_vtk/full/vtkVisItMesaPolyDataMapper.h
\ No newline at end of file
../../visit_vtk/rendering/vtkVisItMesaPolyDataMapper.h
\ No newline at end of file
../../visit_vtk/full/vtkVisItOpenGLPolyDataMapper.h
\ No newline at end of file
../../visit_vtk/rendering/vtkVisItOpenGLPolyDataMapper.h
\ No newline at end of file
......@@ -60,8 +60,8 @@
CPPFLAGS=-I. -I../../include -I../../include/visit
SERLIBS=-L../../lib -lXext -lprep_ser -ldatabase_ser -lpipeline_ser -lvisit_vtk -lutility -lmisc -lcomm -lrpc -lstate -ldbatts -lavtexceptions @SILO_LIB@ @VTK_LIBS@ $(X_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) @LIBS@ @PTHREAD_LIB@
PARLIBS=-L../../lib -lXext -lprep_par -ldatabase_par -lpipeline_par -lvisit_vtk -lutility -lmisc -lcomm -lrpc -lstate -ldbatts -lavtexceptions @SILO_LIB@ @VTK_LIBS@ $(X_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) @LIBS@ @MPI_LIBS@ @PTHREAD_LIB@
SERLIBS=-L../../lib -lXext -lprep_ser -ldatabase_ser -lpipeline_ser -lvisit_vtk -lrendering_visit_vtk -lutility -lmisc -lcomm -lrpc -lstate -ldbatts -lavtexceptions @SILO_LIB@ @VTK_LIBS@ $(X_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) @LIBS@ @PTHREAD_LIB@
PARLIBS=-L../../lib -lXext -lprep_par -ldatabase_par -lpipeline_par -lvisit_vtk -lrendering_visit_vtk -lutility -lmisc -lcomm -lrpc -lstate -ldbatts -lavtexceptions @SILO_LIB@ @VTK_LIBS@ $(X_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) @LIBS@ @MPI_LIBS@ @PTHREAD_LIB@
LIBDEP=
##
......
......@@ -81,35 +81,66 @@
CPPFLAGS=-I. -I../../include -I../../include/visit
SERLIBS=-L../../lib -ldatabase_ser -lpipeline_ser -lexpressions_ser -lplotter_ser -lparallel_visit_vtk_ser -lavtfilters_ser -lavtview -lavtddf_ser -lexpr -lparser -lvisit_vtk -llightweight_visit_vtk -lutility -lmisc -lcomm -lstate -ldbatts -lavtmath_ser -lavtivp_ser -lavtexceptions -lmir_ser -lplugin @VTK_LIBS@ $(MESA_LIBS) $(GL_LIBS) $(X_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) $(VISIT_VTK_LDFLAGS) $(FILIB_LIBS) @LIBS@ @PTHREAD_LIB@
PARLIBS=-L../../lib -ldatabase_par -lpipeline_par -lexpressions_par -lplotter_par -lparallel_visit_vtk_par -lavtfilters_par -lavtview -lavtddf_par -lexpr -lparser -lvisit_vtk -llightweight_visit_vtk -lutility -lmisc -lcomm -lstate -ldbatts -lavtmath_par -lavtivp_par -lavtexceptions -lmir_par -lplugin @VTK_LIBS@ $(MESA_LIBS) $(GL_LIBS) $(X_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) $(VISIT_VTK_LDFLAGS) $(FILIB_LIBS) @LIBS@ @MPI_LIBS@ @PTHREAD_LIB@
SERLIBS=-L../../lib -ldatabase_ser -lpipeline_ser -lexpressions_ser -lplotter_ser -lparallel_visit_vtk_ser -lavtfilters_ser -lavtview -lavtddf_ser -lexpr -lparser -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lutility -lmisc -lcomm -lstate -ldbatts -lavtmath_ser -lavtivp_ser -lavtexceptions -lmir_ser -lplugin @VTK_LIBS@ $(MESA_LIBS) $(GL_LIBS) $(X_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) $(VISIT_VTK_LDFLAGS) $(FILIB_LIBS) @LIBS@ @PTHREAD_LIB@
PARLIBS=-L../../lib -ldatabase_par -lpipeline_par -lexpressions_par -lplotter_par -lparallel_visit_vtk_par -lavtfilters_par -lavtview -lavtddf_par -lexpr -lparser -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lutility -lmisc -lcomm -lstate -ldbatts -lavtmath_par -lavtivp_par -lavtexceptions -lmir_par -lplugin @VTK_LIBS@ $(MESA_LIBS) $(GL_LIBS) $(X_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) $(VISIT_VTK_LDFLAGS) $(FILIB_LIBS) @LIBS@ @MPI_LIBS@ @PTHREAD_LIB@
LIBDEP=
##
## We don't want GL dependencies, so define a VTK lib variable
## with those removed and anything else from VTK we DON'T need.
##
MY_VTK_LIBS=`echo "@VTK_LIBS@" | tr ' ' '\n' | grep -v "vtkRendering\\\|vtkftgl\\\|vtkfreetype"`
SERLIBS_LITE=-L../../lib -ldatabase_ser -lpipeline_ser -lavtddf_ser -lexpr -lparser -lvisit_vtk -llightweight_visit_vtk -lutility -lmisc -lcomm -lstate -ldbatts -lavtmath_ser -lavtivp_ser -lavtexceptions -lmir_ser -lplugin $(MY_VTK_LIBS) $(ZLIB_LIB) $(VISIT_VTK_LDFLAGS) $(FILIB_LIBS) @LIBS@ @PTHREAD_LIB@
PARLIBS_LITE=-L../../lib -ldatabase_par -lpipeline_par -lavtddf_par -lexpr -lparser -lvisit_vtk -llightweight_visit_vtk -lutility -lmisc -lcomm -lstate -ldbatts -lavtmath_par -lavtivp_par -lavtexceptions -lmir_par -lplugin $(MY_VTK_LIBS) $(ZLIB_LIB) $(VISIT_VTK_LDFLAGS) $(FILIB_LIBS) @LIBS@ @MPI_LIBS@ @PTHREAD_LIB@
##
## Files...
##
SRC=convert.C
SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
SEROBJ_LITE=convert_ser_lite.o
PAROBJ_LITE=convert_par_lite.o
##
## Standard targets...
##
all: $(LIB) @CONVERT_SER@ @CONVERT_PAR@
all: $(LIB) @CONVERT_SER@ @CONVERT_PAR@ @CONVERT_SER@_lite @CONVERT_PAR@_lite
clean:
$(RM) $(SEROBJ) $(PAROBJ) @CONVERT_SER@ @CONVERT_PAR@
$(RM) $(SEROBJ_LITE) $(PAROBJ_LITE) @CONVERT_SER@_lite @CONVERT_PAR@_lite
##
## Other targets...
##
$(SEROBJ_LITE): $(SRC)
source='$<' object='$@' libtool=no \
depfile='./$*.d' tmpdepfile='./$*.tmp_d' \
$(DEPMODE) $(TOPDIR)/bin/depcomp \
$(CXX) -DDISABLE_EXPRESSIONS $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
@OS_RULE@
$(PAROBJ_LITE): $(SRC)
source='$<' object='$@' libtool=no \
depfile='./$*_par.d' tmpdepfile='./$*.tmp_par_d' \
$(DEPMODE) $(TOPDIR)/bin/depcomp \
$(CXX) -DDISABLE_EXPRESSIONS $(CXXFLAGS) $(CPPFLAGS) @PARALLEL_CPPFLAGS@ -c $< -o $@
@OS_RULE@
@CONVERT_SER@ or_no_ser: $(LIBDEP) $(SEROBJ)
$(CXX) -o $@ $(SEROBJ) $(LDFLAGS) $(SERLIBS)
@CONVERT_PAR@ or_no_par: $(LIBDEP) $(PAROBJ)
$(CXX) -o $@ $(PAROBJ) $(LDFLAGS) $(PARLIBS) @MPI_LIBS@
@CONVERT_SER@_lite: $(LIBDEP) $(SEROBJ_LITE) @CONVERT_SER@
$(CXX) -o $@ $(SEROBJ_LITE) $(LDFLAGS) $(SERLIBS_LITE)
@CONVERT_PAR@_lite: $(LIBDEP) $(PAROBJ_LITE) @CONVERT_PAR@
$(CXX) -o $@ $(PAROBJ_LITE) $(LDFLAGS) $(PARLIBS_LITE) @MPI_LIBS@
##
## Automatic dependency stuff
##
......
......@@ -45,16 +45,20 @@
#include <DatabasePluginInfo.h>
#include <VisItInit.h>
#ifndef DISABLE_EXPRESSIONS
#include <ExprParser.h>
#include <ParsingExprList.h>
#endif
#include <Utility.h>
#include <avtDatabase.h>
#include <avtDatabaseFactory.h>
#include <avtDatabaseMetaData.h>
#include <avtDatabaseWriter.h>
#ifndef DISABLE_EXPRESSIONS
#include <avtExpressionEvaluatorFilter.h>
#include <avtExprNodeFactory.h>
#endif
#include <DBOptionsAttributes.h>
#include <VisItException.h>
......@@ -439,6 +443,7 @@ int main(int argc, char *argv[])
}
}
#ifndef DISABLE_EXPRESSIONS
//
// Hook up the expressions we have associated with the database, so
// we can get those as well.
......@@ -451,14 +456,17 @@ int main(int argc, char *argv[])
const Expression *e = md->GetExpression(i);
list->AddExpressions(*e);
}
#endif
cerr << "Operating on " << md->GetNumStates() << " timestep(s)." << endl;
for (i = 0 ; i < md->GetNumStates() ; i++)
{
avtDataObject_p dob = db->GetOutput(meshname.c_str(), i);
#ifndef DISABLE_EXPRESSIONS
avtExpressionEvaluatorFilter eef;
eef.SetInput(dob);
dob = eef.GetOutput();
#endif
wrtr->SetInput(dob);
char filename[1024];
......
......@@ -37,6 +37,10 @@
# Dave Pugmire, Fri Oct 3 11:29:19 EDT 2008
# Added avtIVP libs.
#
# Mark C. Miller, Tue Jan 27 18:03:23 PST 2009
# Removed refs to $(FILIB) which was for the FAST INTERVAL LIBRARY and
# was replaced by some Boost builtin libs.
#
##############################################################################
##
......@@ -53,10 +57,10 @@ VTK_INCLUDE=@VTK_INCLUDES@
LIBS=-L../../lib -L../../vtkqt -lviewer -lengineproxy -lenginerpc -lviewerrpc \
-lmdserverproxy -lmdserverrpc -lvclproxy -lvclrpc -ldbatts -lexpr \
-lexpr -lparser -lplugin -lqtviswindow -lviswindow_ser -lavtivp_ser -lavtmath_ser -lplotter_ser \
-lavtfilters_ser -lavtwriter_ser -lavtview -lpipeline_ser -lvisit_vtk \
-lavtfilters_ser -lavtwriter_ser -lavtview -lpipeline_ser -lvisit_vtk -lrendering_visit_vtk \
-llightweight_visit_vtk -lparallel_visit_vtk_ser -lvtkqt -lwinutil \
@QT_LIBS@ -lproxybase -lmisc -lcomm -lstate -lutility -lavtexceptions \
$(VTK_LIBS) $(X_LIBS) $(BZIP2_LIBS) $(GLEW_LIBS) $(FILIB_LIBS) @LIBS@ @PTHREAD_LIB@
$(VTK_LIBS) $(X_LIBS) $(BZIP2_LIBS) $(GLEW_LIBS) @LIBS@ @PTHREAD_LIB@
LDFLAGS=@LDFLAGS@ @QT_LDFLAGS@ @EXE_LDFLAGS@
LIBDEP=
......
......@@ -47,7 +47,7 @@
CPPFLAGS=-I. -I../../include -I../../include/visit
AVT_LIBS=-lpipeline_ser -lavtmath_ser -lavtfilters_ser -lavtview -lplotter_ser -lavtivp_ser
VISIT_VTK_LIBS=-lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser
VISIT_VTK_LIBS=-lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser
EXTRA_LIBS=$(AVT_LIBS) $(VISIT_VTK_LIBS) $(VTK_LIBS) $(X_LIBS) $(MESA_LIBS) $(GLEW_LIBS) $(ZLIB_LIB) $(GL_LIBS) $(PTHREAD_LIB)
LIBS=-L../../lib -lengineproxy -lenginerpc -lmdserverproxy -lmdserverrpc -lvclproxy -lvclrpc -lproxybase -lplugin -ldbatts -lexpr -lparser -lavtexceptions -lcomm -lstate -lutility -lmisc $(EXTRA_LIBS)
......
......@@ -318,6 +318,9 @@
# Brad Whitlock, Fri Oct 3 10:35:38 EDT 2008
# Added avtIVP to the link line.
#
# Mark C. Miller, Tue Jan 27 18:03:23 PST 2009
# Removed refs to $(FILIB) which was for the FAST INTERVAL LIBRARY and
# was replaced by some Boost builtin libs.
##############################################################################
##
......@@ -336,11 +339,11 @@ VTK_INCLUDE=@VTK_INCLUDES@
LIBS=-L../../lib -L../../vtkqt -lengineproxy -lenginerpc -lviewerrpc \
-lmdserverproxy -lmdserverrpc -lvclproxy -lvclrpc -ldbatts -lexpr \
-lexpr -lparser -lplugin -lqtviswindow -lviswindow_ser -lavtmath_ser -lplotter_ser \
-lavtfilters_ser -lavtwriter_ser -lavtview -lpipeline_ser -lvisit_vtk -lavtivp_ser \
-lavtfilters_ser -lavtwriter_ser -lavtview -lpipeline_ser -lvisit_vtk -lrendering_visit_vtk -lavtivp_ser \
-llightweight_visit_vtk -lparallel_visit_vtk_ser -lvtkqt -lwinutil \
-lproxybase -lmisc -lcomm -lstate -lutility -lavtexceptions \
$(QT_CORE_LIB) $(QT_GUI_LIB) $(QT_NETWORK_LIB) $(QT_OPENGL_LIB) \
$(VTK_LIBS) $(X_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) $(FILIB_LIBS) @LIBS@ @PTHREAD_LIB@
$(VTK_LIBS) $(X_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) @LIBS@ @PTHREAD_LIB@
LDFLAGS=@LDFLAGS@ @QT_LDFLAGS@ @EXE_LDFLAGS@
LIBDEP=
......
......@@ -49,7 +49,7 @@
@VARIABLES@
@DIRTARGETS@
SUBDIRS=lightweight full parallel
SUBDIRS=lightweight full rendering parallel
message:
@echo
......
......@@ -317,27 +317,11 @@
##
## Files...
##
OPENGL_SRC=vtkVisItOpenGLPolyDataMapper.C \
vtkOpenGLRectilinearGridMapper.C \
vtkOpenGLStructuredGridMapper.C \
vtkOpenGLTexturedBackgroundMapper.C \
vtkVisItOpenGLTexture.C
MESA_SRC=vtkOSMesaRenderWindow.C \
vtkMesaRectilinearGridMapper.C \
vtkMesaStructuredGridMapper.C \
vtkMesaTexturedBackgroundMapper.C \
vtkVisItMesaPolyDataMapper.C
SRC=InitVTK.C \
vtkAxisDepthSort.C \
vtkBackgroundActor.C \
SRC= vtkAxisDepthSort.C \
vtkConnectedTubeFilter.C \
vtkCSGGrid.C \
vtkDashedXorGridMapper2D.C \
vtkDataSetRemoveGhostCells.C \
vtkDisjointCubesFacelistFilter.C \
vtkLineLegend.C \
vtkLineoutFilter.C \
vtkLinesFromOriginalCells.C \
vtkMultiFontVectorText.C \
......@@ -347,36 +331,24 @@ SRC=InitVTK.C \
vtkPPMWriter.C \
vtkRGBWriter.C \
vtkRectilinearGridFacelistFilter.C \
vtkRectilinearGridMapper.C \
vtkRectilinearLinesNoDataFilter.C \
vtkRubberBandMapper2D.C \
vtkSkewLookupTable.C \
vtkSlicer.C \
vtkStructuredGridFacelistFilter.C \
vtkStructuredGridMapper.C \
vtkSurfaceFilter.C \
vtkSurfaceFromVolume.C \
vtkTensorReduceFilter.C \
vtkTexturedBackgroundActor.C \
vtkTimeSliderActor.C \
vtkTriad2D.C \
vtkUniqueFeatureEdges.C \
vtkUnstructuredGridRelevantPointsFilter.C \
vtkVectorFontCharacterData.C \
vtkVectorGlyph.C \
vtkVectorReduceFilter.C \
vtkVertexFilter.C \
vtkVerticalScalarBarActor.C \
vtkVerticalScalarBarWithOpacityActor.C \
vtkVisItAxisActor.C \
vtkVisItAxisActor2D.C \
vtkVisItCellDataToPointData.C \
vtkVisItCellLocator.C \
vtkVisItClipper.C \
vtkVisItContourFilter.C \
vtkVisItCubeAxesActor.C \
vtkVisItCutter.C \
vtkVisItDataSetMapper.C \
vtkVisItExtractGrid.C \
vtkVisItExtractRectilinearGrid.C \
vtkVisItFeatureEdges.C \
......@@ -393,13 +365,11 @@ SRC=InitVTK.C \
vtkVisItTIFFWriter.C \
vtkVolumeFromVolume.C
CPPFLAGS=-I$(TOPDIR)/include @VISIT_VTK_CPPFLAGS@ @CPPFLAGS@ @ANNOTATION_FLAGS@ -I../../include -I. $(GLEW_INCLUDE)
OBJ=$(SRC:.C=.o) $(OPENGL_OBJ) $(MESA_OBJ)
CPPFLAGS=-I$(TOPDIR)/include @VISIT_VTK_CPPFLAGS@ @CPPFLAGS@ @ANNOTATION_FLAGS@ -I../../include -I.
OBJ=$(SRC:.C=.o)
LIB=libvisit_vtk
LIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(GL_LIBS) -framework Carbon
LIBS=-lmisc -lavtexceptions -llightweight_visit_vtk $(GLEW_LIBS) $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS)
LIBS_FOR_MACOSX_PREBINDING=-framework Carbon
LIBS=-lmisc -lavtexceptions -llightweight_visit_vtk $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING)
##
......