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

From David Guthrie, OSX marco reworking to better handling different OSX versions.

Browse Source
This commit is contained in:
Robert Osfield 2006-02-05 21:53:37 +00:00
parent 39381c6fe7
commit 4bc13ec71b
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/osg/Math
View File

@ -16,10 +16,15 @@
#include <math.h> #include <math.h>
// for OSX users :
// comment in if you want backwards compatibility with 10.1.x versions //certain math functions were not defined until 10.2
// otherwise you'll have problems with missing floorf and __isnan*() //so this code checks the version so it can add in workarounds for older versions.
// #define APPLE_PRE_10_2 #ifdef __APPLE__
#include <AvailabilityMacros.h>
#if !defined(MAC_OS_X_VERSION_10_2) || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_2)
#define APPLE_PRE_10_2
#endif
#endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include <float.h> #include <float.h>

17
src/osgDB/DynamicLibrary.cpp
View File

@ -10,11 +10,20 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* OpenSceneGraph Public License for more details. * OpenSceneGraph Public License for more details.
*/ */
//The dlopen calls were not adding to OS X until 10.3
#ifdef __APPLE__
#include <AvailabilityMacros.h>
#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_3)
#define APPLE_PRE_10_3
#endif
#endif
#if defined(WIN32) && !defined(__CYGWIN__) #if defined(WIN32) && !defined(__CYGWIN__)
#include <Io.h> #include <Io.h>
#include <Windows.h> #include <Windows.h>
#include <Winbase.h> #include <Winbase.h>
#elif defined(__APPLE__) #elif defined(__APPLE__) && defined(APPLE_PRE_10_3)
#include <mach-o/dyld.h> #include <mach-o/dyld.h>
#else // all other unix #else // all other unix
#include <unistd.h> #include <unistd.h>
@ -51,7 +60,7 @@ DynamicLibrary::~DynamicLibrary()
osg::notify(osg::INFO)<<"Closing DynamicLibrary "<<_name<<std::endl; osg::notify(osg::INFO)<<"Closing DynamicLibrary "<<_name<<std::endl;
#if defined(WIN32) && !defined(__CYGWIN__) #if defined(WIN32) && !defined(__CYGWIN__)
FreeLibrary((HMODULE)_handle); FreeLibrary((HMODULE)_handle);
#elif defined(__APPLE__) #elif defined(__APPLE__) && defined(APPLE_PRE_10_3)
NSUnLinkModule(static_cast<NSModule>(_handle), FALSE); NSUnLinkModule(static_cast<NSModule>(_handle), FALSE);
#elif defined(__hpux__) #elif defined(__hpux__)
// fortunately, shl_t is a pointer // fortunately, shl_t is a pointer
@ -85,7 +94,7 @@ DynamicLibrary::HANDLE DynamicLibrary::getLibraryHandle( const std::string& libr
#if defined(WIN32) && !defined(__CYGWIN__) #if defined(WIN32) && !defined(__CYGWIN__)
handle = LoadLibrary( libraryName.c_str() ); handle = LoadLibrary( libraryName.c_str() );
#elif defined(__APPLE__) #elif defined(__APPLE__) && defined(APPLE_PRE_10_3)
NSObjectFileImage image; NSObjectFileImage image;
// NSModule os_handle = NULL; // NSModule os_handle = NULL;
if (NSCreateObjectFileImageFromFile(libraryName.c_str(), &image) == NSObjectFileImageSuccess) { if (NSCreateObjectFileImageFromFile(libraryName.c_str(), &image) == NSObjectFileImageSuccess) {
@ -119,7 +128,7 @@ DynamicLibrary::PROC_ADDRESS DynamicLibrary::getProcAddress(const std::string& p
#if defined(WIN32) && !defined(__CYGWIN__) #if defined(WIN32) && !defined(__CYGWIN__)
return (DynamicLibrary::PROC_ADDRESS)GetProcAddress( (HMODULE)_handle, return (DynamicLibrary::PROC_ADDRESS)GetProcAddress( (HMODULE)_handle,
procName.c_str() ); procName.c_str() );
#elif defined(__APPLE__) #elif defined(__APPLE__) && defined(APPLE_PRE_10_3)
std::string temp("_"); std::string temp("_");
NSSymbol symbol; NSSymbol symbol;
temp += procName; // Mac OS X prepends an underscore on function names temp += procName; // Mac OS X prepends an underscore on function names