From Alberto Luaces, "the new changes in osgAnimation showed some errors on the Cygwin

platform:

1 - osgAnimation/StatsHandler includes <cmath>, but on Cygwin only std::isnan
is defined that way. I changed it to <math.h> as it is done in the rest of
the OSG.

2 - Pulling some osgViewer headers from the same file in osgAnimation makes
the former a new dependency. Thus, I got errors at osgAnimation linking time.
I wonder why nobody noticed this on other platforms. I have updated the
CMakeLists.txt file in order to link to the needed libraries, and

3 - I have updated the openscenegraph-osgAnimation.pc.in file accordingly."
This commit is contained in:
Robert Osfield 2009-06-17 11:00:14 +00:00
parent ad8f2d8974
commit 29502d8d23
3 changed files with 5 additions and 2 deletions

View File

@ -8,7 +8,7 @@ includedir=${prefix}/include
Name: openscenegraph-osgAnimation Name: openscenegraph-osgAnimation
Description: Skinning and morphing library for Openscenegraph Description: Skinning and morphing library for Openscenegraph
Version: @OPENSCENEGRAPH_VERSION@ Version: @OPENSCENEGRAPH_VERSION@
Requires: openscenegraph-osg openthreads Requires: openscenegraph-osg openscenegraph-osgText openscenegraph-osgGA openscenegraph-osgViewer openthreads
Conflicts: Conflicts:
Libs: -L${libdir} -losgAnimation Libs: -L${libdir} -losgAnimation
Cflags: -I${includedir} Cflags: -I${includedir}

View File

@ -69,6 +69,9 @@ ADD_LIBRARY(${LIB_NAME}
LINK_INTERNAL(${LIB_NAME} LINK_INTERNAL(${LIB_NAME}
osg osg
osgText
osgGA
osgViewer
OpenThreads OpenThreads
) )

View File

@ -14,7 +14,7 @@
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
#include <stdio.h> #include <stdio.h>
#include <cmath> #include <math.h>
#include <osg/io_utils> #include <osg/io_utils>
#include <osg/NodeVisitor> #include <osg/NodeVisitor>