From 4371d2268299b52bbe7bce5594cadce564004ab2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 24 Apr 2007 12:59:23 +0000 Subject: [PATCH] Added compile path support for XINE, Inventor and LibXML --- src/osgDB/CMakeLists.txt | 14 ++++++++++++++ src/osgDB/Registry.cpp | 7 +++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/osgDB/CMakeLists.txt b/src/osgDB/CMakeLists.txt index 6e0252067..bc9ee8ea7 100644 --- a/src/osgDB/CMakeLists.txt +++ b/src/osgDB/CMakeLists.txt @@ -57,8 +57,22 @@ ADD_LIBRARY(${LIB_NAME} IF(APPLE) # Needs CoreFoundation calls and a Carbon function SET(OSGDB_PLATFORM_SPECIFIC_LIBRARIES ${CARBON_LIBRARY}) + ADD_DEFINITIONS(-DDARWIN_QUICKTIME) ENDIF(APPLE) +IF(XINE_FOUND) + ADD_DEFINITIONS(-DUSE_XINE) +ENDIF(XINE_FOUND) + +IF(INVENTOR_FOUND) + ADD_DEFINITIONS(-DUSE_INVENTOR) +ENDIF(INVENTOR_FOUND) + +IF(VRML_FOUND) + ADD_DEFINITIONS(-DUSE_VRML) +ENDIF(VRML_FOUND) + + LINK_INTERNAL(${LIB_NAME} osg ) diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp index ca1a31aa1..2f71644b9 100644 --- a/src/osgDB/Registry.cpp +++ b/src/osgDB/Registry.cpp @@ -209,8 +209,11 @@ Registry::Registry() //addFileExtensionAlias("geo", "lwo"); addFileExtensionAlias("lw", "lwo"); - // addFileExtensionAlias("wrl", "iv"); - addFileExtensionAlias("wrl", "vrml"); + #if defined(USE_VRML) + addFileExtensionAlias("wrl", "vrml"); + #elif defined(USE_INVENTOR) + addFileExtensionAlias("wrl", "iv"); + #endif // add alias for the text/freetype plugin. addFileExtensionAlias("ttf", "freetype"); // true type