From a1f20f1a00623c0fa78cc5706b72f332807b8759 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 8 Nov 2006 09:50:27 +0000
Subject: [PATCH] From Eric Wing, change osgGA::SimpleViewer to
 osgViewer::Viewer. From Robert Osfield, added -losgViewer & -losgGA to
 makefiles.

---
 examples/osgGLUTkeyboardmouse/GNUmakefile              | 2 +-
 examples/osgGLUTkeyboardmouse/GNUmakefile.inst         | 2 +-
 examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp | 6 +++---
 examples/osgGLUTsimple/GNUmakefile                     | 2 +-
 examples/osgGLUTsimple/GNUmakefile.inst                | 2 +-
 examples/osgGLUTsimple/osgGLUTsimple.cpp               | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/osgGLUTkeyboardmouse/GNUmakefile b/examples/osgGLUTkeyboardmouse/GNUmakefile
index 903f27fdf..135271b0b 100644
--- a/examples/osgGLUTkeyboardmouse/GNUmakefile
+++ b/examples/osgGLUTkeyboardmouse/GNUmakefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	osgGLUTkeyboardmouse.cpp\
 
-LIBS     += -losgGA -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
+LIBS     += -losgViewer -losgGA -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
 
 INSTFILES = \
 	$(CXXFILES)\
diff --git a/examples/osgGLUTkeyboardmouse/GNUmakefile.inst b/examples/osgGLUTkeyboardmouse/GNUmakefile.inst
index 371f71392..483deb9a9 100644
--- a/examples/osgGLUTkeyboardmouse/GNUmakefile.inst
+++ b/examples/osgGLUTkeyboardmouse/GNUmakefile.inst
@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	osgGLUTkeyboardmouse.cpp\
 
-LIBS     += -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
+LIBS     += -losgViewer -losgGA -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
 
 EXEC = osgGLUTkeyboardmouse
 
diff --git a/examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp b/examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp
index 9ae4b847e..eb3e2bdae 100644
--- a/examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp
+++ b/examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp
@@ -13,11 +13,11 @@
 #  include <GL/glut.h>
 #endif
 
-#include <osgGA/SimpleViewer>
+#include <osgViewer/SimpleViewer>
 #include <osgGA/TrackballManipulator>
 #include <osgDB/ReadFile>
 
-osg::ref_ptr<osgGA::SimpleViewer> viewer;
+osg::ref_ptr<osgViewer::SimpleViewer> viewer;
 
 void display(void)
 {
@@ -89,7 +89,7 @@ int main( int argc, char **argv )
     glutKeyboardFunc( keyboard );
 
     // create the view of the scene.
-    viewer = new osgGA::SimpleViewer;
+    viewer = new osgViewer::SimpleViewer;
     viewer->setSceneData(loadedModel.get());
     viewer->setCameraManipulator(new osgGA::TrackballManipulator);
 
diff --git a/examples/osgGLUTsimple/GNUmakefile b/examples/osgGLUTsimple/GNUmakefile
index a29cea3ec..a75d66926 100644
--- a/examples/osgGLUTsimple/GNUmakefile
+++ b/examples/osgGLUTsimple/GNUmakefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	osgGLUTsimple.cpp\
 
-LIBS     += -losgGA -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
+LIBS     += -losgViewer -losgGA -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
 
 INSTFILES = \
 	$(CXXFILES)\
diff --git a/examples/osgGLUTsimple/GNUmakefile.inst b/examples/osgGLUTsimple/GNUmakefile.inst
index 60ed1d5d7..e4e203184 100644
--- a/examples/osgGLUTsimple/GNUmakefile.inst
+++ b/examples/osgGLUTsimple/GNUmakefile.inst
@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	osgGLUTsimple.cpp\
 
-LIBS     += -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
+LIBS     += -losgViewer -losgGA -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
 
 EXEC = osgGLUTsimple
 
diff --git a/examples/osgGLUTsimple/osgGLUTsimple.cpp b/examples/osgGLUTsimple/osgGLUTsimple.cpp
index bd7e51984..caff5f757 100644
--- a/examples/osgGLUTsimple/osgGLUTsimple.cpp
+++ b/examples/osgGLUTsimple/osgGLUTsimple.cpp
@@ -13,10 +13,10 @@
 #  include <GL/glut.h>
 #endif
 
-#include <osgGA/SimpleViewer>
+#include <osgViewer/SimpleViewer>
 #include <osgDB/ReadFile>
 
-osg::ref_ptr<osgGA::SimpleViewer> viewer;
+osg::ref_ptr<osgViewer::SimpleViewer> viewer;
 
 void display(void)
 {
@@ -60,7 +60,7 @@ int main( int argc, char **argv )
     glutReshapeFunc( reshape );
 
     // create the view of the scene.
-    viewer = new osgGA::SimpleViewer;
+    viewer = new osgViewer::SimpleViewer;
     viewer->setSceneData(loadedModel.get());
 
     // initialize the view to look at the center of the scene graph