From e24397f49409d06d5b032485faabf6e68a598f5e Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Mon, 4 Apr 2011 19:24:10 +0000
Subject: [PATCH] Add COLLADA DOM library

---
 dtool/Config.pp         | 6 ++++++
 dtool/LocalSetup.pp     | 5 +++++
 dtool/Package.pp        | 5 +++++
 dtool/pptempl/Global.pp | 6 ++++++
 4 files changed, 22 insertions(+)

diff --git a/dtool/Config.pp b/dtool/Config.pp
index 2c5b36425b..5aaa67f2aa 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -1053,6 +1053,12 @@
 #define FCOLLADA_LIBS FColladaSD
 #defer HAVE_FCOLLADA $[libtest $[FCOLLADA_LPATH],$[FCOLLADA_LIBS]]
 
+// Is the COLLADA DOM installed? This is for the native COLLADA loader.
+#define COLLADADOM_IPATH /usr/local/include/collada-dom /usr/local/include/collada-dom/1.5
+#define COLLADADOM_LPATH /usr/local/lib
+#define COLLADADOM_LIBS collada15dom xml2 boost_filesystem
+#defer HAVE_COLLADADOM $[libtest $[COLLADADOM_LPATH],$[COLLADADOM_LIBS]]
+
 // Also for the ARToolKit library, for augmented reality
 #define ARTOOLKIT_IPATH
 #define ARTOOLKIT_LPATH
diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp
index 8998d2108e..64fede0331 100644
--- a/dtool/LocalSetup.pp
+++ b/dtool/LocalSetup.pp
@@ -205,6 +205,11 @@
 #else
 #print - Did not find FCollada
 #endif
+#if $[HAVE_COLLADADOM]
+#print + COLLADA DOM
+#else
+#print - Did not find COLLADA DOM
+#endif
 #if $[HAVE_ARTOOLKIT]
 #print + ARToolKit
 #else
diff --git a/dtool/Package.pp b/dtool/Package.pp
index 27f21b2468..c06eaf476e 100644
--- a/dtool/Package.pp
+++ b/dtool/Package.pp
@@ -359,6 +359,11 @@
 #set FCOLLADA_LIBS $[FCOLLADA_LIBS]
 #set HAVE_FCOLLADA $[HAVE_FCOLLADA]
 
+#set COLLADADOM_IPATH $[unixfilename $[COLLADADOM_IPATH]]
+#set COLLADADOM_LPATH $[unixfilename $[COLLADADOM_LPATH]]
+#set COLLADADOM_LIBS $[COLLADADOM_LIBS]
+#set HAVE_COLLADADOM $[HAVE_COLLADADOM]
+
 #set ARTOOLKIT_IPATH $[unixfilename $[ARTOOLKIT_IPATH]]
 #set ARTOOLKIT_LPATH $[unixfilename $[ARTOOLKIT_LPATH]]
 #set ARTOOLKIT_LIBS $[ARTOOLKIT_LIBS]
diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp
index 4d411af6d8..96edc973d1 100644
--- a/dtool/pptempl/Global.pp
+++ b/dtool/pptempl/Global.pp
@@ -479,6 +479,12 @@
   #define fcollada_libs $[FCOLLADA_LIBS]
 #endif
 
+#if $[HAVE_COLLADADOM]
+  #define colladadom_ipath $[wildcard $[COLLADADOM_IPATH]]
+  #define colladadom_lpath $[wildcard $[COLLADADOM_LPATH]]
+  #define colladadom_libs $[COLLADADOM_LIBS]
+#endif
+
 #if $[HAVE_ARTOOLKIT]
   #define artoolkit_ipath $[wildcard $[ARTOOLKIT_IPATH]]
   #define artoolkit_lpath $[wildcard $[ARTOOLKIT_LPATH]]