Changeset 2681 for branches/blt4/packages/vizservers/vtkvis/Makefile.in

Timestamp:

Nov 15, 2011 11:56:51 AM (12 years ago)

Author:

gah

Message:

 

File:

• branches/blt4/packages/vizservers/vtkvis/Makefile.in (modified) (8 diffs)

branches/blt4/packages/vizservers/vtkvis/Makefile.in

@@ -24 +24 @@
 
 GL_LIB_SPEC     = -lGL -lm
+PTHREAD_LIB_SPEC= -lpthread
 
 TCL_LIB_SPEC    = @TCL_LIB_SPEC@
@@ -35 +36 @@
 
 LIBS            = \
-                $(GL_LIB_SPEC) \
                 $(TCL_LIB_SPEC) \
                 $(VTK_LIB_SPEC) \
+                $(GL_LIB_SPEC) \
+                $(PTHREAD_LIB_SPEC) \
                 -Wl,-rpath,$(LD_RUN_PATH)
 
@@ -49 +51 @@
 USE_CUSTOM_AXES         = yes
 USE_GPU_RAYCASTING      = yes
-USE_OFFSCREEN_RENDERING = yes
+USE_OFFSCREEN_RENDERING = #yes
+USE_THREADS             = yes
 
 #vtk uses deprecated strstream header (instead of sstream)
@@ -70 +73 @@
 DEFINES         += -DUSE_GPU_RAYCAST_MAPPER
 endif
+ifdef USE_THREADS
+DEFINES         += -DUSE_THREADS
+endif
 CXX_SWITCHES    = $(CXXFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
 
@@ -76 +82 @@
                 ColorMap.cpp \
                 PPMWriter.cpp \
+                ReadBuffer.cpp \
                 RpContour2D.cpp \
                 RpContour3D.cpp \
@@ -88 +95 @@
                 RpVolume.cpp \
                 RpVtkDataSet.cpp \
-                RpVtkRenderer.cpp\
+                RpVtkGraphicsObject.cpp \
+                RpVtkRenderer.cpp \
                 RpVtkRendererCmd.cpp \
+                RpVtkRendererGraphicsObjs.cpp \
                 RpVtkRenderServer.cpp \
                 TGAWriter.cpp \
@@ -96 +105 @@
 ifdef USE_CUSTOM_AXES
 SERVER_SRCS+=vtkRpCubeAxesActor2D.cpp
+endif
+ifdef USE_THREADS
+SERVER_SRCS+=ResponseQueue.cpp
 endif
 
@@ -130 +142 @@
 CmdProc.o: CmdProc.h
 ColorMap.o: ColorMap.h RpMolecule.h Trace.h
-PPMWriter.o: PPMWriter.h Trace.h
-RpContour2D.o: RpContour2D.h RpVtkGraphicsObject.h RpVtkDataSet.h Trace.h
-RpContour3D.o: RpContour3D.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h
-RpCutplane.o: RpCutplane.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h
-RpGlyphs.o: RpGlyphs.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h
-RpHeightMap.o: RpHeightMap.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h
-RpLIC.o: RpLIC.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h RpVtkRenderServer.h
-RpMolecule.o: RpMolecule.h RpMoleculeData.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h
-RpPolyData.o: RpPolyData.h RpVtkGraphicsObject.h RpVtkDataSet.h Trace.h
-RpPseudoColor.o: RpPseudoColor.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h
-RpStreamlines.o: RpStreamlines.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h
-RpVolume.o: RpVolume.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h
+PPMWriter.o: PPMWriter.h ResponseQueue.h Trace.h
+ReadBuffer.o: ReadBuffer.h Trace.h
+ResponseQueue.o: ResponseQueue.h Trace.h
+RpContour2D.o: RpContour2D.h RpVtkGraphicsObject.h RpVtkDataSet.h RpVtkRenderer.h Trace.h
+RpContour3D.o: RpContour3D.h RpVtkGraphicsObject.h RpVtkDataSet.h RpVtkRenderer.h ColorMap.h Trace.h
+RpCutplane.o: RpCutplane.h RpVtkGraphicsObject.h RpVtkDataSet.h RpVtkRenderer.h ColorMap.h Trace.h
+RpGlyphs.o: RpGlyphs.h RpVtkGraphicsObject.h RpVtkDataSet.h RpVtkRenderer.h ColorMap.h Trace.h
+RpHeightMap.o: RpHeightMap.h RpVtkGraphicsObject.h RpVtkDataSet.h RpVtkRenderer.h ColorMap.h Trace.h
+RpLIC.o: RpLIC.h RpVtkGraphicsObject.h RpVtkDataSet.h RpVtkRenderer.h ColorMap.h Trace.h RpVtkRenderServer.h
+RpMolecule.o: RpMolecule.h RpMoleculeData.h RpVtkGraphicsObject.h RpVtkDataSet.h RpVtkRenderer.h ColorMap.h Trace.h
+RpPolyData.o: RpPolyData.h RpVtkGraphicsObject.h RpVtkDataSet.h RpVtkRenderer.h Trace.h
+RpPseudoColor.o: RpPseudoColor.h RpVtkGraphicsObject.h RpVtkDataSet.h RpVtkRenderer.h ColorMap.h Trace.h
+RpStreamlines.o: RpStreamlines.h RpVtkGraphicsObject.h RpVtkDataSet.h RpVtkRenderer.h ColorMap.h Trace.h
+RpVolume.o: RpVolume.h RpVtkGraphicsObject.h RpVtkDataSet.h RpVtkRenderer.h ColorMap.h Trace.h
 RpVtkDataSet.o: RpVtkDataSet.h Trace.h
-RpVtkRenderer.o: RpVtkRenderer.h vtkRpCubeAxesActor2D.h RpVtkDataSet.h RpContour2D.h RpContour3D.h RpGlyphs.h RpHeightMap.h RpLIC.h RpMolecule.h RpPolyData.h RpPseudoColor.h RpStreamlines.h RpVolume.h ColorMap.h Trace.h
-RpVtkRendererCmd.o: RpVtkRenderer.h vtkRpCubeAxesActor2D.h RpVtkDataSet.h RpContour2D.h RpContour3D.h RpGlyphs.h RpHeightMap.h RpLIC.h RpMolecule.h RpPolyData.h RpPseudoColor.h RpStreamlines.h RpVolume.h ColorMap.h Trace.h CmdProc.h PPMWriter.h TGAWriter.h
-RpVtkRenderServer.o: RpVtkRenderServer.h RpVtkRendererCmd.h RpVtkRenderer.h vtkRpCubeAxesActor2D.h Trace.h PPMWriter.h TGAWriter.h
+RpVtkGraphicsObject.o: RpVtkGraphicsObject.h RpVtkRenderer.h RpVtkDataSet.h RpContour2D.h RpContour3D.h RpCutplane.h RpGlyphs.h RpHeightMap.h RpLIC.h RpMolecule.h RpPolyData.h RpPseudoColor.h RpStreamlines.h RpVolume.h ColorMap.h Trace.h
+RpVtkRenderer.o: RpVtkRenderer.h RpMath.h vtkRpCubeAxesActor2D.h RpVtkDataSet.h RpContour2D.h RpContour3D.h RpCutplane.h RpGlyphs.h RpHeightMap.h RpLIC.h RpMolecule.h RpPolyData.h RpPseudoColor.h RpStreamlines.h RpVolume.h ColorMap.h Trace.h
+RpVtkRendererCmd.o: RpVtkRenderer.h RpVtkRendererGraphicsObjs.h vtkRpCubeAxesActor2D.h RpVtkDataSet.h RpContour2D.h RpContour3D.h RpCutplane.h RpGlyphs.h RpHeightMap.h RpLIC.h RpMolecule.h RpPolyData.h RpPseudoColor.h RpStreamlines.h RpVolume.h ColorMap.h ReadBuffer.h ResponseQueue.h Trace.h CmdProc.h PPMWriter.h TGAWriter.h
+RpVtkRendererGraphicsObjs.o: RpVtkRenderer.h RpVtkRendererGraphicsObjs.h RpVtkDataSet.h RpContour2D.h RpContour3D.h RpCutplane.h RpGlyphs.h RpHeightMap.h RpLIC.h RpMolecule.h RpPolyData.h RpPseudoColor.h RpStreamlines.h RpVolume.h ColorMap.h Trace.h
+RpVtkRenderServer.o: RpVtkRenderServer.h RpVtkRendererCmd.h RpVtkRenderer.h vtkRpCubeAxesActor2D.h ReadBuffer.h ResponseQueue.h Trace.h PPMWriter.h TGAWriter.h
 Trace.o: Trace.h
-TGAWriter.o: TGAWriter.h Trace.h
+TGAWriter.o: TGAWriter.h ResponseQueue.h Trace.h
 vtkRpCubeAxesActor2D.o: vtkRpCubeAxesActor2D.h