Commit 48c83f41 authored by Ken Martin's avatar Ken Martin
Browse files

made GetClassName const and some make fixes

parent f3adf0db
......@@ -10,11 +10,12 @@ SHELL = /bin/sh
#------------------------------------------------------------------------------
CC_FLAGS = ${CPPFLAGS} ${USER_CFLAGS} ${CFLAGS} ${USE_TOOLKIT_FLAGS} \
${GRAPHICS_API_FLAGS}
${GRAPHICS_API_FLAGS} ${JAVA_INCLUDES}
CXX_FLAGS = ${CPPFLAGS} ${USER_CXXFLAGS} ${CXXFLAGS} -I${srcdir} \
${KIT_FLAGS} -I. ${USE_TOOLKIT_FLAGS} ${GRAPHICS_API_FLAGS} \
-I${srcdir}/../common ${TK_INCLUDE} ${TCL_INCLUDE}
-I${srcdir}/../common ${TK_INCLUDE} ${TCL_INCLUDE} \
${JAVA_INCLUDES}
all: ${VTK_LIB_FILE} ${BUILD_TCL} ${BUILD_JAVA}
......@@ -38,10 +39,10 @@ libVTK${ME}.a: ${SRC_OBJ} ${KIT_OBJ}
${RANLIB} libVTK$(ME).a
libVTK$(ME)$(SHLIB_SUFFIX)$(SHLIB_VERSION): ${KIT_OBJ}
rm -f libVTK$(ME)$(SHLIB_SUFFIX)$(SHLIB_VERSION)
libVTK$(ME)$(SHLIB_SUFFIX): ${KIT_OBJ}
rm -f libVTK$(ME)$(SHLIB_SUFFIX)
$(CXX) ${CXX_FLAGS} ${VTK_SHLIB_BUILD_FLAGS} -o \
libVTK$(ME)$(SHLIB_SUFFIX)$(SHLIB_VERSION) \
libVTK$(ME)$(SHLIB_SUFFIX) \
${KIT_OBJ} ${SHLIB_LD_LIBS}
#------------------------------------------------------------------------------
......@@ -56,30 +57,30 @@ libVTK${ME}Tcl.a: tcl/${ME}Init.o ${KIT_LIBS} ${KIT_TCL_OBJ}
${AR} cr libVTK${ME}Tcl.a tcl/${ME}Init.o ${KIT_LIBS} ${KIT_TCL_OBJ}
${RANLIB} libVTK$(ME)Tcl.a
libVTK$(ME)Tcl$(SHLIB_SUFFIX)$(SHLIB_VERSION): tcl/${ME}Init.o ${KIT_LIBS} ${KIT_TCL_OBJ}
rm -f libVTK$(ME)Tcl$(SHLIB_SUFFIX)$(SHLIB_VERSION)
libVTK$(ME)Tcl$(SHLIB_SUFFIX): tcl/${ME}Init.o ${KIT_LIBS} ${KIT_TCL_OBJ}
rm -f libVTK$(ME)Tcl$(SHLIB_SUFFIX)
$(CXX) ${CXX_FLAGS} ${VTK_SHLIB_BUILD_FLAGS} -o \
libVTK$(ME)Tcl$(SHLIB_SUFFIX)$(SHLIB_VERSION) \
libVTK$(ME)Tcl$(SHLIB_SUFFIX) \
tcl/${ME}Init.o ${KIT_LIBS} ${KIT_TCL_OBJ}
#------------------------------------------------------------------------------
# rules for the java library
#
build_java: ${JAVA_CLASSES} ${JAVA_CODE} ${JAVA_CODE_ADD} ${JAVA_O_ADD} ${JAVA_WRAP} libVTK${ME}Java${SHLIB_SUFFIX}${SHLIB_VERSION}
build_java: ${JAVA_CLASSES} ${JAVA_CODE} ${JAVA_CODE_ADD} ${JAVA_O_ADD} ${JAVA_WRAP} libVTK${ME}Java${SHLIB_SUFFIX}
.java.class:
${JAVAC} -d ${JAVA_CLASS_HOME} $<
libVTK$(ME)Java$(SHLIB_SUFFIX)$(SHLIB_VERSION): ${KIT_OBJ} ${JAVA_O_ADD} ${JAVA_WRAP}
rm -f libVTK$(ME)Java$(SHLIB_SUFFIX)$(SHLIB_VERSION)
libVTK$(ME)Java$(SHLIB_SUFFIX): ${KIT_OBJ} ${JAVA_O_ADD} ${JAVA_WRAP}
rm -f libVTK$(ME)Java$(SHLIB_SUFFIX)
$(CXX) ${CSS_FLAGS} ${VTK_SHLIB_BUILD_FLAGS} \
-o libVTK$(ME)Java$(SHLIB_SUFFIX)$(SHLIB_VERSION) \
-o libVTK$(ME)Java$(SHLIB_SUFFIX) \
${KIT_OBJ} ${JAVA_O_ADD} ${JAVA_WRAP}
#------------------------------------------------------------------------------
clean: ${CLEAN_TCL} $(CLEAN_JAVA)
-rm -f *.o *.a *.so *.sl *~ *.make Makefile
-rm -f *.o *.a *.so *.sl *~ Makefile
clean_tcl:
-cd tcl; rm -f *
......@@ -89,14 +90,14 @@ clean_java:
#------------------------------------------------------------------------------
install_tcl_java: install_tcl
@echo "Installing libVTK${ME}Java${SHLIB_SUFFIX}${SHLIB_VERSION}"
@$(INSTALL) libVTK${ME}Java${SHLIB_SUFFIX}${SHLIB_VERSION} $(LIB_INSTALL_DIR)/libVTK${ME}Java${SHLIB_SUFFIX}${SHLIB_VERSION}
@chmod 555 $(LIB_INSTALL_DIR)/libVTK${ME}Java${SHLIB_SUFFIX}${SHLIB_VERSION}
@echo "Installing libVTK${ME}Java${SHLIB_SUFFIX}"
@$(INSTALL) libVTK${ME}Java${SHLIB_SUFFIX} $(LIB_INSTALL_DIR)/libVTK${ME}Java${SHLIB_SUFFIX}
@chmod 555 $(LIB_INSTALL_DIR)/libVTK${ME}Java${SHLIB_SUFFIX}
install_java: install
@echo "Installing libVTK${ME}Java${SHLIB_SUFFIX}${SHLIB_VERSION}"
@$(INSTALL) libVTK${ME}Java${SHLIB_SUFFIX}${SHLIB_VERSION} $(LIB_INSTALL_DIR)/libVTK${ME}Java${SHLIB_SUFFIX}${SHLIB_VERSION}
@chmod 555 $(LIB_INSTALL_DIR)/libVTK${ME}Java${SHLIB_SUFFIX}${SHLIB_VERSION}
@echo "Installing libVTK${ME}Java${SHLIB_SUFFIX}"
@$(INSTALL) libVTK${ME}Java${SHLIB_SUFFIX} $(LIB_INSTALL_DIR)/libVTK${ME}Java${SHLIB_SUFFIX}
@chmod 555 $(LIB_INSTALL_DIR)/libVTK${ME}Java${SHLIB_SUFFIX}
install_tcl: install ${TCL_LIB_FILE}
@echo "Installing ${TCL_LIB_FILE}"
......
......@@ -38,7 +38,7 @@ Welcome to the Visualization Toolkit.
"The Visualization Toolkit, an Object-Oriented Approach to 3D Graphics" is
the title of a new book published by Prentice Hall (ISBN 013199837-4).
This is version 1.3. In this release there have been many bugs fixed and a
This is version 2.0. In this release there have been many bugs fixed and a
number of new classes. Depending on when you get this, there may be more
recent versions out. For more information and a FAQ see our web page at
http://www.cs.rpi.edu/~martink/
......@@ -71,24 +71,24 @@ If you will be using C++ as your development language:
1) untar the src files
2) untar the data files
3) cd vtk1.3
4) read and edit Config.mk (set your CC and CXX variables)
5) ./configure
3) cd vtk
4) ./configure (set your CC and CXX environment variables first)
5) read and edit user.make
6) make
If you will be using tcl in addition to C++:
1) untar the src files
2) untar the data files
3) cd vtk1.3
3) cd vtk
4) obtain and build Tcl/Tk if you don't already have it
5) read and edit Config.mk (set your CC and CXX variables)
6) ./configure --with-tcl
5) ./configure --with-tcl (set your CC and CXX environment variables first)
6) read and edit user.make
7) make
This release has some alpha java support, you can use --with-java but
it is alpha, probably will core dump, and I think it only works on
Sun Solaris. But feel free to experiment.
This release has some java support, you can use --with-java but
I think it only works on Sun Solaris and Windows. But feel free
to experiment.
If you do not have OpenGL, GL, Starbase or XGL the you will need to get and
compile Mesa, a wonderful free version of OpenGL. You will need to add
......@@ -150,6 +150,9 @@ free disk space (not in the vtk tree), a possible name would be
vtk-solaris. cd into this directory and then run configure similar to the
following example:
ls /home/joe_user
vtk vtk-solaris vtk-sgi
cd vtk-solaris
/home/joe_user/vtk/configure --with-tcl
......
......@@ -68,7 +68,7 @@ public:
int Allocate(const int sz, const int ext=1000) {return this->S->Allocate(2*sz,2*ext);};
void Initialize() {this->S->Initialize();};
static vtkAGraymap *New() {return new vtkAGraymap;};
char *GetClassName() {return "vtkAGraymap";};
const char *GetClassName() {return "vtkAGraymap";};
// vtkScalar interface
vtkScalars *MakeObject(int sze, int ext=1000);
......
......@@ -64,7 +64,7 @@ public:
int Allocate(const int sz, const int ext=1000) {return this->S->Allocate(4*sz,4*ext);};
void Initialize() {this->S->Initialize();};
static vtkAPixmap *New() {return new vtkAPixmap;};
char *GetClassName() {return "vtkAPixmap";};
const char *GetClassName() {return "vtkAPixmap";};
// vtkScalar interface
vtkScalars *MakeObject(int sze, int ext=1000);
......
......@@ -60,7 +60,7 @@ public:
vtkBitArray(const vtkBitArray& ia);
~vtkBitArray();
static vtkBitArray *New() {return new vtkBitArray;};
virtual char *GetClassName() {return "vtkBitArray";};
virtual const char *GetClassName() {return "vtkBitArray";};
void PrintSelf(ostream& os, vtkIndent indent);
// access/insertion methods
......
......@@ -61,7 +61,7 @@ public:
int Allocate(const int sz, const int ext=1000) {return this->S->Allocate(sz,ext);};
void Initialize() {this->S->Initialize();};
static vtkBitScalars *New() {return new vtkBitScalars;};
char *GetClassName() {return "vtkBitScalars";};
const char *GetClassName() {return "vtkBitScalars";};
// vtkScalar interface
vtkScalars *MakeObject(int sze, int ext=1000);
......
......@@ -65,7 +65,7 @@ public:
int Allocate(const int sz, const int ext=1000) {return this->S->Allocate(sz,ext);};
void Initialize() {this->S->Initialize();};
static vtkBitmap *New() {return new vtkBitmap;};
char *GetClassName() {return "vtkBitmap";};
const char *GetClassName() {return "vtkBitmap";};
// vtkScalar interface
vtkScalars *MakeObject(int sze, int ext=1000);
......
......@@ -76,7 +76,7 @@ class VTK_EXPORT vtkCell : public vtkObject
public:
vtkCell();
void Initialize(int npts, int *pts, vtkPoints *p);
char *GetClassName() {return "vtkCell";};
const char *GetClassName() {return "vtkCell";};
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
......
......@@ -72,7 +72,7 @@ public:
{return this->Ia->Allocate(sz,ext);};
void Initialize() {this->Ia->Initialize();};
static vtkCellArray *New() {return new vtkCellArray;};
char *GetClassName() {return "vtkCellArray";};
const char *GetClassName() {return "vtkCellArray";};
int GetNumberOfCells();
......
......@@ -66,7 +66,7 @@ public:
vtkCellLinks(int sz, int ext=1000);
~vtkCellLinks();
static vtkCellLinks *New() {return new vtkCellLinks;};
char *GetClassName() {return "vtkCellLinks";};
const char *GetClassName() {return "vtkCellLinks";};
_vtkLink_s &GetLink(int ptId);
unsigned short GetNcells(int ptId);
......
......@@ -73,7 +73,7 @@ public:
~vtkCellTypes();
static vtkCellTypes *New() {return new vtkCellTypes;};
int Allocate(int sz=512, int ext=1000);
char *GetClassName() {return "vtkCellTypes";};
const char *GetClassName() {return "vtkCellTypes";};
void InsertCell(int id, unsigned char type, int loc);
int InsertNextCell(unsigned char type, int loc);
......
......@@ -59,7 +59,7 @@ public:
vtkCharArray(const vtkCharArray& ia);
~vtkCharArray();
static vtkCharArray *New() {return new vtkCharArray;};
char *GetClassName() {return "vtkCharArray";};
const char *GetClassName() {return "vtkCharArray";};
void PrintSelf(ostream& os, vtkIndent indent);
// access/insertion methods
......
......@@ -72,7 +72,7 @@ public:
virtual ~vtkCollection();
void PrintSelf(ostream& os, vtkIndent indent);
static vtkCollection *New() {return new vtkCollection;};
char *GetClassName() {return "vtkCollection";};
const char *GetClassName() {return "vtkCollection";};
void AddItem(vtkObject *);
void ReplaceItem(int i, vtkObject *);
......
......@@ -69,7 +69,7 @@ class VTK_EXPORT vtkColorScalars : public vtkScalars
{
public:
vtkColorScalars() {};
char *GetClassName() {return "vtkColorScalars";};
const char *GetClassName() {return "vtkColorScalars";};
// vtkScalars interface
char *GetScalarType() {return "ColorScalar";};
......
......@@ -60,7 +60,7 @@ public:
vtkContourValues();
~vtkContourValues();
static vtkContourValues *New() {return new vtkContourValues;};
char *GetClassName() {return "vtkContourValues";};
const char *GetClassName() {return "vtkContourValues";};
void PrintSelf(ostream& os, vtkIndent indent);
void SetValue(int i, float value);
......
......@@ -64,7 +64,7 @@ class VTK_EXPORT vtkDataSet : public vtkObject
public:
vtkDataSet();
vtkDataSet(const vtkDataSet& ds);
char *GetClassName() {return "vtkDataSet";};
const char *GetClassName() {return "vtkDataSet";};
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
......
......@@ -59,7 +59,7 @@ public:
vtkDoubleArray(const vtkDoubleArray& fa);
~vtkDoubleArray();
static vtkDoubleArray *New() {return new vtkDoubleArray;};
char *GetClassName() {return "vtkDoubleArray";};
const char *GetClassName() {return "vtkDoubleArray";};
void PrintSelf(ostream& os, vtkIndent indent);
// access/insertion methods
......
......@@ -56,7 +56,7 @@ public:
vtkEdgeTable(int numPoints=1);
~vtkEdgeTable();
static vtkEdgeTable *New() {return new vtkEdgeTable;};
char *GetClassName() {return "vtkEdgeTable";};
const char *GetClassName() {return "vtkEdgeTable";};
// Insert/check existence of edges
int IsEdge(int p1, int p2);
......
......@@ -54,7 +54,7 @@ public:
vtkEmptyCell() {};
vtkEmptyCell(const vtkEmptyCell& p);
static vtkEmptyCell *New() {return new vtkEmptyCell;};
char *GetClassName() {return "vtkEmptyCell";};
const char *GetClassName() {return "vtkEmptyCell";};
vtkCell *MakeObject() {return new vtkEmptyCell(*this);};
int GetCellType() {return VTK_VERTEX;};
......
......@@ -59,7 +59,7 @@ public:
vtkFloatArray(const vtkFloatArray& fa);
~vtkFloatArray();
static vtkFloatArray *New() {return new vtkFloatArray;};
char *GetClassName() {return "vtkFloatArray";};
const char *GetClassName() {return "vtkFloatArray";};
void PrintSelf(ostream& os, vtkIndent indent);
// access/insertion methods
......
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