FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Stephan Huber, "minor ios-fixes/-enhancements

Browse Source 
* force _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC for IOS device + simulator as the test does not pick the right implementation
* fixed a small compile-bug for iphone-example
* added a check to prevent multiple realization of a GraphicsWindowIOS-object
"
This commit is contained in:
Robert Osfield 2013-11-18 14:21:06 +00:00
parent d8c1c4bbeb
commit dbf88cc209
3 changed files with 107 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeModules/CheckAtomicOps.cmake
View File

@ -15,7 +15,17 @@ IF (OPENTHREADS_ATOMIC_USE_MUTEX)
SET(_OPENTHREADS_ATOMIC_USE_MUTEX 1) SET(_OPENTHREADS_ATOMIC_USE_MUTEX 1)
ELSE() ELSE()
# as the test does not work for IOS hardcode the ATOMIC implementation
IF(OSG_BUILD_PLATFORM_IPHONE_SIMULATOR OR OSG_BUILD_PLATFORM_IPHONE)
SET(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS 0)
SET(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS 0)
SET(_OPENTHREADS_ATOMIC_USE_SUN 0)
SET(_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED 0)
SET(_OPENTHREADS_ATOMIC_USE_MUTEX 0)
SET(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC 1)
ELSE()
INCLUDE(CheckCXXSourceRuns) INCLUDE(CheckCXXSourceRuns)
# Do step by step checking, # Do step by step checking,
@ -133,5 +143,6 @@ ELSE()
NOT _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC) NOT _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
SET(_OPENTHREADS_ATOMIC_USE_MUTEX 1) SET(_OPENTHREADS_ATOMIC_USE_MUTEX 1)
ENDIF() ENDIF()
ENDIF()
ENDIF() ENDIF()

1
examples/osgviewerIPhone/iphoneViewerAppDelegate.h
View File

@ -5,7 +5,6 @@
#include <osgDB/ReadFile> #include <osgDB/ReadFile>
#include <osg/MatrixTransform> #include <osg/MatrixTransform>
#include <osg/CameraNode>
#include <osgText/Text> #include <osgText/Text>
#include <osgViewer/Viewer> #include <osgViewer/Viewer>

2
src/osgViewer/GraphicsWindowIOS.mm
View File

@ -746,6 +746,8 @@ void GraphicsWindowIOS::init()
bool GraphicsWindowIOS::realizeImplementation() bool GraphicsWindowIOS::realizeImplementation()
{ {
if (_realized) return true;
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
BOOL bar_hidden = (_traits->windowDecoration) ? NO: YES; BOOL bar_hidden = (_traits->windowDecoration) ? NO: YES;