소스 검색

let's not link with speedtree after all

David Rose 14 년 전
부모
커밋
69738d7975
2개의 변경된 파일1개의 추가작업 그리고 10개의 파일을 삭제
  1. 1 2
      pandatool/src/bam/Sources.pp
  2. 0 8
      pandatool/src/bam/bamInfo.cxx

+ 1 - 2
pandatool/src/bam/Sources.pp

@@ -1,4 +1,4 @@
-#define USE_PACKAGES fftw cg speedtree
+#define USE_PACKAGES fftw cg
 #define OTHER_LIBS \
   egg2pg:c egg:c pandaegg:m \
   pipeline:c recorder:c parametrics:c collide:c chan:c char:c \
@@ -11,7 +11,6 @@
   $[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

+ 0 - 8
pandatool/src/bam/bamInfo.cxx

@@ -27,10 +27,6 @@
 #include "bamCacheIndex.h"
 #include "pystub.h"
 
-#ifdef HAVE_SPEEDTREE
-#include "config_speedtree.h"
-#endif
-
 ////////////////////////////////////////////////////////////////////
 //     Function: BamInfo::Constructor
 //       Access: Public
@@ -344,10 +340,6 @@ 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();