From 96b2b93edc4250d5f9ccb937d69b6a2cd9fc1854 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 8 Jan 2007 22:54:02 +0000
Subject: [PATCH] Build fixes

---
 VisualStudio/OpenSceneGraph.dsw         |  4 ++--
 examples/osgparticleeffects/GNUmakefile |  2 +-
 src/osgViewer/CompositeViewer.cpp       |  5 +++++
 src/osgViewer/Scene.cpp                 | 15 +++++++++++----
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/VisualStudio/OpenSceneGraph.dsw b/VisualStudio/OpenSceneGraph.dsw
index 94d30de23..af907c27f 100644
--- a/VisualStudio/OpenSceneGraph.dsw
+++ b/VisualStudio/OpenSceneGraph.dsw
@@ -780,7 +780,7 @@ Package=<4>
     Project_Dep_Name Core osgGA
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name Core osgProducer
+    Project_Dep_Name Core osgViewer
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name Core osgUtil
@@ -1512,7 +1512,7 @@ Package=<4>
     Project_Dep_Name Core osgParticle
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name Core osgViewer
+    Project_Dep_Name Core osgProducer
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name Core osgUtil
diff --git a/examples/osgparticleeffects/GNUmakefile b/examples/osgparticleeffects/GNUmakefile
index 861a991ca..60bc6e5ec 100644
--- a/examples/osgparticleeffects/GNUmakefile
+++ b/examples/osgparticleeffects/GNUmakefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	osgparticleeffects.cpp\
 
-LIBS     += -losgViewer -losgProducer -lProducer -losgParticle -losgSim -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
+LIBS     += -losgProducer -lProducer -losgParticle -losgSim -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
 
 INSTFILES = \
 	$(CXXFILES)\
diff --git a/src/osgViewer/CompositeViewer.cpp b/src/osgViewer/CompositeViewer.cpp
index adb036819..5ceb5c1fd 100644
--- a/src/osgViewer/CompositeViewer.cpp
+++ b/src/osgViewer/CompositeViewer.cpp
@@ -28,6 +28,11 @@ void CompositeViewer::init()
 {
 }
 
+void CompositeViewer::addView(osgViewer::View* view)
+{
+    osg::notify(osg::NOTICE)<<"CompositeViewer::addView(View*) not implemented yet."<<std::endl;
+}
+
 void CompositeViewer::frame()
 {
     osg::notify(osg::NOTICE)<<"CompositeViewer::frame() not implemented yet."<<std::endl;
diff --git a/src/osgViewer/Scene.cpp b/src/osgViewer/Scene.cpp
index 6eb552b73..0382c909f 100644
--- a/src/osgViewer/Scene.cpp
+++ b/src/osgViewer/Scene.cpp
@@ -24,10 +24,6 @@ Scene::Scene():
 
     _updateVisitor = new osgUtil::UpdateVisitor;
     _updateVisitor->setFrameStamp(_frameStamp.get());
-
-    _eventQueue = new osgGA::EventQueue;
-
-    _eventVisitor = new osgGA::EventVisitor;
     
     setDatabasePager(new osgDB::DatabasePager);
 }
@@ -36,6 +32,12 @@ Scene::~Scene()
 {
 }
 
+void Scene::init()
+{
+    osg::notify(osg::NOTICE)<<"Scene::init() not implementated yet."<<std::endl;
+}
+
+
 void Scene::setSceneData(osg::Node* node)
 {
     _sceneData = node;
@@ -62,6 +64,11 @@ void Scene::setDatabasePager(osgDB::DatabasePager* dp)
     _databasePager = dp;
 }
 
+void Scene::addEventHandler(osgGA::GUIEventHandler*)
+{
+    osg::notify(osg::NOTICE)<<"Scene::addEventHandler() not implementated yet."<<std::endl;
+}
+
 void Scene::frameAdvance()
 {
     // double previousTime = _frameStamp->getReferenceTime();