Show
Ignore:
Timestamp:
11/24/14 16:24:31 (11 hours ago)
Author:
robert
Message:

From Jan Klimke, "i noticed, that there are a couple of additional flaws when building osg for Mac OS X 10.10 Yosemite.

The mac os sdk version is recognized by the current CMAKE script as 10.1 instead of 10.10 since it cuts the version string from the 4th place. I introduced a more reliable version checking based on splitting the returned version code into MAJOR MINOR and PATCH parts and reassemble the OSG sdk version afterwards.

I replaced the existing CMake code against the following (returning now version 10.10 as expected):

# Determine the canonical name of the selected Platform SDK

EXECUTE_PROCESS(COMMAND "/usr/bin/sw_vers" "-productVersion"

OUTPUT_VARIABLE OSG_OSX_SDK_NAME
OUTPUT_STRIP_TRAILING_WHITESPACE)

STRING(REPLACE "." ";" MACOS_VERSION_LIST ${OSG_OSX_SDK_NAME})
LIST(GET MACOS_VERSION_LIST 0 MACOS_VERSION_MAJOR)
LIST(GET MACOS_VERSION_LIST 1 MACOS_VERSION_MINOR)
LIST(GET MACOS_VERSION_LIST 2 MACOS_VERSION_PATCH)

SET(OSG_OSX_SDK_NAME "macosx${MACOS_VERSION_MAJOR}.${MACOS_VERSION_MINOR}")

Also i added the check for the new Version to some more find scripts.

Additionally the nil object in Objective C now seems to be equivalent with a null_ptr that cannot be passed as GLInt anymore. So i switched this in the PixelBufferCocoa?.mm to pass a zero instead of nil.
"

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPresentation/deprecated/SlideEventHandler.cpp

    r13734 r13890  
    968968} 
    969969 
    970 void SlideEventHandler::operator()(osg::Node* node, osg::NodeVisitor* nv) 
    971 { 
    972     osgGA::EventVisitor* ev = dynamic_cast<osgGA::EventVisitor*>(nv); 
    973     if (ev) 
    974     { 
    975         if (node->getNumChildrenRequiringEventTraversal()>0) traverse(node,nv); 
    976  
    977         if (ev->getActionAdapter() && !ev->getEvents().empty()) 
    978         { 
    979             for(osgGA::EventQueue::Events::iterator itr = ev->getEvents().begin(); 
    980                 itr != ev->getEvents().end(); 
    981                 ++itr) 
    982             { 
    983                 handleWithCheckAgainstIgnoreHandledEventsMask(*(*itr), *(ev->getActionAdapter()), node, nv); 
    984             } 
    985         } 
    986     } 
    987 } 
    988  
    989970bool SlideEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa) 
    990971{