Added usage of carbon pathway in appendPlatformSpecificLibraryFilePaths.

2004-09-02 10:01:24 +00:00 · 2004-09-02 10:01:24 +00:00 · 506c5a6743
commit 506c5a6743
parent 452cfa7744
2 changed files with 6 additions and 1 deletions
--- 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.
--- 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