Commit ab54fa77 authored by Ken Martin's avatar Ken Martin
Browse files

merges from the main tree and some exclusions

parent bb27ec99
...@@ -44,12 +44,6 @@ vtkPointWidget.cxx ...@@ -44,12 +44,6 @@ vtkPointWidget.cxx
vtkPolyDataSourceWidget.cxx vtkPolyDataSourceWidget.cxx
vtkPolyDataToImageStencil.cxx vtkPolyDataToImageStencil.cxx
vtkProcrustesAlignmentFilter.cxx vtkProcrustesAlignmentFilter.cxx
vtkPushImageFilterSample.cxx
vtkPushImageReader.cxx
vtkPushPipeline.cxx
vtkRIBExporter.cxx
vtkRIBLight.cxx
vtkRIBProperty.cxx
vtkRenderLargeImage.cxx vtkRenderLargeImage.cxx
vtkScalarBarWidget.cxx vtkScalarBarWidget.cxx
vtkSphereWidget.cxx vtkSphereWidget.cxx
......
...@@ -10,18 +10,10 @@ SET(KIT_JAVA_LIBS vtkGraphicsJava vtkImagingJava) ...@@ -10,18 +10,10 @@ SET(KIT_JAVA_LIBS vtkGraphicsJava vtkImagingJava)
SET(KIT_LIBS vtkGraphics vtkImaging vtkIO) SET(KIT_LIBS vtkGraphics vtkImaging vtkIO)
SET( Kit_SRCS SET( Kit_SRCS
vtkDecimate.cxx
vtkDividingCubes.cxx
vtkGridSynchronizedTemplates3D.cxx vtkGridSynchronizedTemplates3D.cxx
vtkImageMarchingCubes.cxx
vtkKitwareContourFilter.cxx vtkKitwareContourFilter.cxx
vtkKitwareCutter.cxx vtkKitwareCutter.cxx
vtkMarchingContourFilter.cxx
vtkMarchingCubes.cxx
vtkMarchingSquares.cxx
vtkRectilinearSynchronizedTemplates.cxx vtkRectilinearSynchronizedTemplates.cxx
vtkSliceCubes.cxx
vtkSweptSurface.cxx
vtkSynchronizedTemplates2D.cxx vtkSynchronizedTemplates2D.cxx
vtkSynchronizedTemplates3D.cxx vtkSynchronizedTemplates3D.cxx
) )
......
...@@ -38,7 +38,6 @@ vtkFollower.cxx ...@@ -38,7 +38,6 @@ vtkFollower.cxx
vtkFrustumCoverageCuller.cxx vtkFrustumCoverageCuller.cxx
vtkGenericRenderWindowInteractor.cxx vtkGenericRenderWindowInteractor.cxx
vtkGraphicsFactory.cxx vtkGraphicsFactory.cxx
vtkIVExporter.cxx
vtkImageActor.cxx vtkImageActor.cxx
vtkImageMapper.cxx vtkImageMapper.cxx
vtkImageViewer.cxx vtkImageViewer.cxx
...@@ -68,8 +67,6 @@ vtkLightCollection.cxx ...@@ -68,8 +67,6 @@ vtkLightCollection.cxx
vtkLightKit.cxx vtkLightKit.cxx
vtkMapper.cxx vtkMapper.cxx
vtkMapperCollection.cxx vtkMapperCollection.cxx
vtkOBJExporter.cxx
vtkOOGLExporter.cxx
vtkParallelCoordinatesActor.cxx vtkParallelCoordinatesActor.cxx
vtkPicker.cxx vtkPicker.cxx
vtkPointPicker.cxx vtkPointPicker.cxx
...@@ -99,7 +96,6 @@ vtkUnstructuredGridBunykRayCastFunction.cxx ...@@ -99,7 +96,6 @@ vtkUnstructuredGridBunykRayCastFunction.cxx
vtkUnstructuredGridVolumeMapper.cxx vtkUnstructuredGridVolumeMapper.cxx
vtkUnstructuredGridVolumeRayCastFunction.cxx vtkUnstructuredGridVolumeRayCastFunction.cxx
vtkUnstructuredGridVolumeRayCastMapper.cxx vtkUnstructuredGridVolumeRayCastMapper.cxx
vtkVRMLExporter.cxx
vtkVolume.cxx vtkVolume.cxx
vtkVolumeCollection.cxx vtkVolumeCollection.cxx
vtkVolumeMapper.cxx vtkVolumeMapper.cxx
...@@ -123,12 +119,6 @@ IF (VTK_HAVE_VP1000) ...@@ -123,12 +119,6 @@ IF (VTK_HAVE_VP1000)
) )
ENDIF (VTK_HAVE_VP1000) ENDIF (VTK_HAVE_VP1000)
IF(VTK_USE_GL2PS)
SET(Kit_SRCS ${Kit_SRCS} vtkGL2PSExporter.cxx)
SET(Kit_GL2PS_SRCS ${VTK_SOURCE_DIR}/Utilities/gl2ps/gl2ps.c)
ADD_DEFINITIONS(-DGL2PS_HAVE_ZLIB)
ENDIF(VTK_USE_GL2PS)
SET( KitOpenGL_SRCS SET( KitOpenGL_SRCS
vtkOpenGLActor.cxx vtkOpenGLActor.cxx
vtkOpenGLCamera.cxx vtkOpenGLCamera.cxx
......
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