Browse Source

*** empty log message ***

David Rose 25 years ago
parent
commit
8f889510a6
2 changed files with 3 additions and 3 deletions
  1. 2 2
      dtool/pptempl/Template.models.pp
  2. 1 1
      pandatool/src/bam/Sources.pp

+ 2 - 2
dtool/pptempl/Template.models.pp

@@ -248,14 +248,14 @@ $[pt] :
     #define source $[pal_egg_dir]/$[egg]
     #define source $[pal_egg_dir]/$[egg]
     #define target $[bam_dir]/$[egg:%.egg=%.bam]
     #define target $[bam_dir]/$[egg:%.egg=%.bam]
 $[target] : $[source] $[bam_dir]/stamp
 $[target] : $[source] $[bam_dir]/stamp
-	egg2bam -kp -tp $[install_dir] -o $[target] $[source]
+	egg2bam -kp -tp $[install_dir] $[EGG2BAM_OPTS] -o $[target] $[source]
 
 
   #end egg
   #end egg
   #foreach egg $[UNPAL_SOURCES]
   #foreach egg $[UNPAL_SOURCES]
     #define source $[source_prefix]$[egg]
     #define source $[source_prefix]$[egg]
     #define target $[bam_dir]/$[egg:%.egg=%.bam]
     #define target $[bam_dir]/$[egg:%.egg=%.bam]
 $[target] : $[source] $[bam_dir]/stamp
 $[target] : $[source] $[bam_dir]/stamp
-	egg2bam -kp -tp $[install_dir] -o $[target] $[source]
+	egg2bam -kp -tp $[install_dir] $[EGG2BAM_OPTS] -o $[target] $[source]
 
 
   #end egg
   #end egg
 #end install_egg
 #end install_egg

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

@@ -22,7 +22,7 @@
     eggbase progbase
     eggbase progbase
   #define OTHER_LIBS \
   #define OTHER_LIBS \
     loader:c egg2sg:c builder:c egg:c pnmimagetypes:c gobj:c \
     loader:c egg2sg:c builder:c egg:c pnmimagetypes:c gobj:c \
-    graph:c putil:c \
+    chan:c graph:c putil:c \
     express:c pandaegg:m panda:m pandaexpress:m \
     express:c pandaegg:m panda:m pandaexpress:m \
     interrogatedb:c dtoolutil:c dconfig:c dtool:m pystub
     interrogatedb:c dtoolutil:c dconfig:c dtool:m pystub
   #define UNIX_SYS_LIBS \
   #define UNIX_SYS_LIBS \