- Timestamp:
- Jan 27, 2013 8:37:45 PM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/Rappture 1.2/packages/vizservers/vtkvis/Makefile.in
r3232 r3264 52 52 -lvtkDomainsChemistry-6.0 \ 53 53 -lvtkIOCore-6.0 \ 54 -lvtkIOLegacy-6.0 \ 54 55 -lvtkFiltersModeling-6.0 \ 55 56 -lvtkFiltersFlowPaths-6.0 \ 57 -lvtkFiltersGeometry-6.0 \ 58 -lvtkFiltersSources-6.0 \ 59 -lvtkFiltersGeneral-6.0 \ 56 60 -lvtkFiltersCore-6.0 \ 61 -lvtkImagingHybrid-6.0 \ 62 -lvtkImagingCore-6.0 \ 57 63 -lvtkInteractionStyle-6.0 \ 58 64 -lvtkInteractionWidgets-6.0 \ … … 60 66 -lvtkRenderingHybridOpenGL-6.0 \ 61 67 -lvtkRenderingFreeTypeOpenGL-6.0 \ 68 -lvtkRenderingFreeType-6.0 \ 62 69 -lvtkRenderingVolumeOpenGL-6.0 \ 63 70 -lvtkRenderingVolume-6.0 \ … … 67 74 -lvtkCommonCore-6.0 \ 68 75 -lvtkCommonDataModel-6.0 \ 69 -lvtkFiltersGeometry-6.0 \70 -lvtkFiltersSources-6.0 \71 -lvtkFiltersGeneral-6.0 \72 76 -lvtkCommonExecutionModel-6.0 \ 73 77 -lvtkCommonMisc-6.0 \ 74 78 -lvtkCommonTransforms-6.0 \ 75 -lvtkCommonMath-6.0 \ 76 -lvtkImagingHybrid-6.0 \ 77 -lvtkRenderingFreeType-6.0 \ 78 -lvtkImagingCore-6.0 \ 79 -lvtkIOLegacy-6.0 79 -lvtkCommonMath-6.0 80 80 81 81 ifdef USE_VTK6 … … 94 94 $(GL_LIB_SPEC) \ 95 95 $(PTHREAD_LIB_SPEC) \ 96 -Wl,-rpath,$(LD_RUN_PATH) 96 -Wl,-rpath,$(LD_RUN_PATH) \ 97 -Wl,--enable-new-dtags 97 98 98 99 INCLUDES = \ … … 124 125 endif 125 126 ifdef USE_VTK6 126 DEFINES += -DUSE_VTK6 -DVTK_HYBRID_EXPORT="" -DVTK_RENDERING_EXPORT="" -DvtkRenderingCore_AUTOINIT="3(vtkInteractionStyle,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL)" -DvtkRenderingVolume_AUTOINIT"1(vtkRenderingVolumeOpenGL)" 127 # As of 2013-01-27, use the following defs for VTK head 128 #VTK_MOD_DEFS = -DvtkRenderingCore_AUTOINIT="4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL)" -DvtkRenderingVolume_AUTOINIT"1(vtkRenderingVolumeOpenGL)" 129 VTK_MOD_DEFS = -DvtkRenderingCore_AUTOINIT="3(vtkInteractionStyle,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL)" -DvtkRenderingVolume_AUTOINIT"1(vtkRenderingVolumeOpenGL)" 130 DEFINES += -DUSE_VTK6 -DVTK_HYBRID_EXPORT="" -DVTK_RENDERING_EXPORT="" $(VTK_MOD_DEFS) 127 131 endif 128 132
Note: See TracChangeset
for help on using the changeset viewer.