Browse Source

Add COLLADA DOM library

rdb 14 years ago
parent
commit
e24397f494
4 changed files with 22 additions and 0 deletions
  1. 6 0
      dtool/Config.pp
  2. 5 0
      dtool/LocalSetup.pp
  3. 5 0
      dtool/Package.pp
  4. 6 0
      dtool/pptempl/Global.pp

+ 6 - 0
dtool/Config.pp

@@ -1053,6 +1053,12 @@
 #define FCOLLADA_LIBS FColladaSD
 #define FCOLLADA_LIBS FColladaSD
 #defer HAVE_FCOLLADA $[libtest $[FCOLLADA_LPATH],$[FCOLLADA_LIBS]]
 #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
 // Also for the ARToolKit library, for augmented reality
 #define ARTOOLKIT_IPATH
 #define ARTOOLKIT_IPATH
 #define ARTOOLKIT_LPATH
 #define ARTOOLKIT_LPATH

+ 5 - 0
dtool/LocalSetup.pp

@@ -205,6 +205,11 @@
 #else
 #else
 #print - Did not find FCollada
 #print - Did not find FCollada
 #endif
 #endif
+#if $[HAVE_COLLADADOM]
+#print + COLLADA DOM
+#else
+#print - Did not find COLLADA DOM
+#endif
 #if $[HAVE_ARTOOLKIT]
 #if $[HAVE_ARTOOLKIT]
 #print + ARToolKit
 #print + ARToolKit
 #else
 #else

+ 5 - 0
dtool/Package.pp

@@ -359,6 +359,11 @@
 #set FCOLLADA_LIBS $[FCOLLADA_LIBS]
 #set FCOLLADA_LIBS $[FCOLLADA_LIBS]
 #set HAVE_FCOLLADA $[HAVE_FCOLLADA]
 #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_IPATH $[unixfilename $[ARTOOLKIT_IPATH]]
 #set ARTOOLKIT_LPATH $[unixfilename $[ARTOOLKIT_LPATH]]
 #set ARTOOLKIT_LPATH $[unixfilename $[ARTOOLKIT_LPATH]]
 #set ARTOOLKIT_LIBS $[ARTOOLKIT_LIBS]
 #set ARTOOLKIT_LIBS $[ARTOOLKIT_LIBS]

+ 6 - 0
dtool/pptempl/Global.pp

@@ -479,6 +479,12 @@
   #define fcollada_libs $[FCOLLADA_LIBS]
   #define fcollada_libs $[FCOLLADA_LIBS]
 #endif
 #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]
 #if $[HAVE_ARTOOLKIT]
   #define artoolkit_ipath $[wildcard $[ARTOOLKIT_IPATH]]
   #define artoolkit_ipath $[wildcard $[ARTOOLKIT_IPATH]]
   #define artoolkit_lpath $[wildcard $[ARTOOLKIT_LPATH]]
   #define artoolkit_lpath $[wildcard $[ARTOOLKIT_LPATH]]