From 78b0e9b62711332408054e442c2559a42b98f51e Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 27 Jul 2011 18:19:56 +0000 Subject: [PATCH] bam-info wants to link with speedtree if available --- pandatool/src/bam/Sources.pp | 3 ++- pandatool/src/bam/bamInfo.cxx | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pandatool/src/bam/Sources.pp b/pandatool/src/bam/Sources.pp index b794d32056..b1c14a5c2e 100644 --- a/pandatool/src/bam/Sources.pp +++ b/pandatool/src/bam/Sources.pp @@ -1,4 +1,4 @@ -#define USE_PACKAGES fftw cg +#define USE_PACKAGES fftw cg speedtree #define OTHER_LIBS \ egg2pg:c egg:c pandaegg:m \ pipeline:c recorder:c parametrics:c collide:c chan:c char:c \ @@ -11,6 +11,7 @@ $[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] \ $[if $[HAVE_AUDIO],audio:c] \ panda:m \ + $[if $[HAVE_SPEEDTREE],pandaspeedtree] \ pandabase:c express:c pandaexpress:m \ interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c \ dtoolconfig:m dtool:m pystub diff --git a/pandatool/src/bam/bamInfo.cxx b/pandatool/src/bam/bamInfo.cxx index 6f128f23e0..ee9cdae4ce 100644 --- a/pandatool/src/bam/bamInfo.cxx +++ b/pandatool/src/bam/bamInfo.cxx @@ -27,6 +27,10 @@ #include "bamCacheIndex.h" #include "pystub.h" +#ifdef HAVE_SPEEDTREE +#include "config_speedtree.h" +#endif + //////////////////////////////////////////////////////////////////// // Function: BamInfo::Constructor // Access: Public @@ -340,6 +344,10 @@ int main(int argc, char *argv[]) { // A call to pystub() to force libpystub.so to be linked in. pystub(); +#ifdef HAVE_SPEEDTREE + init_libspeedtree(); +#endif + BamInfo prog; prog.parse_command_line(argc, argv); prog.run();