FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up some warnings and added :

Browse Source 
LINKARGS += -Wl,multiply_defined -Wl,suppress

To GNUmakefile for the OSX build.
This commit is contained in:
Robert Osfield 2003-04-08 10:17:44 +00:00
parent 0d45181aff
commit 4fd2352afa
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPlugins/geo/GNUmakefile
View File

@ -9,6 +9,12 @@ CXXFILES =\
##LIBS += -losgText -losgSim $(OSG_LIBS) $(OTHER_LIBS) ##LIBS += -losgText -losgSim $(OSG_LIBS) $(OTHER_LIBS)
LIBS = LIBS =
#### MacOS X specific definitions
ifeq ($(OS),Darwin)
LINKARGS += -Wl,multiply_defined -Wl,suppress
endif
TARGET_BASENAME = geo TARGET_BASENAME = geo
include $(TOPDIR)/Make/cygwin_plugin_def include $(TOPDIR)/Make/cygwin_plugin_def
PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

3
src/osgPlugins/geo/geoActions.cpp
View File

@ -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 #ifdef USETEXT // buggy text feb 2003
osgText::Text *txt=dynamic_cast<osgText::Text *>(node); osgText::Text *txt=dynamic_cast<osgText::Text *>(node);
char content[32]; char content[32];

2
src/osgPlugins/geo/osgGeoAction.h
View File

@ -37,7 +37,7 @@ public:
virtual void setInVar(const double *indvar) {in=indvar;} virtual void setInVar(const double *indvar) {in=indvar;}
virtual void setOutVar(double *outdvar) {out=outdvar;} virtual void setOutVar(double *outdvar) {out=outdvar;}
virtual void doaction(osg::Node *)=0; // do math operation eg *out=*in or =f(*in). 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: protected:
const double *in; // address of input variable const double *in; // address of input variable
double *out; // address of output double *out; // address of output