First batch of changes required for MacOS X build. Orignal submission from

Phil Atkin, merged by Robert Osfield.
This commit is contained in:
Robert Osfield
2002-01-16 10:36:20 +00:00
parent f7e944c47f
commit 1fb8f9cb86
33 changed files with 116 additions and 26 deletions

View File

@@ -6,8 +6,13 @@
using namespace osg;
using namespace osgUtil;
#ifndef __DARWIN_OSX__
// this is a hack to test OS X ....
// register a RenderStage prototype with the RenderBin prototype list.
RegisterRenderBinProxy<DepthSortedBin> s_registerDepthSortedBinProxy;
#endif
DepthSortedBin::DepthSortedBin()
{

View File

@@ -36,6 +36,7 @@ TARGET_BASENAME = osgUtil
LIBS = -L$(OSGHOME)/lib -losg $(GL_LIBS)
MACOSXLIBS = -L$(OSGHOME)/lib -losg -ldl -lm -lstdc++
LIB = $(OSGHOME)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
#LIB = $(OSGHOME)/lib/lib$(TARGET_BASENAME).a

View File

@@ -6,10 +6,16 @@
using namespace osg;
using namespace osgUtil;
// register a RenderStage prototype with the RenderBin prototype list.
RegisterRenderBinProxy<RenderBin> s_registerRenderBinProxy;
#ifdef __DARWIN_OSX__
// PJA 10/1/02 - this is a hack to get OS X to build, if this code is included in DepthSortedBin.cpp it isnt executed
// register a RenderStage prototype with the RenderBin prototype list.
#include <osgUtil/DepthSortedBin>
RegisterRenderBinProxy<DepthSortedBin> s_registerDepthSortedBinProxy;
#endif
typedef std::map< std::string, osg::ref_ptr<RenderBin> > RenderBinPrototypeList;
RenderBinPrototypeList* renderBinPrototypeList()