bam-info wants to link with speedtree if available

This commit is contained in:
David Rose 2011-07-27 18:19:56 +00:00
parent 74557c5c72
commit 78b0e9b627
2 changed files with 10 additions and 1 deletions

View File

@ -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

View File

@ -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();