From a08fc47313325c2ae39b6c400b50c3ce5ce4d0ae Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sun, 10 Feb 2002 11:17:58 +0000
Subject: [PATCH] Fixes for MacOSX build.

---
 Make/makedefs.macosx                    | 4 ++--
 src/Demos/osgbillboard/osgbillboard.cpp | 2 +-
 src/Demos/osgcluster/osgcluster.cpp     | 2 +-
 src/Demos/osgtexture/osgtexture.cpp     | 2 +-
 src/Demos/osgviews/osgviews.cpp         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Make/makedefs.macosx b/Make/makedefs.macosx
index 51ea0fafd..8c79fe055 100644
--- a/Make/makedefs.macosx
+++ b/Make/makedefs.macosx
@@ -7,7 +7,7 @@ DEPFILES = $(OBJS:.o=.d)
 
 C++ = cc 
 YFLAGS = -d
-LCINCS += -I/usr/local/include 
+LCINCS += -I/usr/local/include -I/sw/include
 LC++INCS += ${LCINCS}
 CFLAGS   = -O2 -W -Wall $(LCINCS) -D__DARWIN_OSX__
 C++FLAGS = ${CFLAGS}
@@ -17,7 +17,7 @@ CPPFLAGS = ${CFLAGS}
 SO_EXT = dylib
 DL_EXT = so
 
-FRAMEWORKS = -framework GLUT -framework Carbon -framework OpenGL
+FRAMEWORKS =  -L/sw/lib -framework GLUT -framework Carbon -framework OpenGL
 LDFLAGS =-all_load  -L/usr/local/lib -L/usr/lib  
 
 DYNAMICLIBRARYLIB = 
diff --git a/src/Demos/osgbillboard/osgbillboard.cpp b/src/Demos/osgbillboard/osgbillboard.cpp
index 78493a074..36265cc2e 100644
--- a/src/Demos/osgbillboard/osgbillboard.cpp
+++ b/src/Demos/osgbillboard/osgbillboard.cpp
@@ -12,7 +12,7 @@
 #include <osgDB/Registry>
 #include <osgDB/ReadFile>
 
-#include <GL/glut.h>
+#include <osgGLUT/glut>
 #include <osgGLUT/Viewer>
 
 
diff --git a/src/Demos/osgcluster/osgcluster.cpp b/src/Demos/osgcluster/osgcluster.cpp
index 9aa11bf49..555c7efa2 100644
--- a/src/Demos/osgcluster/osgcluster.cpp
+++ b/src/Demos/osgcluster/osgcluster.cpp
@@ -12,7 +12,7 @@
 #include <osgUtil/FlightManipulator>
 #include <osgUtil/DriveManipulator>
 
-#include <GL/glut.h>
+#include <osgGLUT/glut>
 #include <osgGLUT/Viewer>
 
 #include <osg/Quat>
diff --git a/src/Demos/osgtexture/osgtexture.cpp b/src/Demos/osgtexture/osgtexture.cpp
index 54bd74a0d..574c3e736 100644
--- a/src/Demos/osgtexture/osgtexture.cpp
+++ b/src/Demos/osgtexture/osgtexture.cpp
@@ -11,7 +11,7 @@
 #include <osgDB/Registry>
 #include <osgDB/ReadFile>
 
-#include <GL/glut.h>
+#include <osgGLUT/glut>
 #include <osgGLUT/Viewer>
 
 
diff --git a/src/Demos/osgviews/osgviews.cpp b/src/Demos/osgviews/osgviews.cpp
index a5219de5e..98406eb09 100644
--- a/src/Demos/osgviews/osgviews.cpp
+++ b/src/Demos/osgviews/osgviews.cpp
@@ -9,7 +9,7 @@
 #include <osgUtil/FlightManipulator>
 #include <osgUtil/DriveManipulator>
 
-#include <GL/glut.h>
+#include <osgGLUT/glut>
 #include <osgGLUT/Viewer>
 
 #include <osg/Quat>