From 49af30ee6d2929112b8897388f534b690ccdce90 Mon Sep 17 00:00:00 2001 From: Mohcine Chraibi <m.chraibi@fz-juelich.de> Date: Fri, 13 Nov 2015 20:39:19 +0100 Subject: [PATCH] Uncomment defines --- src/ThreadVisualisation.cpp | 6 ++++-- src/extern_var.h | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ThreadVisualisation.cpp b/src/ThreadVisualisation.cpp index fd618a5..fff7e7c 100644 --- a/src/ThreadVisualisation.cpp +++ b/src/ThreadVisualisation.cpp @@ -37,9 +37,11 @@ #include <QObject> #include <QMessageBox> +// we don't need this when compiling with cmake +// http://www.vtk.org/Wiki/VTK/VTK_6_Migration/Factories_now_require_defines // all modules need to be initialized in vtk6 -#define vtkRenderingCore_AUTOINIT 4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL) -#define vtkRenderingVolume_AUTOINIT 1(vtkRenderingVolumeOpenGL) +//#define vtkRenderingCore_AUTOINIT 4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL) +//#define vtkRenderingVolume_AUTOINIT 1(vtkRenderingVolumeOpenGL) #include <vtkRenderer.h> diff --git a/src/extern_var.h b/src/extern_var.h index 39aa913..99bab85 100644 --- a/src/extern_var.h +++ b/src/extern_var.h @@ -30,8 +30,11 @@ #ifndef EXTERN_VAR_H_ #define EXTERN_VAR_H_ 1 -#define vtkRenderingCore_AUTOINIT 4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL) -#define vtkRenderingVolume_AUTOINIT 1(vtkRenderingVolumeOpenGL) + +// we don't need this when compiling with cmake +// http://www.vtk.org/Wiki/VTK/VTK_6_Migration/Factories_now_require_defines +/* #define vtkRenderingCore_AUTOINIT 4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL) */ +/* #define vtkRenderingVolume_AUTOINIT 1(vtkRenderingVolumeOpenGL) */ #include "SyncData.h" #include "Pedestrian.h" -- GitLab