From 29502d8d23d22ff6cbc054643262a698026c38c3 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 17 Jun 2009 11:00:14 +0000 Subject: [PATCH] From Alberto Luaces, "the new changes in osgAnimation showed some errors on the Cygwin platform: 1 - osgAnimation/StatsHandler includes , but on Cygwin only std::isnan is defined that way. I changed it to 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." --- packaging/pkgconfig/openscenegraph-osgAnimation.pc.in | 2 +- src/osgAnimation/CMakeLists.txt | 3 +++ src/osgAnimation/StatsHandler.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in b/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in index 7447edb09..49148a261 100644 --- a/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in +++ b/packaging/pkgconfig/openscenegraph-osgAnimation.pc.in @@ -8,7 +8,7 @@ includedir=${prefix}/include Name: openscenegraph-osgAnimation Description: Skinning and morphing library for Openscenegraph Version: @OPENSCENEGRAPH_VERSION@ -Requires: openscenegraph-osg openthreads +Requires: openscenegraph-osg openscenegraph-osgText openscenegraph-osgGA openscenegraph-osgViewer openthreads Conflicts: Libs: -L${libdir} -losgAnimation Cflags: -I${includedir} diff --git a/src/osgAnimation/CMakeLists.txt b/src/osgAnimation/CMakeLists.txt index 4db8c3101..49f7b51ba 100644 --- a/src/osgAnimation/CMakeLists.txt +++ b/src/osgAnimation/CMakeLists.txt @@ -69,6 +69,9 @@ ADD_LIBRARY(${LIB_NAME} LINK_INTERNAL(${LIB_NAME} osg + osgText + osgGA + osgViewer OpenThreads ) diff --git a/src/osgAnimation/StatsHandler.cpp b/src/osgAnimation/StatsHandler.cpp index 8ef2e7b2c..121d75431 100644 --- a/src/osgAnimation/StatsHandler.cpp +++ b/src/osgAnimation/StatsHandler.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include