From 38dda59937ce3d67e1ef1e6e8de44a3de0dc3598 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Wed, 15 Apr 2020 11:59:11 -0500 Subject: [PATCH] Make a header wrapping glu for Mac. --- src/common/CMakeLists.txt | 1 + src/common/glu_defs.h | 35 +++++++++++++++++++ src/meshlab/glarea.cpp | 2 +- .../decorate_base/decorate_base.cpp | 2 +- .../decorate_shadow/decorate_shadow.cpp | 2 +- .../decorate_shadow/shadow_mapping.cpp | 2 +- .../edit_align/AlignPairWidget.cpp | 2 +- src/meshlabplugins/edit_hole/holeSetManager.h | 2 +- .../edit_manipulators/edit_manipulators.cpp | 2 +- .../edit_measure/edit_measure.cpp | 2 +- .../edit_mutualcorrs/edit_mutualcorrs.cpp | 2 +- src/meshlabplugins/edit_paint/edit_paint.cpp | 2 +- src/meshlabplugins/edit_paint/edit_paint.h | 2 +- .../edit_pickpoints/editpickpoints.cpp | 2 +- src/meshlabplugins/edit_point/edit_point.cpp | 2 +- .../edit_referencing/edit_referencing.cpp | 2 +- .../edit_texture/renderarea.cpp | 2 +- src/meshlabplugins/filter_ao/filter_ao.cpp | 2 +- .../filter_sdfgpu/filter_sdfgpu.cpp | 2 +- .../filter_sdfgpu/filter_sdfgpu.h | 2 +- .../render_radiance_scaling/gpuProgram.h | 2 +- .../radianceScalingRenderer.cpp | 2 +- .../radianceScalingRenderer.h | 2 +- .../sample_filtergpu/sample_filtergpu.cpp | 2 +- src/sampleplugins/sampleedit/sampleedit.cpp | 2 +- 25 files changed, 59 insertions(+), 23 deletions(-) create mode 100644 src/common/glu_defs.h diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 0cafd4a7bd..ea35b9a633 100644 --- 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 new file mode 100644 index 0000000000..fb4b479c4a --- /dev/null +++ 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 +#else +#include +#endif + +#endif // !GLU_DEFS_H diff --git a/src/meshlab/glarea.cpp b/src/meshlab/glarea.cpp index bc23abb730..99bd74039f 100644 --- a/src/meshlab/glarea.cpp +++ b/src/meshlab/glarea.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include "glarea.h" #include "mainwindow.h" diff --git a/src/meshlabplugins/decorate_base/decorate_base.cpp b/src/meshlabplugins/decorate_base/decorate_base.cpp index 3474098b03..ed113a8f21 100644 --- 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 +#include #include #include #include diff --git a/src/meshlabplugins/decorate_shadow/decorate_shadow.cpp b/src/meshlabplugins/decorate_shadow/decorate_shadow.cpp index 7d419d3e8a..289d0fb54f 100644 --- 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 +#include using namespace vcg; diff --git a/src/meshlabplugins/decorate_shadow/shadow_mapping.cpp b/src/meshlabplugins/decorate_shadow/shadow_mapping.cpp index c1b75ba9c9..c032029e6c 100644 --- a/src/meshlabplugins/decorate_shadow/shadow_mapping.cpp +++ b/src/meshlabplugins/decorate_shadow/shadow_mapping.cpp @@ -22,7 +22,7 @@ ****************************************************************************/ #include -#include +#include #include "decorate_shader.h" #include "shadow_mapping.h" #include diff --git a/src/meshlabplugins/edit_align/AlignPairWidget.cpp b/src/meshlabplugins/edit_align/AlignPairWidget.cpp index f5d84e4170..dae51e1e61 100644 --- a/src/meshlabplugins/edit_align/AlignPairWidget.cpp +++ b/src/meshlabplugins/edit_align/AlignPairWidget.cpp @@ -25,7 +25,7 @@ #include -#include +#include #include "edit_align.h" #include #include "AlignPairWidget.h" diff --git a/src/meshlabplugins/edit_hole/holeSetManager.h b/src/meshlabplugins/edit_hole/holeSetManager.h index ddf23bb375..c91079b530 100644 --- a/src/meshlabplugins/edit_hole/holeSetManager.h +++ b/src/meshlabplugins/edit_hole/holeSetManager.h @@ -25,7 +25,7 @@ #define HOLESETMANAGER_H #include -#include +#include #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 index 49203553e1..223b9fa561 100644 --- 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 -#include +#include #include #include #include diff --git a/src/meshlabplugins/edit_measure/edit_measure.cpp b/src/meshlabplugins/edit_measure/edit_measure.cpp index 460bc1a7e4..39b5b35a34 100644 --- a/src/meshlabplugins/edit_measure/edit_measure.cpp +++ b/src/meshlabplugins/edit_measure/edit_measure.cpp @@ -26,7 +26,7 @@ ****************************************************************************/ #include -#include +#include #include "edit_measure.h" #include diff --git a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.cpp b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.cpp index 94d6bc0051..c95e26ec01 100644 --- a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.cpp +++ b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/meshlabplugins/edit_paint/edit_paint.cpp b/src/meshlabplugins/edit_paint/edit_paint.cpp index 4069de6798..25c8829ee3 100644 --- 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 -#include +#include #include diff --git a/src/meshlabplugins/edit_paint/edit_paint.h b/src/meshlabplugins/edit_paint/edit_paint.h index a019e12dd9..f2d98fb317 100644 --- a/src/meshlabplugins/edit_paint/edit_paint.h +++ b/src/meshlabplugins/edit_paint/edit_paint.h @@ -25,7 +25,7 @@ #define EDITPAINT_H #include -#include +#include #include #include diff --git a/src/meshlabplugins/edit_pickpoints/editpickpoints.cpp b/src/meshlabplugins/edit_pickpoints/editpickpoints.cpp index 789388b194..8f9e59f1bc 100644 --- a/src/meshlabplugins/edit_pickpoints/editpickpoints.cpp +++ b/src/meshlabplugins/edit_pickpoints/editpickpoints.cpp @@ -28,7 +28,7 @@ */ #include -#include +#include #include "editpickpoints.h" #include diff --git a/src/meshlabplugins/edit_point/edit_point.cpp b/src/meshlabplugins/edit_point/edit_point.cpp index 18c3a0e0c9..d526bffb8b 100644 --- a/src/meshlabplugins/edit_point/edit_point.cpp +++ b/src/meshlabplugins/edit_point/edit_point.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "edit_point.h" #include diff --git a/src/meshlabplugins/edit_referencing/edit_referencing.cpp b/src/meshlabplugins/edit_referencing/edit_referencing.cpp index b67eaf3c44..70edf917f9 100644 --- a/src/meshlabplugins/edit_referencing/edit_referencing.cpp +++ b/src/meshlabplugins/edit_referencing/edit_referencing.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/meshlabplugins/edit_texture/renderarea.cpp b/src/meshlabplugins/edit_texture/renderarea.cpp index 158bd8feff..467e378799 100644 --- a/src/meshlabplugins/edit_texture/renderarea.cpp +++ b/src/meshlabplugins/edit_texture/renderarea.cpp @@ -22,7 +22,7 @@ ****************************************************************************/ #include -#include +#include #include "renderarea.h" #include "textureeditor.h" #include diff --git a/src/meshlabplugins/filter_ao/filter_ao.cpp b/src/meshlabplugins/filter_ao/filter_ao.cpp index 18867a51b3..603f663168 100644 --- a/src/meshlabplugins/filter_ao/filter_ao.cpp +++ b/src/meshlabplugins/filter_ao/filter_ao.cpp @@ -22,7 +22,7 @@ ****************************************************************************/ #include -#include +#include #include "filter_ao.h" #include #include diff --git a/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.cpp b/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.cpp index ae206e2a75..eeb7180bf7 100644 --- 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 -#include +#include #include #include diff --git a/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.h b/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.h index ad40d394a2..8e55a3a818 100644 --- a/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.h +++ b/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/meshlabplugins/render_radiance_scaling/gpuProgram.h b/src/meshlabplugins/render_radiance_scaling/gpuProgram.h index c58712c1be..640722cecd 100644 --- a/src/meshlabplugins/render_radiance_scaling/gpuProgram.h +++ b/src/meshlabplugins/render_radiance_scaling/gpuProgram.h @@ -24,7 +24,7 @@ #define GPUPROGRAM_H #include -#include +#include #include #include "gpuShader.h" #include diff --git a/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.cpp b/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.cpp index dce590b379..3bee9dfac7 100644 --- a/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.cpp +++ b/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.cpp @@ -23,7 +23,7 @@ #include "radianceScalingRenderer.h" #include -#include +#include #include #include diff --git a/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.h b/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.h index 18b1ffee94..d5b80104a9 100644 --- a/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.h +++ b/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.h @@ -24,7 +24,7 @@ #define RADIANCESCALINGRENDERER_H #include -#include +#include #include #include diff --git a/src/sampleplugins/sample_filtergpu/sample_filtergpu.cpp b/src/sampleplugins/sample_filtergpu/sample_filtergpu.cpp index d735d39874..d16de7878f 100644 --- 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 -#include +#include #include #include diff --git a/src/sampleplugins/sampleedit/sampleedit.cpp b/src/sampleplugins/sampleedit/sampleedit.cpp index 282d70f2fe..22956e4d0a 100644 --- a/src/sampleplugins/sampleedit/sampleedit.cpp +++ b/src/sampleplugins/sampleedit/sampleedit.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include "sampleedit.h" #include