From Ulrich Hertlein, fixes for OSX build
This commit is contained in:
parent
e9e3a533ea
commit
976df65bcc
@ -31,7 +31,8 @@ ImageStream::ImageStream():
|
||||
|
||||
ImageStream::ImageStream(const ImageStream& image,const CopyOp& copyop):
|
||||
Image(image,copyop),
|
||||
_status(image._status)
|
||||
_status(image._status),
|
||||
_loopingMode(image._loopingMode)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -344,7 +344,7 @@ int OperationThread::cancel()
|
||||
#endif
|
||||
// commenting out debug info as it was cashing crash on exit, presumable
|
||||
// due to osg::notify or std::cout destructing earlier than this destructor.
|
||||
osg::notify(osg::INFO)<<" Waiting for OperationThread to cancel "<<this<<std::endl;
|
||||
osg::notify(osg::DEBUG_INFO)<<" Waiting for OperationThread to cancel "<<this<<std::endl;
|
||||
OpenThreads::Thread::YieldCurrentThread();
|
||||
}
|
||||
}
|
||||
|
@ -30,6 +30,7 @@ ADD_LIBRARY(${LIB_NAME}
|
||||
|
||||
SET(TARGET_LIBRARIES_VARS FREETYPE_LIBRARY )
|
||||
LINK_INTERNAL(${LIB_NAME}
|
||||
osgUtil
|
||||
osgDB
|
||||
osg
|
||||
OpenThreads
|
||||
|
Loading…
Reference in New Issue
Block a user