Show
Ignore:
Timestamp:
11/24/14 16:24:31 (3 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/include/osgViewer/CompositeViewer

    r13041 r13376  
    124124        virtual void viewerInit(); 
    125125 
     126        void generateSlavePointerData(osg::Camera* camera, osgGA::GUIEventAdapter& event); 
     127        void generatePointerData(osgGA::GUIEventAdapter& event); 
     128        void reprojectPointerData(osgGA::GUIEventAdapter& source_event, osgGA::GUIEventAdapter& dest_event); 
     129 
    126130        typedef std::vector< osg::ref_ptr<osgViewer::View> > RefViews; 
    127131        RefViews _views; 
     
    136140        osg::observer_ptr<osg::Camera>      _cameraWithFocus; 
    137141        osg::observer_ptr<osgViewer::View>  _viewWithFocus; 
     142         
     143        osg::ref_ptr<osgGA::GUIEventAdapter> _previousEvent; 
    138144 
    139145};