Make a header wrapping glu for Mac.

cnr-isti-vclab · Apr 15, 2020 · 38dda59 · 38dda59
1 parent 1c7b750
commit 38dda59
Show file tree

Hide file tree

Showing 25 changed files with 59 additions and 23 deletions.
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -31,6 +31,7 @@ set(HEADERS
     filterparameter.h
     filterscript.h
     gl_defs.h
+    glu_defs.h
     interfaces.h
     meshlabdocumentbundler.h
     meshlabdocumentxml.h

diff --git a/src/common/glu_defs.h b/src/common/glu_defs.h
@@ -0,0 +1,35 @@
+/****************************************************************************
+ * MeshLab                                                           o o     *
+ * An extendible mesh processor                                    o     o   *
+ *                                                                _   O  _   *
+ * Copyright(C) 2005, 2006                                          \/)\/    *
+ * Visual Computing Lab                                            /\/|      *
+ * ISTI - Italian National Research Council                           |      *
+ *                                                                    \      *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License as published by      *
+ * the Free Software Foundation; either version 2 of the License, or         *
+ * (at your option) any later version.                                       *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)          *
+ * for more details.                                                         *
+ *                                                                           *
+ ****************************************************************************/
+
+#ifndef GLU_DEFS_H
+#define GLU_DEFS_H
+
+#include "gl_defs.h"
+
+#ifdef __APPLE__
+#include <OpenGL/glu.h>
+#else
+#include <GL/glu.h>
+#endif
+
+#endif // !GLU_DEFS_H
diff --git a/src/meshlab/glarea.cpp b/src/meshlab/glarea.cpp
@@ -25,7 +25,7 @@
 
 #include <common/interfaces.h>
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 
 #include "glarea.h"
 #include "mainwindow.h"

diff --git a/src/meshlabplugins/decorate_base/decorate_base.cpp b/src/meshlabplugins/decorate_base/decorate_base.cpp
@@ -22,7 +22,7 @@
 ****************************************************************************/
 
 #include "decorate_base.h"
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include <wrap/gl/addons.h>
 #include <vcg/complex/algorithms/stat.h>
 #include <vcg/complex/algorithms/bitquad_support.h>

diff --git a/src/meshlabplugins/decorate_shadow/decorate_shadow.cpp b/src/meshlabplugins/decorate_shadow/decorate_shadow.cpp
@@ -22,7 +22,7 @@
 ****************************************************************************/
 
 #include "decorate_shadow.h"
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 
 using namespace vcg;
 

diff --git a/src/meshlabplugins/decorate_shadow/shadow_mapping.cpp b/src/meshlabplugins/decorate_shadow/shadow_mapping.cpp
@@ -22,7 +22,7 @@
 ****************************************************************************/
 
 #include <meshlab/glarea.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include "decorate_shader.h"
 #include "shadow_mapping.h"
 #include <common/pluginmanager.h>

diff --git a/src/meshlabplugins/edit_align/AlignPairWidget.cpp b/src/meshlabplugins/edit_align/AlignPairWidget.cpp
@@ -25,7 +25,7 @@
 
 
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include "edit_align.h"
 #include <QGLWidget>
 #include "AlignPairWidget.h"

diff --git a/src/meshlabplugins/edit_hole/holeSetManager.h b/src/meshlabplugins/edit_hole/holeSetManager.h
@@ -25,7 +25,7 @@
 #define HOLESETMANAGER_H
 
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include "fgtHole.h"
 #include "fgtBridge.h"
 #include "vcg/complex/algorithms/hole.h"

diff --git a/src/meshlabplugins/edit_manipulators/edit_manipulators.cpp b/src/meshlabplugins/edit_manipulators/edit_manipulators.cpp
@@ -23,7 +23,7 @@
 
 #include "edit_manipulators.h"
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include <meshlab/glarea.h>
 #include <wrap/qt/gl_label.h>
 #include <wrap/gui/trackball.h>

diff --git a/src/meshlabplugins/edit_measure/edit_measure.cpp b/src/meshlabplugins/edit_measure/edit_measure.cpp
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 #include <meshlab/glarea.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include "edit_measure.h"
 #include <wrap/qt/gl_label.h>
 

diff --git a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.cpp b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.cpp
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include <meshlab/glarea.h>
 #include <wrap/gl/pick.h>
 #include <wrap/qt/gl_label.h>

diff --git a/src/meshlabplugins/edit_paint/edit_paint.cpp b/src/meshlabplugins/edit_paint/edit_paint.cpp
@@ -22,7 +22,7 @@
  ****************************************************************************/
 #include "edit_paint.h"
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 
 #include <vcg/math/perlin_noise.h>
 

diff --git a/src/meshlabplugins/edit_paint/edit_paint.h b/src/meshlabplugins/edit_paint/edit_paint.h
@@ -25,7 +25,7 @@
 #define EDITPAINT_H
 
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include <QObject>
 #include <QDockWidget>
 

diff --git a/src/meshlabplugins/edit_pickpoints/editpickpoints.cpp b/src/meshlabplugins/edit_pickpoints/editpickpoints.cpp
@@ -28,7 +28,7 @@
  */
 
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 
 #include "editpickpoints.h"
 #include <meshlab/mainwindow.h>

diff --git a/src/meshlabplugins/edit_point/edit_point.cpp b/src/meshlabplugins/edit_point/edit_point.cpp
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include <meshlab/glarea.h>
 #include "edit_point.h"
 #include <wrap/gl/pick.h>

diff --git a/src/meshlabplugins/edit_referencing/edit_referencing.cpp b/src/meshlabplugins/edit_referencing/edit_referencing.cpp
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include <meshlab/glarea.h>
 #include <wrap/gl/pick.h>
 #include <wrap/qt/gl_label.h>

diff --git a/src/meshlabplugins/edit_texture/renderarea.cpp b/src/meshlabplugins/edit_texture/renderarea.cpp
@@ -22,7 +22,7 @@
 ****************************************************************************/
 
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include "renderarea.h"
 #include "textureeditor.h"
 #include <wrap/qt/trackball.h>

diff --git a/src/meshlabplugins/filter_ao/filter_ao.cpp b/src/meshlabplugins/filter_ao/filter_ao.cpp
@@ -22,7 +22,7 @@
 ****************************************************************************/
 
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include "filter_ao.h"
 #include <QGLFramebufferObject>
 #include <vcg/math/gen_normal.h>

diff --git a/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.cpp b/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.cpp
@@ -1,6 +1,6 @@
 #include "filter_sdfgpu.h"
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 
 #include <vcg/complex/complex.h>
 #include <vcg/complex/algorithms/intersection.h>

diff --git a/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.h b/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.h
@@ -4,7 +4,7 @@
 #include <QObject>
 
 #include <common/interfaces.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include <gpuProgram.h>
 #include <framebufferObject.h>
 #include <texture2D.h>

diff --git a/src/meshlabplugins/render_radiance_scaling/gpuProgram.h b/src/meshlabplugins/render_radiance_scaling/gpuProgram.h
@@ -24,7 +24,7 @@
 #define GPUPROGRAM_H
 
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include <iostream>
 #include "gpuShader.h"
 #include <string>

diff --git a/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.cpp b/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.cpp
@@ -23,7 +23,7 @@
 #include "radianceScalingRenderer.h"
 
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 
 #include <math.h>
 #include <stdlib.h>

diff --git a/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.h b/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.h
@@ -24,7 +24,7 @@
 #define RADIANCESCALINGRENDERER_H
 
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include <common/interfaces.h>
 
 #include <QAction>

diff --git a/src/sampleplugins/sample_filtergpu/sample_filtergpu.cpp b/src/sampleplugins/sample_filtergpu/sample_filtergpu.cpp
@@ -23,7 +23,7 @@
 
 #include "sample_filtergpu.h"
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include <wrap/glw/glw.h>
 #include <QImage>
 

diff --git a/src/sampleplugins/sampleedit/sampleedit.cpp b/src/sampleplugins/sampleedit/sampleedit.cpp
@@ -28,7 +28,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <common/gl_defs.h>
-#include <GL/glu.h>
+#include <common/glu_defs.h>
 #include <meshlab/glarea.h>
 #include "sampleedit.h"
 #include <wrap/gl/pick.h>