Cleaned up some warnings and added :
LINKARGS += -Wl,multiply_defined -Wl,suppress To GNUmakefile for the OSX build.
This commit is contained in:
parent
0d45181aff
commit
4fd2352afa
@ -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)
|
||||
|
@ -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];
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user