Browse Source

oops, pnmtext requires freetype

David Rose 17 years ago
parent
commit
cfbbd6338f

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

@@ -5,8 +5,9 @@
   dgraph:c downloader:c recorder:c \
   pnmimagetypes:c pnmimage:c pgraph:c gobj:c putil:c \
   lerp:c mathutil:c linmath:c event:c pstatclient:c \
-  gsgbase:c grutil:c display:c text:c cull:c pnmtext:c \
+  gsgbase:c grutil:c display:c text:c cull:c 
   tform:c device:c movies:c \
+  $[if $[HAVE_FREETYPE],pnmtext:c] \
   $[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] \
   $[if $[HAVE_AUDIO],audio:c] \
   panda:m \

+ 2 - 1
pandatool/src/egg-mkfont/Sources.pp

@@ -6,10 +6,11 @@
   palettizer eggbase progbase
 #define OTHER_LIBS \
   egg:c pandaegg:m \
-  display:c pnmtext:c pnmimagetypes:c pnmimage:c \
+  display:c pnmimagetypes:c pnmimage:c \
   linmath:c putil:c pgraph:c pipeline:c cull:c \
   gsgbase:c gobj:c event:c mathutil:c pstatclient:c \
   lerp:c \
+  $[if $[HAVE_FREETYPE],pnmtext:c] \
   $[if $[HAVE_NET],net:c] \
   panda:m \
   downloader:c pandabase:c express:c pandaexpress:m \

+ 2 - 1
pandatool/src/egg-qtess/Sources.pp

@@ -8,10 +8,11 @@
     egg2pg:c egg:c pandaegg:m \
     chan:c char:c downloader:c event:c lerp:c \
     tform:c grutil:c text:c dgraph:c display:c gsgbase:c \
-    collide:c gobj:c cull:c device:c pnmtext:c \
+    collide:c gobj:c cull:c device:c \
     parametrics:c pgraph:c pipeline:c pstatclient:c chan:c \
     pnmimagetypes:c pnmimage:c mathutil:c linmath:c putil:c \
     movies:c \
+    $[if $[HAVE_FREETYPE],pnmtext:c] \
     $[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] \
     $[if $[HAVE_AUDIO],audio:c] \
     panda:m \

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

@@ -167,7 +167,8 @@
     event:c gobj:c chan:c pgraph:c parametrics:c char:c prc:c dtoolutil:c \
     interrogatedb:c dtoolbase:c collide:c pnmimage:c dgraph:c tform:c \
     pipeline:c pstatclient:c grutil:c gsgbase:c net:c lerp:c display:c \
-    cull:c text:c nativenet:c pnmtext:c movies:c audio:c
+    cull:c text:c nativenet:c movies:c audio:c \
+    $[if $[HAVE_FREETYPE],pnmtext:c]
 
   #define SOURCES \
     config_mayaloader.cxx

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

@@ -12,8 +12,9 @@
     gobj:c chan:c parametrics:c pgraph:c \
     pnmimage:c grutil:c collide:c tform:c text:c \
     char:c dgraph:c display:c device:c cull:c \
-    downloader:c pipeline:c pnmtext:c \
+    downloader:c pipeline:c \
     event:c gsgbase:c lerp:c movies:c \
+    $[if $[HAVE_FREETYPE],pnmtext:c] \
     $[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] \
     $[if $[HAVE_AUDIO],audio:c] \
     panda:m \