Changes for Mac OSX build, sent in by Bob Kuehne
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user