From 8f3debaf9bc20f0e4a94696db5fd071c5a4bee3f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 24 Apr 2002 20:04:34 +0000 Subject: [PATCH] Changes for Mac OSX build, sent in by Bob Kuehne --- Make/makedefs | 5 ++++- src/osg/GLExtensions.cpp | 6 ++++-- src/osgPlugins/quicktime/Makefile | 5 ++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Make/makedefs b/Make/makedefs index fdc54deee..4cb5ab701 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -224,7 +224,10 @@ ifeq ($(OS),Darwin) LIB_EXT = dylib QUICKTIME_LIB = -framework QuickTime TIFF_LIB = -ltiff - + SRC_DIRS = osg osgUtil osgDB osgGLUT osgPlugins Demos + PLUGIN_DIRS = osg rgb lib3ds flt obj lwo txp bmp pic tga osgtgz tgz zip + DEMOS_DIRS = hangglide osgbillboard osgcluster osgconv osgcopy osgcube osgimpostor\ + osgreflect osgscribe osgstereoimage osgtexture osgviews osgversion sgv endif #### Cygwin/Mingw specific definitions diff --git a/src/osg/GLExtensions.cpp b/src/osg/GLExtensions.cpp index 8c45facbe..54af58cd9 100644 --- a/src/osg/GLExtensions.cpp +++ b/src/osg/GLExtensions.cpp @@ -62,10 +62,12 @@ void* osg::getGLExtensionFuncPtr(const char *funcName) { #if defined(WIN32) return wglGetProcAddress(funcName); -#elif defined(macintosh) - return NULL; #else +#if defined( __DARWIN_OSX__ ) + static void *lib = dlopen("libGL.dylib", RTLD_LAZY); +#else // all other unixes static void *lib = dlopen("libGL.so", RTLD_LAZY); +#endif if (lib) return dlsym(lib, funcName); else diff --git a/src/osgPlugins/quicktime/Makefile b/src/osgPlugins/quicktime/Makefile index f3e845499..6f22eed54 100644 --- a/src/osgPlugins/quicktime/Makefile +++ b/src/osgPlugins/quicktime/Makefile @@ -1,9 +1,8 @@ TOPDIR = ../../.. include $(TOPDIR)/Make/makedefs -CXXFILES =\ - ReaderWriterQT.cpp\ - QTtexture.cpp\ +CXXFILES = ReaderWriterQT.cpp +CFILES = QTtexture.c LIBS += $(QUICKTIME) $(OSG_LIBS) $(OTHER_LIBS)