From 9a8652252ae1db0e7bb916b00cdfd7dc95f77ba6 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 22 Dec 2008 07:19:43 +0000 Subject: [PATCH] Add FCollada --- dtool/LocalSetup.pp | 8 ++++++++ dtool/Package.pp | 4 ++++ dtool/pptempl/Global.pp | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp index c97bac3195..13d37fdd65 100644 --- a/dtool/LocalSetup.pp +++ b/dtool/LocalSetup.pp @@ -146,6 +146,11 @@ #else #print - Did not find OpenMaya #endif +#if $[HAVE_FCOLLADA] +#print + FCollada +#else +#print - Did not find FCollada +#endif #print #if $[and $[HAVE_INTERROGATE],$[HAVE_PYTHON]] @@ -204,6 +209,9 @@ $[cdefine MAYA_PRE_5_0] /* Define if we have SoftImage available. */ $[cdefine HAVE_SOFTIMAGE] +/* Define if we have FCollada available. */ +$[cdefine HAVE_FCOLLADA] + /* Define if we have OpenSSL installed. */ $[cdefine HAVE_OPENSSL] $[cdefine OPENSSL_097] diff --git a/dtool/Package.pp b/dtool/Package.pp index c8e1dc153e..7d71615476 100644 --- a/dtool/Package.pp +++ b/dtool/Package.pp @@ -272,6 +272,10 @@ #set SOFTIMAGE_LOCATION $[unixfilename $[SOFTIMAGE_LOCATION]] #set HAVE_SOFTIMAGE $[HAVE_SOFTIMAGE] +#set FCOLLADA_IPATH $[unixfilename $[FCOLLADA_IPATH]] +#set FCOLLADA_LPATH $[unixfilename $[FCOLLADA_LPATH]] +#set FCOLLADA_LIBS $[FCOLLADA_LIBS] +#set HAVE_FCOLLADA $[HAVE_FCOLLADA] // Now infer a few more variables based on what was defined. #if $[and $[HAVE_GTK],$[PKG_CONFIG]] diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp index 7f4ccd711c..fc442b177a 100644 --- a/dtool/pptempl/Global.pp +++ b/dtool/pptempl/Global.pp @@ -365,6 +365,12 @@ #define chromium_libs $[CHROMIUM_LIBS] #endif +#if $[HAVE_FCOLLADA] + #define fcollada_ipath $[wildcard $[FCOLLADA_IPATH]] + #define fcollada_lpath $[wildcard $[FCOLLADA_LPATH]] + #define fcollada_libs $[FCOLLADA_LIBS] +#endif + // We define these two variables true here in the global scope; a // particular Sources.pp file can redefine these to be false to // prevent a particular directory or target from being built in