TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

bam-info wants to link with speedtree if available

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandatool/src/bam/Sources.pp
View File

@ -1,4 +1,4 @@
#define USE_PACKAGES fftw cg #define USE_PACKAGES fftw cg speedtree
#define OTHER_LIBS \ #define OTHER_LIBS \
egg2pg:c egg:c pandaegg:m \ egg2pg:c egg:c pandaegg:m \
pipeline:c recorder:c parametrics:c collide:c chan:c char:c \ 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_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] \
$[if $[HAVE_AUDIO],audio:c] \ $[if $[HAVE_AUDIO],audio:c] \
panda:m \ panda:m \
$[if $[HAVE_SPEEDTREE],pandaspeedtree] \
pandabase:c express:c pandaexpress:m \ pandabase:c express:c pandaexpress:m \
interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c \ interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c \
dtoolconfig:m dtool:m pystub dtoolconfig:m dtool:m pystub

8
pandatool/src/bam/bamInfo.cxx
View File

@ -27,6 +27,10 @@
#include "bamCacheIndex.h" #include "bamCacheIndex.h"
#include "pystub.h" #include "pystub.h"
#ifdef HAVE_SPEEDTREE
#include "config_speedtree.h"
#endif
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: BamInfo::Constructor // Function: BamInfo::Constructor
// Access: Public // Access: Public
@ -340,6 +344,10 @@ int main(int argc, char *argv[]) {
// A call to pystub() to force libpystub.so to be linked in. // A call to pystub() to force libpystub.so to be linked in.
pystub(); pystub();
#ifdef HAVE_SPEEDTREE
init_libspeedtree();
#endif
BamInfo prog; BamInfo prog;
prog.parse_command_line(argc, argv); prog.parse_command_line(argc, argv);
prog.run(); prog.run();