From 4fd2352afa65bf3ab2d24a6a22e2b346a1edf5b2 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 8 Apr 2003 10:17:44 +0000
Subject: [PATCH] Cleaned up some warnings and added :

    LINKARGS += -Wl,multiply_defined -Wl,suppress

To GNUmakefile for the OSX build.
---
 src/osgPlugins/geo/GNUmakefile    | 6 ++++++
 src/osgPlugins/geo/geoActions.cpp | 3 ++-
 src/osgPlugins/geo/osgGeoAction.h | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/osgPlugins/geo/GNUmakefile b/src/osgPlugins/geo/GNUmakefile
index 1e66c8e06..db29be606 100644
--- a/src/osgPlugins/geo/GNUmakefile
+++ b/src/osgPlugins/geo/GNUmakefile
@@ -9,6 +9,12 @@ CXXFILES =\
 ##LIBS  += -losgText -losgSim $(OSG_LIBS) $(OTHER_LIBS)
 LIBS  = 
 
+#### MacOS X specific definitions
+ifeq ($(OS),Darwin)
+LINKARGS += -Wl,multiply_defined -Wl,suppress
+endif
+
+
 TARGET_BASENAME = geo
 include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)
diff --git a/src/osgPlugins/geo/geoActions.cpp b/src/osgPlugins/geo/geoActions.cpp
index 7d83c1ee7..96fe5ab7f 100644
--- a/src/osgPlugins/geo/geoActions.cpp
+++ b/src/osgPlugins/geo/geoActions.cpp
@@ -543,7 +543,8 @@ void geoColourBehaviour::doaction(osg::Drawable *dr)
     }
 }
 
-void geoStrContentBehaviour::doaction(osg::Drawable *node) { // do new text
+void geoStrContentBehaviour::doaction(osg::Drawable* /*node*/) 
+{ // do new text
 #ifdef USETEXT // buggy text feb 2003
     osgText::Text *txt=dynamic_cast<osgText::Text *>(node);
     char content[32];
diff --git a/src/osgPlugins/geo/osgGeoAction.h b/src/osgPlugins/geo/osgGeoAction.h
index 922d23d28..0a1e61c9f 100644
--- a/src/osgPlugins/geo/osgGeoAction.h
+++ b/src/osgPlugins/geo/osgGeoAction.h
@@ -37,7 +37,7 @@ public:
     virtual void setInVar(const double *indvar) {in=indvar;}
     virtual void setOutVar(double *outdvar) {out=outdvar;}
     virtual void doaction(osg::Node *)=0; // do math operation eg *out=*in or =f(*in).
-    virtual bool makeBehave(const georecord *grec, const geoHeaderGeo *theHeader) { return true;}; // pure virtual
+    virtual bool makeBehave(const georecord* /*grec*/, const geoHeaderGeo* /*theHeader*/) { return true;}; // pure virtual
 protected:
     const double *in; // address of input variable
     double *out; // address of output