fly/flightgear
1
0
Fork 0
Code Activity

OSG 3.4.0 compilation fixes.

Browse source
This commit is contained in:
Richard Harrison 2019-02-20 19:11:45 +01:00
parent bec41e7e17
commit 8e35b7efc7
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Main/main.cxx
View file

@ -497,6 +497,10 @@ int fgMainInit( int argc, char **argv )
SG_LOG( SG_GENERAL, SG_INFO, "Jenkins number/ID " << JENKINS_BUILD_NUMBER << ":"
<< JENKINS_BUILD_ID);
#if OSG_VERSION_LESS_THAN(3,4,1)
SG_LOG(SG_GENERAL, SG_ALERT, "Minimum supported OpenScenegraph is V3.4.1 - currently using " << osgGetVersion() << " This can cause fatal OSG 'final reference count' errors at runtime");
#endif
// seed the random number generator
sg_srandom_time();

2
utils/fgviewer/fgviewer.cxx
View file

@ -254,7 +254,7 @@ main(int argc, char** argv)
osg::ref_ptr<osg::Node> loadedModel;
if (1 < arguments.argc()) {
// read the scene from the list of file specified command line args.
#if OSG_VERSION_LESS_THAN(3,4,0)
#if OSG_VERSION_LESS_THAN(3,4,1)
loadedModel = osgDB::readNodeFiles(arguments, options.get());
#else
loadedModel = osgDB::readRefNodeFiles(arguments, options.get());