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

@@ -135,6 +135,7 @@ TARGET_INCLUDE_FILES = \
LIBS = $(GL_LIBS)
MACOSXLIBS = -lm -ldl -lstdc++
LIB = $(OSGHOME)/lib/lib$(TARGET_BASENAME).$(SO_EXT)
#LIB = $(OSGHOME)/lib/lib$(TARGET_BASENAME).a

View File

@@ -197,9 +197,9 @@ using namespace osg;
}
}
#elif defined (__APPLE_CC__) || defined (macintosh)
#elif defined (__DARWIN_OSX__) || defined (macintosh)
#if defined (__APPLE_CC__)
#if defined (__DARWIN_OSX__)
#include <Carbon/Carbon.h> // do I really have to link against the Carbon framework just for this?
#else
#include <MacTypes.h>