[cig-commits] commit: Adding a conditional #def for gl.h and glu.h. So it now matches the way scons uses / tests the opengl installation on a mac.
Mercurial
hg at geodynamics.org
Mon Nov 24 11:29:35 PST 2008
changeset: 77:f4859631bdeb
user: JulianGiordani
date: Mon Sep 01 02:09:06 2008 +0000
files: Base/src/Light.c Base/src/Light_Register.c Base/src/Viewport.c Base/src/Window.c DrawingObjects/src/Axis.c DrawingObjects/src/ColourBar.c DrawingObjects/src/Contour.c DrawingObjects/src/Eigenvectors.c DrawingObjects/src/EigenvectorsCrossSection.c DrawingObjects/src/FeVariableSurface.c DrawingObjects/src/FieldVariableBorder.c DrawingObjects/src/HistoricalSwarmTrajectory.c DrawingObjects/src/Isosurface.c DrawingObjects/src/MeshViewer.c DrawingObjects/src/OpenGLDrawingObject.c DrawingObjects/src/ScalarField.c DrawingObjects/src/ScalarFieldCrossSection.c DrawingObjects/src/ScalarFieldOnMesh.c DrawingObjects/src/ScalarFieldOnMeshCrossSection.c DrawingObjects/src/SwarmRGBColourViewer.c DrawingObjects/src/SwarmSquares.c DrawingObjects/src/SwarmVectors.c DrawingObjects/src/SwarmViewer.c DrawingObjects/src/SwarmViewerBase.c DrawingObjects/src/TextureMap.c DrawingObjects/src/TimeStep.c DrawingObjects/src/Title.c DrawingObjects/src/VectorArrowCrossSection.c DrawingObjects/src/VectorArrows.c RenderingEngines/src/OpenGlUtil.c RenderingEngines/src/RenderingEngineGL.c WindowInteractions/src/LightInteraction.c
description:
Adding a conditional #def for gl.h and glu.h. So it now matches the way scons uses / tests the opengl installation on a mac.
So now, where a framework version of opengl is found the #include reads
#include <OpenGL/glu.h> no #include <glu.h>
Hopefully this fixes the gl.h glu.h the mac people were having when they tried to compile code
diff -r f464044cb7c7 -r f4859631bdeb Base/src/Light.c
--- a/Base/src/Light.c Fri Aug 29 04:28:46 2008 +0000
+++ b/Base/src/Light.c Mon Sep 01 02:09:06 2008 +0000
@@ -53,8 +53,13 @@
#include <string.h>
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
const Type lucLight_Type = "lucLight";
diff -r f464044cb7c7 -r f4859631bdeb Base/src/Light_Register.c
--- a/Base/src/Light_Register.c Fri Aug 29 04:28:46 2008 +0000
+++ b/Base/src/Light_Register.c Mon Sep 01 02:09:06 2008 +0000
@@ -52,8 +52,13 @@
#include "Light_Register.h"
#include "Light.h"
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
const Type lucLight_Register_Type = "lucLight_Register";
diff -r f464044cb7c7 -r f4859631bdeb Base/src/Viewport.c
--- a/Base/src/Viewport.c Fri Aug 29 04:28:46 2008 +0000
+++ b/Base/src/Viewport.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Viewport.c 740 2007-10-11 08:05:31Z SteveQuenette $
+** $Id: Viewport.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -62,8 +62,13 @@
#include "Init.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
const Type lucViewport_Type = "lucViewport";
diff -r f464044cb7c7 -r f4859631bdeb Base/src/Window.c
--- a/Base/src/Window.c Fri Aug 29 04:28:46 2008 +0000
+++ b/Base/src/Window.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Window.c 754 2008-01-11 05:41:53Z RobertTurnbull $
+** $Id: Window.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -745,7 +745,11 @@ void lucViewportInfo_Create_MPI_Datatype
#ifdef HAVE_GL
-#include <gl.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+#else
+ #include <gl.h>
+#endif
void _lucWindow_SetupGLRasterFont( void* window ) {
GLuint i, j;
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/Axis.c
--- a/DrawingObjects/src/Axis.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/Axis.c Mon Sep 01 02:09:06 2008 +0000
@@ -60,8 +60,13 @@
#include "Axis.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#ifndef MASTER
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/ColourBar.c
--- a/DrawingObjects/src/ColourBar.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/ColourBar.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: ColourBar.c 785 2008-08-18 13:55:00Z LukeHodkinson $
+** $Id: ColourBar.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -59,8 +59,13 @@
#include "ColourBar.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#ifndef MASTER
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/Contour.c
--- a/DrawingObjects/src/Contour.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/Contour.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Contour.c 769 2008-05-23 04:16:39Z RobertTurnbull $
+** $Id: Contour.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -56,8 +56,13 @@
#include "Contour.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#ifndef MASTER
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/Eigenvectors.c
--- a/DrawingObjects/src/Eigenvectors.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/Eigenvectors.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Eigenvectors.c 740 2007-10-11 08:05:31Z SteveQuenette $
+** $Id: Eigenvectors.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -57,8 +57,13 @@
#include "Eigenvectors.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
/* Textual name of this class - This is a global pointer which is used for times when you need to refer to class and not a particular instance of a class */
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/EigenvectorsCrossSection.c
--- a/DrawingObjects/src/EigenvectorsCrossSection.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/EigenvectorsCrossSection.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: EigenvectorsCrossSection.c 740 2007-10-11 08:05:31Z SteveQuenette $
+** $Id: EigenvectorsCrossSection.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -56,8 +56,13 @@
#include "EigenvectorsCrossSection.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#include <ctype.h>
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/FeVariableSurface.c
--- a/DrawingObjects/src/FeVariableSurface.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/FeVariableSurface.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: FeVariableSurface.c 742 2007-10-23 05:30:32Z RobertTurnbull $
+** $Id: FeVariableSurface.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -57,8 +57,13 @@
#include "FeVariableSurface.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
/* Textual name of this class - This is a global pointer which is used for times when you need to refer to class and not a particular instance of a class */
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/FieldVariableBorder.c
--- a/DrawingObjects/src/FieldVariableBorder.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/FieldVariableBorder.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: FieldVariableBorder.c 740 2007-10-11 08:05:31Z SteveQuenette $
+** $Id: FieldVariableBorder.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -56,8 +56,13 @@
#include "FieldVariableBorder.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#ifndef MASTER
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/HistoricalSwarmTrajectory.c
--- a/DrawingObjects/src/HistoricalSwarmTrajectory.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/HistoricalSwarmTrajectory.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: HistoricalSwarmTrajectory.c 741 2007-10-12 06:54:18Z BelindaMay $
+** $Id: HistoricalSwarmTrajectory.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -56,8 +56,13 @@
#include "HistoricalSwarmTrajectory.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
/* Textual name of this class - This is a global pointer which is used for times when you need to refer to class and not a particular instance of a class */
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/Isosurface.c
--- a/DrawingObjects/src/Isosurface.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/Isosurface.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: Isosurface.c 746 2007-10-29 04:26:41Z RobertTurnbull $
+** $Id: Isosurface.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -57,8 +57,13 @@
#include "Isosurface.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#ifndef MASTER
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/MeshViewer.c
--- a/DrawingObjects/src/MeshViewer.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/MeshViewer.c Mon Sep 01 02:09:06 2008 +0000
@@ -61,8 +61,13 @@
#include "MeshViewer.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/OpenGLDrawingObject.c
--- a/DrawingObjects/src/OpenGLDrawingObject.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/OpenGLDrawingObject.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: OpenGLDrawingObject.c 746 2007-10-29 04:26:41Z RobertTurnbull $
+** $Id: OpenGLDrawingObject.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -56,8 +56,13 @@
#include "OpenGLDrawingObject.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#ifndef MASTER
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/ScalarField.c
--- a/DrawingObjects/src/ScalarField.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/ScalarField.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: ScalarField.c 786 2008-08-18 13:55:47Z LukeHodkinson $
+** $Id: ScalarField.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -58,8 +58,13 @@
#include "ScalarField.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#ifndef MASTER
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/ScalarFieldCrossSection.c
--- a/DrawingObjects/src/ScalarFieldCrossSection.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/ScalarFieldCrossSection.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: ScalarFieldCrossSection.c 746 2007-10-29 04:26:41Z RobertTurnbull $
+** $Id: ScalarFieldCrossSection.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -57,8 +57,13 @@
#include "ScalarFieldCrossSection.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#include <ctype.h>
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/ScalarFieldOnMesh.c
--- a/DrawingObjects/src/ScalarFieldOnMesh.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/ScalarFieldOnMesh.c Mon Sep 01 02:09:06 2008 +0000
@@ -57,8 +57,13 @@
#include "ScalarFieldOnMesh.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#ifndef MASTER
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/ScalarFieldOnMeshCrossSection.c
--- a/DrawingObjects/src/ScalarFieldOnMeshCrossSection.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/ScalarFieldOnMeshCrossSection.c Mon Sep 01 02:09:06 2008 +0000
@@ -62,8 +62,13 @@
#include "ScalarFieldOnMeshCrossSection.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#include <ctype.h>
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/SwarmRGBColourViewer.c
--- a/DrawingObjects/src/SwarmRGBColourViewer.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/SwarmRGBColourViewer.c Mon Sep 01 02:09:06 2008 +0000
@@ -58,8 +58,13 @@
#include "SwarmRGBColourViewer.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
/* Textual name of this class - This is a global pointer which is used for times when you need to refer to class and not a particular instance of a class */
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/SwarmSquares.c
--- a/DrawingObjects/src/SwarmSquares.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/SwarmSquares.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: SwarmSquares.c 748 2007-10-29 05:12:58Z RobertTurnbull $
+** $Id: SwarmSquares.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -58,8 +58,13 @@
#include "SwarmSquares.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
/* Textual name of this class - This is a global pointer which is used for times when you need to refer to class and not a particular instance of a class */
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/SwarmVectors.c
--- a/DrawingObjects/src/SwarmVectors.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/SwarmVectors.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: SwarmVectors.c 740 2007-10-11 08:05:31Z SteveQuenette $
+** $Id: SwarmVectors.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -58,8 +58,13 @@
#include "SwarmVectors.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
/* Textual name of this class - This is a global pointer which is used for times when you need to refer to class and not a particular instance of a class */
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/SwarmViewer.c
--- a/DrawingObjects/src/SwarmViewer.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/SwarmViewer.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: SwarmViewer.c 774 2008-07-10 02:00:51Z LouisMoresi $
+** $Id: SwarmViewer.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -62,8 +62,13 @@
#include "SwarmViewer.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
/* Textual name of this class - This is a global pointer which is used for times when you need to refer to class and not a particular instance of a class */
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/SwarmViewerBase.c
--- a/DrawingObjects/src/SwarmViewerBase.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/SwarmViewerBase.c Mon Sep 01 02:09:06 2008 +0000
@@ -65,8 +65,13 @@
#include "SwarmViewer.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
/* Textual name of this class - This is a global pointer which is used for times when you need to refer to class and not a particular instance of a class */
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/TextureMap.c
--- a/DrawingObjects/src/TextureMap.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/TextureMap.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: TextureMap.c 740 2007-10-11 08:05:31Z SteveQuenette $
+** $Id: TextureMap.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -55,8 +55,13 @@
#include "TextureMap.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#ifdef HAVE_TIFF
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/TimeStep.c
--- a/DrawingObjects/src/TimeStep.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/TimeStep.c Mon Sep 01 02:09:06 2008 +0000
@@ -60,8 +60,13 @@
#include "TimeStep.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#ifndef MASTER
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/Title.c
--- a/DrawingObjects/src/Title.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/Title.c Mon Sep 01 02:09:06 2008 +0000
@@ -61,8 +61,13 @@
#include "Title.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#ifndef MASTER
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/VectorArrowCrossSection.c
--- a/DrawingObjects/src/VectorArrowCrossSection.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/VectorArrowCrossSection.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: VectorArrowCrossSection.c 746 2007-10-29 04:26:41Z RobertTurnbull $
+** $Id: VectorArrowCrossSection.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -57,8 +57,13 @@
#include "VectorArrowCrossSection.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#include <ctype.h>
diff -r f464044cb7c7 -r f4859631bdeb DrawingObjects/src/VectorArrows.c
--- a/DrawingObjects/src/VectorArrows.c Fri Aug 29 04:28:46 2008 +0000
+++ b/DrawingObjects/src/VectorArrows.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: VectorArrows.c 740 2007-10-11 08:05:31Z SteveQuenette $
+** $Id: VectorArrows.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -57,8 +57,13 @@
#include "VectorArrows.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
/* Textual name of this class - This is a global pointer which is used for times when you need to refer to class and not a particular instance of a class */
diff -r f464044cb7c7 -r f4859631bdeb RenderingEngines/src/OpenGlUtil.c
--- a/RenderingEngines/src/OpenGlUtil.c Fri Aug 29 04:28:46 2008 +0000
+++ b/RenderingEngines/src/OpenGlUtil.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: OpenGlUtil.c 740 2007-10-11 08:05:31Z SteveQuenette $
+** $Id: OpenGlUtil.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -50,8 +50,13 @@
#include "types.h"
#include "OpenGlUtil.h"
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
void lucColour_SetOpenGLColour( lucColour* colour ) {
diff -r f464044cb7c7 -r f4859631bdeb RenderingEngines/src/RenderingEngineGL.c
--- a/RenderingEngines/src/RenderingEngineGL.c Fri Aug 29 04:28:46 2008 +0000
+++ b/RenderingEngines/src/RenderingEngineGL.c Mon Sep 01 02:09:06 2008 +0000
@@ -39,7 +39,7 @@
*+ Patrick Sunter
*+ Greg Watson
*+
-** $Id: RenderingEngineGL.c 768 2008-04-21 03:20:07Z JohnMansour $
+** $Id: RenderingEngineGL.c 791 2008-09-01 02:09:06Z JulianGiordani $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -55,8 +55,13 @@
#include "OpenGlUtil.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
#include <string.h>
#ifdef HAVE_GL2PS
diff -r f464044cb7c7 -r f4859631bdeb WindowInteractions/src/LightInteraction.c
--- a/WindowInteractions/src/LightInteraction.c Fri Aug 29 04:28:46 2008 +0000
+++ b/WindowInteractions/src/LightInteraction.c Mon Sep 01 02:09:06 2008 +0000
@@ -57,8 +57,13 @@
#include "LightInteraction.h"
#include <assert.h>
-#include <gl.h>
-#include <glu.h>
+#ifdef HAVE_OPENGL_FRAMEWORK
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+#else
+ #include <gl.h>
+ #include <glu.h>
+#endif
/* Textual name of this class - This is a global pointer which is used for times when you need to refer to class and not a particular instance of a class */
const Type lucLightInteraction_Type = "lucLightInteraction";
More information about the CIG-COMMITS
mailing list