Changeset 4780 for vtkvis/branches/1.7/Makefile.in

Timestamp:

Nov 23, 2014 5:57:33 PM (9 years ago)

Author:

ldelgass

Message:

merge r4649:4650 from vtkvis trunk

Location:

vtkvis/branches/1.7

Files:

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

vtkvis/branches/1.7/Makefile.in

@@ -5 +5 @@
 USE_GPU_RAYCASTING      = yes
 USE_OFFSCREEN_RENDERING = #yes
+USE_OPENGL2_BACKEND     = #yes
 USE_THREADS             = yes
 USE_CPU_LEGEND_RENDER   = yes
@@ -60 +61 @@
                 -lvtkInteractionStyle-$(VTK_VERSION) \
                 -lvtkInteractionWidgets-$(VTK_VERSION) \
-                -lvtkRenderingOpenGL-$(VTK_VERSION) \
                 -lvtkRenderingImage-$(VTK_VERSION) \
-                -lvtkRenderingFreeTypeOpenGL-$(VTK_VERSION) \
                 -lvtkRenderingFreeTypeFontConfig-$(VTK_VERSION) \
                 -lvtkRenderingFreeType-$(VTK_VERSION)  \
-                -lvtkRenderingVolumeOpenGL-$(VTK_VERSION) \
                 -lvtkRenderingVolume-$(VTK_VERSION) \
                 -lvtkRenderingLabel-$(VTK_VERSION) \
@@ -78 +76 @@
                 -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)
+endif
+
 ifeq ($(VTK_VERSION),6.0)
 VTK_LIB_SPEC += \
                 -lvtkRenderingHybridOpenGL-$(VTK_VERSION)
 else
+ifndef USE_OPENGL2_BACKEND
 VTK_LIB_SPEC += \
                 -lvtkRenderingLIC-$(VTK_VERSION)
+endif
 endif
 
@@ -132 +144 @@
 DEFINES         += -DNEW_SCALAR_BAR
 endif
-
+ifndef USE_OPENGL2_BACKEND
+DEFINES         += -DHAVE_LIC
+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)"
+endif
 DEFINES         += -DUSE_VTK6 $(VTK_MOD_DEFS)