Changeset 5837 for vtkvis/branches/1.8

Timestamp:

Aug 22, 2015, 2:25:43 PM (9 years ago)

Author:

ldelgass

Message:

merge r5777 from vtkvis trunk

Location:

vtkvis/branches/1.8

Files:

• . (modified) (1 prop)
• Makefile.in (modified) (3 diffs)

vtkvis/branches/1.8/Makefile.in

@@ -74 +74 @@
                 -lvtkCommonMath-$(VTK_VERSION) \
                 -lvtksys-$(VTK_VERSION)
-
 ifdef USE_OPENGL2_BACKEND
-VTK_LIB_SPEC += \
-                -lvtkRenderingOpenGL2-$(VTK_VERSION) \
-                -lvtkRenderingFreeTypeOpenGL2-$(VTK_VERSION) \
-                -lvtkRenderingVolumeOpenGL2-$(VTK_VERSION)
-else
-VTK_LIB_SPEC += \
-                -lvtkRenderingOpenGL-$(VTK_VERSION) \
-                -lvtkRenderingFreeTypeOpenGL-$(VTK_VERSION) \
-                -lvtkRenderingVolumeOpenGL-$(VTK_VERSION)
+VTK_BACKEND=OpenGL2
+else
+VTK_BACKEND=OpenGL
+endif
+
+ifeq ($(VTK_VERSION),6.3)
+VTK_LIB_SPEC += \
+                -lvtkRendering$(VTK_BACKEND)-$(VTK_VERSION) \
+                -lvtkRenderingVolume$(VTK_BACKEND)-$(VTK_VERSION)
+else
+VTK_LIB_SPEC += \
+                -lvtkRendering$(VTK_BACKEND)-$(VTK_VERSION) \
+                -lvtkRenderingFreeType$(VTK_BACKEND)-$(VTK_VERSION) \
+                -lvtkRenderingVolume$(VTK_BACKEND)-$(VTK_VERSION)
 endif
 
@@ -91 +95 @@
                 -lvtkRenderingHybridOpenGL-$(VTK_VERSION)
 else
-ifndef USE_OPENGL2_BACKEND
+ifdef USE_OPENGL2_BACKEND
+VTK_LIB_SPEC += \
+                -lvtkRenderingLIC$(VTK_BACKEND)-$(VTK_VERSION)
+else
 VTK_LIB_SPEC += \
                 -lvtkRenderingLIC-$(VTK_VERSION)
@@ -144 +151 @@
 endif
 
-ifdef USE_OPENGL2_BACKEND
-VTK_MOD_DEFS    = -DvtkRenderingCore_AUTOINIT="4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL2,vtkRenderingOpenGL2)" -DvtkRenderingFreeType_AUTOINIT="1(vtkRenderingFreeTypeFontConfig)" -DvtkRenderingVolume_AUTOINIT="1(vtkRenderingVolumeOpenGL2)"
-else
-VTK_MOD_DEFS    = -DvtkRenderingCore_AUTOINIT="4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL)" -DvtkRenderingFreeType_AUTOINIT="1(vtkRenderingFreeTypeFontConfig)" -DvtkRenderingVolume_AUTOINIT="1(vtkRenderingVolumeOpenGL)"
+ifeq ($(VTK_VERSION),6.3)
+VTK_MOD_DEFS    = -DvtkRenderingCore_AUTOINIT="3(vtkInteractionStyle,vtkRenderingFreeType,vtkRendering$(VTK_BACKEND))" -DvtkRenderingFreeType_AUTOINIT="1(vtkRenderingFreeTypeFontConfig)" -DvtkRenderingVolume_AUTOINIT="1(vtkRenderingVolume$(VTK_BACKEND))"
+else
+VTK_MOD_DEFS    = -DvtkRenderingCore_AUTOINIT="4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeType$(VTK_BACKEND),vtkRendering$(VTK_BACKEND))" -DvtkRenderingFreeType_AUTOINIT="1(vtkRenderingFreeTypeFontConfig)" -DvtkRenderingVolume_AUTOINIT="1(vtkRenderingVolume$(VTK_BACKEND))"
 endif
 DEFINES         += $(VTK_MOD_DEFS)