From 506c5a674328686893108e14cd07d367abac3ba2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 2 Sep 2004 10:01:24 +0000 Subject: [PATCH] Added usage of carbon pathway in appendPlatformSpecificLibraryFilePaths. --- src/osgDB/FileUtils.cpp | 2 +- src/osgDB/GNUmakefile | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp index a711bff65..c6bd0bd2b 100644 --- a/src/osgDB/FileUtils.cpp +++ b/src/osgDB/FileUtils.cpp @@ -448,7 +448,7 @@ std::string osgDB::findFileInDirectory(const std::string& fileName,const std::st #elif defined(__APPLE__) // #define COMPILE_COCOA_VERSION - // #define COMPILE_CARBON_VERSION + #define COMPILE_CARBON_VERSION // The Cocoa version is about 10 lines of code. diff --git a/src/osgDB/GNUmakefile b/src/osgDB/GNUmakefile index f2ecdae3c..1fefc9b91 100644 --- a/src/osgDB/GNUmakefile +++ b/src/osgDB/GNUmakefile @@ -22,6 +22,11 @@ CXXFILES =\ LIBS += -losg $(OTHER_LIBS) $(DYNAMICLIBRARYLIB) + +ifeq ($(OS),Darwin) +LIBS += ${CARBON_LIB} +endif + DEF += -DOSGDB_LIBRARY TARGET_BASENAME = osgDB