From 81435a28b943df1a6c6e3d329fd257e214ea608a Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 28 Nov 2005 09:15:46 +0000
Subject: [PATCH] From Gideon May, port to OSX of GLUT examples.

---
 Make/makedefs                                          | 8 ++++++++
 examples/osgGLUTkeyboardmouse/GNUmakefile              | 2 +-
 examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp | 6 +++++-
 examples/osgGLUTsimple/GNUmakefile                     | 2 +-
 examples/osgGLUTsimple/osgGLUTsimple.cpp               | 6 +++++-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Make/makedefs b/Make/makedefs
index 7da9f6976..48b069938 100644
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -209,6 +209,7 @@ ifeq ($(OS),SunOS)
   DYNAMICLIBRARYLIB = -ldl
   OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
   GL_LIBS           = -lGLU -lGL 
+  GLUT_LIBS         = -lglut
   X_INC             = -I/usr/X11R6/include
   X_LIBS            = -lXext -lXmu -lXi -lX11 
   SOCKET_LIBS       = -lsocket -lnsl
@@ -298,6 +299,7 @@ ifeq ($(OS),IRIX)
   DYNAMICLIBRARYLIB = 
   OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
   GL_LIBS           = -lGLU -lGL 
+  GLUT_LIBS         = -lglut
   X_INC             = -I/usr/X11R6/include
   X_LIBS            = -lXext -lXi -lXmu -lX11
   SOCKET_LIBS       = 
@@ -382,6 +384,7 @@ endif
   DYNAMICLIBRARYLIB = -ldl
   OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
   GL_LIBS           = -lGLU -lGL 
+  GLUT_LIBS         = -lglut
   X_INC             = -I/usr/X11R6/include
   X_LIBS            = -lXi -lXmu -lX11
   PF_XTRA_LIBS      = -L/usr/lib/libpfdb   -Xlinker -rpath /usr/lib/libpfdb \
@@ -430,6 +433,7 @@ ifeq ($(OS),FreeBSD)
  DYNAMICLIBRARYLIB = 
   OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
   GL_LIBS           = -lGLU -lGL 
+  GLUT_LIBS         = -lglut
   X_INC             = -I/usr/X11R6/include
   X_LIBS            = -lXmu -lX11
   SOCKET_LIBS       = 
@@ -503,6 +507,7 @@ ifeq ($(OS),Darwin)
   OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
   CARBON_LIB        = -framework Carbon
   GL_LIBS           = -framework OpenGL $(CARBON_LIB)
+  GLUT_LIBS         = -framework GLUT
   SOCKET_LIBS       = 
   OTHER_LIBS        = -lm -lstdc++ -lobjc -lOpenThreads
   LIB_EXT           = dylib
@@ -555,6 +560,7 @@ ifeq ($(OS),CYGWIN)
   DYNAMICLIBRARYLIB =
   OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
   GL_LIBS           = -lglu32 -lopengl32
+  GLUT_LIBS         = -lglut
   X_INC             = 
   X_LIBS            = -lgdi32 -luser32
   SOCKET_LIBS       = 
@@ -616,6 +622,7 @@ ifeq ($(OS),MINGW)
   DYNAMICLIBRARYLIB =
   OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
   GL_LIBS           = -lglu32 -lopengl32
+  GLUT_LIBS         = -lglut
   X_INC             = 
   X_LIBS            = -lgdi32 -luser32
   SOCKET_LIBS       = -lws2_32
@@ -676,6 +683,7 @@ ifeq ($(OS),HP-UX)
 
   OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
   GL_LIBS           = -L/opt/graphics/OpenGL/lib -lGLU -lGL 
+  GLUT_LIBS         = -lglut
   X_INC             = -I/usr/X11R6/include
   X_LIBS            = -L/usr/lib/X11R6 -lXext -lXi -lX11 
   SOCKET_LIBS       = 
diff --git a/examples/osgGLUTkeyboardmouse/GNUmakefile b/examples/osgGLUTkeyboardmouse/GNUmakefile
index 4b2b36ddd..087661ee2 100644
--- a/examples/osgGLUTkeyboardmouse/GNUmakefile
+++ b/examples/osgGLUTkeyboardmouse/GNUmakefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	osgGLUTkeyboardmouse.cpp\
 
-LIBS     += -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
+LIBS     += -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
 
 INSTFILES = \
 	$(CXXFILES)\
diff --git a/examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp b/examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp
index ec60b6b34..2795d2803 100644
--- a/examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp
+++ b/examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp
@@ -7,7 +7,11 @@
 #ifdef WIN32
 #include <windows.h>
 #endif
-#include <GL/glut.h>
+#ifdef __APPLE__
+#  include <GLUT/glut.h>
+#else
+#  include <GL/glut.h>
+#endif
 #include <osg/Timer>
 #include <osgUtil/SceneView>
 #include <osgDB/ReadFile>
diff --git a/examples/osgGLUTsimple/GNUmakefile b/examples/osgGLUTsimple/GNUmakefile
index 0cda90555..c961799ea 100644
--- a/examples/osgGLUTsimple/GNUmakefile
+++ b/examples/osgGLUTsimple/GNUmakefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	osgGLUTsimple.cpp\
 
-LIBS     += -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
+LIBS     += -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
 
 INSTFILES = \
 	$(CXXFILES)\
diff --git a/examples/osgGLUTsimple/osgGLUTsimple.cpp b/examples/osgGLUTsimple/osgGLUTsimple.cpp
index fbd16df20..165d22b4c 100644
--- a/examples/osgGLUTsimple/osgGLUTsimple.cpp
+++ b/examples/osgGLUTsimple/osgGLUTsimple.cpp
@@ -7,7 +7,11 @@
 #ifdef WIN32
 #include <windows.h>
 #endif
-#include <GL/glut.h>
+#ifdef __APPLE__
+#  include <GLUT/glut.h>
+#else
+#  include <GL/glut.h>
+#endif
 #include <osg/Timer>
 #include <osgUtil/SceneView>
 #include <osgDB/ReadFile>