Thanks Ulrich, change now merged and submitted to svn/trunk.
On 14 September 2012 02:14, Ulrich Hertlein <[email protected]> wrote: > Hi Robert, > > attached is a patch to src/osgViewer/CMakeLists.txt that inverts the logic of > when to use > Cocoa and when to use the old Carbon interface for the windowing system. > > The old code had to be modified for every new OS X release to default to > Cocoa. > The new code uses Carbon for <= OS X 10.4 and Cocoa on everything else. > > Cheers, > /ulrich > > Index: src/osgViewer/CMakeLists.txt > =================================================================== > --- src/osgViewer/CMakeLists.txt (revision 13143) > +++ src/osgViewer/CMakeLists.txt (working copy) > @@ -68,12 +68,13 @@ > IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR) > SET(OSG_WINDOWING_SYSTEM "IOS" CACHE STRING "Windowing system > type for > graphics window creation, options only IOS.") > ELSE() > - IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.7" OR > - ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.6" OR > - ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.5") > + IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.4" OR > + ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.3" OR > + ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.2" OR > + ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.1") > + SET(OSG_WINDOWING_SYSTEM "Carbon" CACHE STRING "Windowing > system type for > graphics window creation, options Carbon, Cocoa or X11.") > + ELSE() > SET(OSG_WINDOWING_SYSTEM "Cocoa" CACHE STRING "Windowing > system type for > graphics window creation, options Carbon, Cocoa or X11.") > - ELSE() > - SET(OSG_WINDOWING_SYSTEM "Carbon" CACHE STRING "Windowing > system type for > graphics window creation, options Carbon, Cocoa or X11.") > ENDIF() > ENDIF() > > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
