From bd37f999c4bdc4f4fd3f18cc9d2056674ea6a5b9 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 8 Mar 2004 11:02:05 +0000 Subject: [PATCH] From Bob Kuehne, change on __DARWIN_OSX__ define to __APPLE__ --- Make/makedefs | 10 +++++++--- examples/osgcluster/broadcaster.cpp | 2 +- include/osg/GL | 2 +- include/osg/GLExtensions | 4 ++-- include/osg/GLU | 2 +- include/osg/Math | 8 ++++---- include/osg/Timer | 4 ++-- src/osg/Timer.cpp | 4 ++-- src/osgDB/DynamicLibrary.cpp | 8 ++++---- src/osgDB/FileUtils.cpp | 2 +- src/osgDB/Registry.cpp | 2 +- src/osgPlugins/ac3d/ac3d.cpp | 7 +++---- src/osgPlugins/dx/DXWriter.cpp | 4 ++-- src/osgPlugins/iv/parser.cpp | 2 +- src/osgPlugins/iv/parser.y | 2 +- 15 files changed, 33 insertions(+), 30 deletions(-) diff --git a/Make/makedefs b/Make/makedefs index e04282635..06e383620 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -386,15 +386,19 @@ endif #### MacOS X specific definitions ifeq ($(OS),Darwin) - C++ = c++ + ifeq (x$(CXX),x) + C++ = g++ + else + C++ = $(CXX) + endif INC += -I/usr/X11R6/include LDFLAGS += -L/usr/X11R6/lib -L/sw/lib - DEF += -Wall -D__DARWIN_OSX__ + DEF += -Wall OPTF = -O2 DBGF = -g -DOSG_COMPILE_UNIT_TESTS DEPARG = -M $(DEF) SHARED = -dynamic - ARCH = + ARCH = 32 ARCHINST = ARCHARGS = LINKARGS = diff --git a/examples/osgcluster/broadcaster.cpp b/examples/osgcluster/broadcaster.cpp index 8a307b2c8..f26287de0 100644 --- a/examples/osgcluster/broadcaster.cpp +++ b/examples/osgcluster/broadcaster.cpp @@ -30,7 +30,7 @@ #elif defined(__sun) #include #include -#elif defined (__DARWIN_OSX__) +#elif defined (__APPLE__) #include #include #elif defined (WIN32) diff --git a/include/osg/GL b/include/osg/GL index facd25c71..d3f2a9ecb 100644 --- a/include/osg/GL +++ b/include/osg/GL @@ -18,7 +18,7 @@ // non windows, doesn't require nonsense as seen below :-) #ifndef __gl_h_ - #ifdef __DARWIN_OSX__ + #ifdef __APPLE__ #include #else #include diff --git a/include/osg/GLExtensions b/include/osg/GLExtensions index b8e26bb9c..7e986f836 100644 --- a/include/osg/GLExtensions +++ b/include/osg/GLExtensions @@ -21,7 +21,7 @@ #define WIN32_LEAN_AND_MEAN #define NOMINMAX #include -#elif defined(__DARWIN_OSX__) +#elif defined(__APPLE__) #include #else #include @@ -50,7 +50,7 @@ inline void* getGLExtensionFuncPtr(const char *funcName) return (void*)wglGetProcAddress(funcName); -#elif defined(__DARWIN_OSX__) +#elif defined(__APPLE__) std::string temp( "_" ); temp += funcName; // Mac OS X prepends an underscore on function names diff --git a/include/osg/GLU b/include/osg/GLU index 254fd75df..e72814d3c 100644 --- a/include/osg/GLU +++ b/include/osg/GLU @@ -14,7 +14,7 @@ #ifndef OSG_GLU #define OSG_GLU 1 -#ifdef __DARWIN_OSX__ +#ifdef __APPLE__ #include #else #include diff --git a/include/osg/Math b/include/osg/Math index 0252b6cd2..c16b8af91 100644 --- a/include/osg/Math +++ b/include/osg/Math @@ -19,7 +19,7 @@ // for OSX users : // comment in if you want backwards compatibility with 10.1.x versions // otherwise you'll have problems with missing floorf and __isnan*() -// #define DARWIN_OSX_PRE_10_2 +// #define APPLE_PRE_10_2 #if defined(_MSC_VER) && (_MSC_VER >= 1300) #include @@ -28,7 +28,7 @@ #if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \ defined (sun) || \ - defined (__DARWIN_OSX__) + defined (__APPLE__) #include @@ -88,7 +88,7 @@ #if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \ defined (sun) || \ defined (__hpux__) || \ - defined (DARWIN_OSX_PRE_10_2) + defined (APPLE_PRE_10_2) #ifndef floorf #define floorf (float)floor @@ -163,7 +163,7 @@ inline double RadiansToDegrees(double angle) { return angle*180.0/PI; } inline bool isNaN(float v) { return _isnan(v)!=0; } inline bool isNaN(double v) { return _isnan(v)!=0; } #else - # if defined(__DARWIN_OSX__) && !defined (DARWIN_OSX_PRE_10_2) + # if defined(__APPLE__) && !defined (APPLE_PRE_10_2) inline bool isNaN(float v) { return __isnanf(v); } inline bool isNaN(double v) { return __isnand(v); } #else diff --git a/include/osg/Timer b/include/osg/Timer index da898ce99..669fb1df1 100644 --- a/include/osg/Timer +++ b/include/osg/Timer @@ -57,7 +57,7 @@ class SG_EXPORT Timer { static const Timer* instance(); - #if defined __DARWIN_OSX__ || defined macintosh + #if defined __APPLE__ || defined macintosh // PJA MAC OSX - inline Tick() pollutes namespace so badly // we cant compile, due to Carbon.h ... Timer_t tick() const; @@ -219,7 +219,7 @@ class SG_EXPORT Timer { } } -#elif !defined (__DARWIN_OSX__) && !defined (macintosh) +#elif !defined (__APPLE__) && !defined (macintosh) // no choice, always use std::clock() namespace osg{ diff --git a/src/osg/Timer.cpp b/src/osg/Timer.cpp index 9bf696b72..03990cff5 100644 --- a/src/osg/Timer.cpp +++ b/src/osg/Timer.cpp @@ -283,9 +283,9 @@ const Timer* Timer::instance() } -#elif defined (__DARWIN_OSX__) || defined (macintosh) +#elif defined (__APPLE__) || defined (macintosh) - #if defined (__DARWIN_OSX__) + #if defined (__APPLE__) #include // do I really have to link against the Carbon framework just for this? #else #include diff --git a/src/osgDB/DynamicLibrary.cpp b/src/osgDB/DynamicLibrary.cpp index bf4c0a6aa..77ed4e3cc 100644 --- a/src/osgDB/DynamicLibrary.cpp +++ b/src/osgDB/DynamicLibrary.cpp @@ -14,7 +14,7 @@ #include #include #include -#elif defined(__DARWIN_OSX__) +#elif defined(__APPLE__) #include #else // all other unix #include @@ -51,7 +51,7 @@ DynamicLibrary::~DynamicLibrary() osg::notify(osg::INFO)<<"Closing DynamicLibrary "<<_name< -#ifdef __DARWIN_OSX__ +#ifdef __APPLE__ #include #else #include @@ -158,10 +158,9 @@ static std::vector palette; // change to dynamic array static int startmatindex = 0; -osg::Material*ac_palette_get_material(const unsigned int id) +osg::Material*ac_palette_get_material(int id) { - if (id #else #include - #if (defined(WIN32) || defined (__DARWIN_OSX__)) && !defined(__CYGWIN__) + #if (defined(WIN32) || defined (__APPLE__)) && !defined(__CYGWIN__) #include #else #include @@ -604,7 +604,7 @@ inline int IsNaNorInf( float f ) } #elif defined(__FreeBSD__) || defined(__linux) || defined(__CYGWIN__) return isnanf(f) || isinf(f); -#elif defined(__DARWIN_OSX__) +#elif defined(__APPLE__) return __isnanf(f) || __isinf(f); #elif defined(__sun) return isnan(f); // KLUDGE - hack to get this to compile w/g++. diff --git a/src/osgPlugins/iv/parser.cpp b/src/osgPlugins/iv/parser.cpp index dc029ed82..321a8ec30 100644 --- a/src/osgPlugins/iv/parser.cpp +++ b/src/osgPlugins/iv/parser.cpp @@ -56,7 +56,7 @@ # pragma warning (disable:4541) #endif -#ifdef __DARWIN_OSX__ +#ifdef __APPLE__ #include #include #else diff --git a/src/osgPlugins/iv/parser.y b/src/osgPlugins/iv/parser.y index df1943f75..3efe6f46f 100644 --- a/src/osgPlugins/iv/parser.y +++ b/src/osgPlugins/iv/parser.y @@ -23,7 +23,7 @@ # pragma warning (disable:4541) #endif -#ifdef __DARWIN_OSX__ +#ifdef __APPLE__ #include #else #include