First batch of changes required for MacOS X build. Orignal submission from

Phil Atkin, merged by Robert Osfield.

src/Demos/hangglide/Makefile

@@ -21,6 +21,11 @@ TARGET_BIN_FILES = hangglide
 
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
+
+#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
+MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
+
+
 # $(OSGDB_LIBS)
 C++FLAGS += -I. -I$(OSGHOME)/include
 LDFLAGS += -L$(OSGHOME)/lib

src/Demos/osgconv/Makefile

@@ -16,6 +16,9 @@ TARGET_BIN_FILES = osgconv
 #note, standard library list. 
 LIBS = -losgDB -losg $(GL_LIBS) $(X_LIBS)
 
+#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
+MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
+
 C++FLAGS += -I$(OSGHOME)/include
 LDFLAGS += -L$(OSGHOME)/lib
 

src/Demos/osgcube/Makefile

@@ -9,6 +9,10 @@ TARGET = $(OSGHOME)/bin/osgcube
 TARGET_BIN_FILES = osgcube
 
 LIBS = -losgGLUT -losgDB -losgUtil -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
+
+#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
+MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
+
 C++FLAGS += -I$(OSGHOME)/include
 LDFLAGS += -L$(OSGHOME)/lib
 

src/Demos/osgimpostor/Makefile

@@ -14,6 +14,9 @@ TARGET_BIN_FILES = osgimpostor
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
+#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
+MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
+
 C++FLAGS += -I$(OSGHOME)/include
 LDFLAGS += -L$(OSGHOME)/lib
 

src/Demos/osgimpostor/osgimpostor.cpp

@@ -9,7 +9,7 @@
 #include <osgUtil/DriveManipulator>
 #include <osgUtil/InsertImpostorsVisitor>
 
-#include <GL/glut.h>
+#include <osgGLUT/glut>
 #include <osgGLUT/Viewer>
 
 #include <osg/Quat>

src/Demos/osgreflect/Makefile

@@ -14,6 +14,10 @@ TARGET_BIN_FILES = osgreflect
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
+#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
+MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
+
+
 C++FLAGS += -I$(OSGHOME)/include
 LDFLAGS += -L$(OSGHOME)/lib
 

src/Demos/osgtext/Makefile

@@ -13,8 +13,9 @@ TARGET_BIN_FILES = osgtext
 
 #note, standard library list. 
 LIBS = -losgGLUT -losgText -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
+MACOSXLIBS = -losgGLUT -losgText -losgUtil -losgDB -losg -lfreetype -ldl -lobjc -lstdc++
 
-C++FLAGS += -I$(OSGHOME)/include -g
+C++FLAGS += -I$(OSGHOME)/include -I. 
 LDFLAGS += -L$(OSGHOME)/lib -L/usr/freeware/lib32
 
 include $(OSGHOME)/Make/makerules

src/Demos/osgtext/main.cpp

@@ -25,7 +25,7 @@
 #include <osgUtil/DriveManipulator>
 
 #include <osgGLUT/Viewer>
-#include <GL/glut.h>
+#include <osgGLUT/glut>
 
 #include <osgText/Text>
 #include <vector>
@@ -45,8 +45,8 @@ using namespace osgGLUT;
 #define        TEXT_COL_3D        osg::Vec4(.99,.3,.2,1)
 
 
-std::string    ttfPath("fonts/dirtydoz.ttf");
-std::string    ttfPath1("fonts/fudd.ttf");
+std::string    ttfPath("fonts/times.ttf");
+std::string    ttfPath1("fonts/arial.ttf");
 
 int    gFontSize=18;
 int    gFontSize1=24;

src/Demos/osgtexture/Makefile

@@ -14,6 +14,10 @@ TARGET_BIN_FILES = osgtexture
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
+#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
+MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
+
+
 C++FLAGS += -I$(OSGHOME)/include
 LDFLAGS += -L$(OSGHOME)/lib
 

src/Demos/osgviews/Makefile

@@ -14,6 +14,9 @@ TARGET_BIN_FILES = osgviews
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
+#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
+MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
+
 C++FLAGS += -I$(OSGHOME)/include
 LDFLAGS += -L$(OSGHOME)/lib
 

src/Demos/sgv/Makefile

@@ -11,6 +11,10 @@ TARGET_BIN_FILES = sgv
 #note, standard library list. 
 LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS)
 
+#under Darwin we have to use the framework stuff to get GLUT OpenGL etc.
+MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
+
+
 C++FLAGS += -I$(OSGHOME)/include
 LDFLAGS += -L$(OSGHOME)/lib