build on OSX

pandatool/src/bam/Sources.pp

@@ -1,18 +1,21 @@
 #define USE_PACKAGES fftw
+#define OTHER_LIBS \
+  egg2pg:c egg:c pandaegg:m \
+  pipeline:c recorder:c parametrics:c collide:c chan:c char:c \
+  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 \
+  tform:c device:c $[if $[HAVE_NET],net:c] \
+  panda:m \
+  pandabase:c express:c pandaexpress:m \
+  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c \
+  dtoolconfig:m dtool:m pystub
 
 #begin bin_target
   #define TARGET bam-info
   #define LOCAL_LIBS \
     progbase
-  #define OTHER_LIBS \
-    recorder:c parametrics:c collide:c chan:c char:c \
-    dgraph:c downloader:c egg:c \
-    pnmimagetypes:c pnmimage:c pgraph:c gobj:c putil:c \
-    lerp:c mathutil:c linmath:c event:c express:c \
-    pandaegg:m panda:m pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-  #define UNIX_SYS_LIBS \
-    m
 
   #define SOURCES \
     bamInfo.cxx bamInfo.h
@@ -24,16 +27,6 @@
   #define TARGET egg2bam
   #define LOCAL_LIBS \
     eggbase progbase
-  #define OTHER_LIBS \
-    collide:c chan:c char:c display:c downloader:c \
-    dgraph:c egg2pg:c egg:c event:c express:c \
-    grutil:c gobj:c gsgbase:c lerp:c linmath:c mathutil:c \
-    pgraph:c parametrics:c pnmimagetypes:c pnmimage:c putil:c \
-    text:c tform:c \
-    pandaegg:m panda:m pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-  #define UNIX_SYS_LIBS \
-    m
 
   #define SOURCES \
     eggToBam.cxx eggToBam.h
@@ -44,15 +37,6 @@
   #define TARGET bam2egg
   #define LOCAL_LIBS \
     converter eggbase progbase
-  #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    pgraph:c parametrics:c collide:c chan:c char:c \
-    downloader:c mathutil:c \
-    gobj:c lerp:c pnmimagetypes:c pnmimage:c pstatclient:c \
-    putil:c linmath:c event:c express:c panda:m pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-  #define UNIX_SYS_LIBS \
-    m
 
   #define SOURCES \
     bamToEgg.cxx bamToEgg.h

pandatool/src/converter/Sources.pp

@@ -1,11 +1,13 @@
+#define OTHER_LIBS \
+  egg:c pandaegg:m \
+  pipeline:c event:c panda:m \
+  mathutil:c linmath:c putil:c express:c pandabase:c \
+  interrogatedb:c prc:c dconfig:c dtoolconfig:m \
+  dtoolutil:c dtoolbase:c dtool:m
+
 #begin ss_lib_target
   #define TARGET converter
   #define LOCAL_LIBS pandatoolbase
-  #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    mathutil:c linmath:c putil:c express:c panda:m \
-    interrogatedb:c prc:c dconfig:c dtoolconfig:m \
-    dtoolutil:c dtoolbase:c dtool:m
   #define UNIX_SYS_LIBS \
     m
 

pandatool/src/cvscopy/Sources.pp

@@ -4,8 +4,11 @@
     progbase pandatoolbase
 
   #define OTHER_LIBS \
-    express:c dtoolutil:c dtoolbase:c pnmimagetypes:c pnmimage:c putil:c \
-    linmath:c panda:m prc:c dconfig:c dtool:m pystub
+    pipeline:c pnmimagetypes:c pnmimage:c putil:c linmath:c \
+    event:c \
+    panda:m \
+    pandabase:c express:c pandaexpress:m \
+    dtoolutil:c dtoolbase:c prc:c dconfig:c interrogatedb:c dtool:m
 
   #define COMBINED_SOURCES $[TARGET]_composite1.cxx 
     

pandatool/src/dxf/Sources.pp

@@ -3,9 +3,10 @@
   #define LOCAL_LIBS pandatoolbase
 
   #define OTHER_LIBS \
-    mathutil:c linmath:c panda:m \
-    dtoolbase:c dtool:m
-  #define UNIX_SYS_LIBS m
+    pipeline:c event:c putil:c mathutil:c linmath:c \
+    panda:m \
+    pandabase:c express:c pandaexpress:m \
+    dtoolutil:c dconfig:c prc:c interrogatedb:c dtoolbase:c dtool:m
   
   #define SOURCES \
     dxfFile.cxx dxfFile.h dxfLayer.h dxfLayer.cxx \

pandatool/src/dxfegg/Sources.pp

@@ -2,10 +2,13 @@
   #define TARGET dxfegg
   #define LOCAL_LIBS converter dxf pandatoolbase
   #define OTHER_LIBS \
-    egg:c event:c pandaegg:m \
-    mathutil:c linmath:c putil:c express:c panda:m \
+    egg:c pandaegg:m \
+    pandabase:c express:c pandaexpress:m \
+    pipeline:c mathutil:c linmath:c putil:c event:c \
+    panda:m \
     interrogatedb:c prc:c dconfig:c dtoolconfig:m \
     dtoolutil:c dtoolbase:c dtool:m
+
   #define UNIX_SYS_LIBS \
     m
 

pandatool/src/dxfprogs/Sources.pp

@@ -1,14 +1,17 @@
 #define UNIX_SYS_LIBS m
 #define USE_PACKAGES fftw
 
+#define OTHER_LIBS \
+  egg:c pandaegg:m \
+  pipeline:c pnmimage:c putil:c event:c mathutil:c linmath:c panda:m \
+  pandabase:c express:c pandaexpress:m \
+  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+
+
 #begin bin_target
   #define TARGET dxf-points
   #define LOCAL_LIBS \
     progbase dxf
-  #define OTHER_LIBS \
-    linmath:c panda:m \
-    express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     dxfPoints.cxx dxfPoints.h
@@ -19,12 +22,6 @@
   #define TARGET dxf2egg
   #define LOCAL_LIBS dxf dxfegg eggbase progbase
 
-  #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    linmath:c pnmimagetypes:c pnmimage:c putil:c mathutil:c event:c panda:m \
-    express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-
   #define SOURCES \
     dxfToEgg.cxx dxfToEgg.h
 
@@ -34,12 +31,6 @@
   #define TARGET egg2dxf
   #define LOCAL_LIBS dxf eggbase progbase
 
-  #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    putil:c event:c linmath:c pnmimagetypes:c pnmimage:c mathutil:c panda:m \
-    express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-
   #define SOURCES \
     eggToDXF.cxx eggToDXF.h \
     eggToDXFLayer.cxx eggToDXFLayer.h

pandatool/src/egg-mkfont/Sources.pp

@@ -5,9 +5,15 @@
 #define LOCAL_LIBS \
   palettizer eggbase progbase
 #define OTHER_LIBS \
+  egg:c pandaegg:m \
   display:c pnmtext:c pnmimagetypes:c pnmimage:c \
-  egg:c linmath:c putil:c express:c pandaegg:m panda:m pandaexpress:m \
-  dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+  linmath:c putil:c pgraph:c pipeline:c cull:c \
+  gsgbase:c gobj:c event:c mathutil:c pstatclient:c \
+  lerp:c \
+  $[if $[HAVE_NET],net:c] \
+  panda:m \
+  downloader:c pandabase:c express:c pandaexpress:m \
+  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
 #begin bin_target
   #define TARGET egg-mkfont

pandatool/src/egg-optchar/Sources.pp

@@ -1,9 +1,11 @@
 #define LOCAL_LIBS \
   eggcharbase converter eggbase progbase
 #define OTHER_LIBS \
-  egg:c event:c pandaegg:m \
-  pnmimagetypes:c pnmimage:c mathutil:c linmath:c putil:c panda:m \
-  express:c pandaexpress:m \
+  egg:c pandaegg:m \
+  event:c pipeline:c \
+  pnmimagetypes:c pnmimage:c mathutil:c linmath:c putil:c \
+  panda:m \
+  pandabase:c express:c pandaexpress:m \
   interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 #define UNIX_SYS_LIBS m
 

pandatool/src/egg-palettize/Sources.pp

@@ -1,14 +1,20 @@
+#define OTHER_LIBS \
+  egg:c pandaegg:m \
+  pgraph:c gobj:c lerp:c linmath:c putil:c \
+  pnmimage:c pnmimagetypes:c display:c pipeline:c \
+  event:c mathutil:c cull:c gsgbase:c pstatclient:c \
+  $[if $[HAVE_NET],net:c] \
+  panda:m \
+  pandabase:c express:c downloader:c pandaexpress:m \
+  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c \
+  dtoolconfig:m dtool:m 
+
 #begin bin_target
   #define TARGET egg-palettize
   #define LOCAL_LIBS \
     palettizer eggbase progbase
-  #define OTHER_LIBS \
-    egg:c pgraph:c downloader:c gobj:c lerp:c linmath:c putil:c \
-    express:c pnmimage:c pnmimagetypes:c \
-    event:c mathutil:c \
-    pandaegg:m panda:m pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-  #define UNIX_SYS_LIBS m
+
+  #define OTHER_LIBS $[OTHER_LIBS] pystub
   
   #define SOURCES \
      eggPalettize.h eggPalettize.cxx
@@ -20,12 +26,6 @@
   #define BUILDING_DLL BUILDING_MISC
   #define LOCAL_LIBS \
     palettizer
-  #define OTHER_LIBS \
-    egg:c pgraph:c downloader:c gobj:c lerp:c linmath:c putil:c \
-    express:c pnmimage:c pnmimagetypes:c \
-    event:c mathutil:c \
-    pandaegg:m panda:m pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     txaFileFilter.h txaFileFilter.I txaFileFilter.cxx

pandatool/src/egg-qtess/Sources.pp

@@ -3,11 +3,15 @@
   #define LOCAL_LIBS \
     eggbase progbase
   #define OTHER_LIBS \
-    chan:c char:c downloader:c egg2pg:c event:c lerp:c \
-    tform:c grutil:c text:c dgraph:c display:c gsgbase:c collide:c gobj:c \
-    parametrics:c pgraph:c egg:c pandaegg:m \
-    pnmimagetypes:c pnmimage:c mathutil:c linmath:c putil:c panda:m \
-    express:c pandaexpress:m \
+    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 \
+    parametrics:c pgraph:c pipeline:c pstatclient:c chan:c \
+    pnmimagetypes:c pnmimage:c mathutil:c linmath:c putil:c \
+    $[if $[HAVE_NET],net:c] \
+    panda:m \
+    pandabase:c express:c pandaexpress:m \
     interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
   #define UNIX_SYS_LIBS m
 

pandatool/src/eggbase/Sources.pp

@@ -3,9 +3,11 @@
   #define LOCAL_LIBS \
     progbase converter
   #define OTHER_LIBS \
-    egg:c linmath:c express:c putil:c pnmimage:c panda:m \
+    egg:c pandaegg:m \
+    pipeline:c event:c mathutil:c linmath:c putil:c pnmimage:c panda:m \
+    pandabase:c express:c pandaexpress:m \
     interrogatedb:c prc:c dconfig:c dtoolconfig:m \
-    dtoolutil:c dtoolbase:c dtool:m pystub
+    dtoolutil:c dtoolbase:c dtool:m
     
   #define COMBINED_SOURCES $[TARGET]_composite1.cxx     
 

pandatool/src/eggcharbase/Sources.pp

@@ -3,7 +3,11 @@
   #define LOCAL_LIBS \
     eggbase progbase
   #define OTHER_LIBS \
-    egg:c event:c express:c linmath:c mathutil:c pnmimage:c putil:c panda:m pystub \
+    egg:c pandaegg:m \
+    event:c linmath:c mathutil:c pnmimage:c putil:c \
+    pipeline:c \
+    panda:m \
+    pandabase:c express:c pandaexpress:m \
     interrogatedb:c prc:c dconfig:c dtooolconfig:m \
     dtoolutil:c dtoolbase:c dtool:m
   #define USE_PACKAGES zlib

pandatool/src/eggprogs/Sources.pp

@@ -1,9 +1,11 @@
 #define LOCAL_LIBS \
   converter eggbase progbase
 #define OTHER_LIBS \
-  egg:c event:c pandaegg:m \
-  pnmimagetypes:c pnmimage:c mathutil:c linmath:c putil:c panda:m \
-  express:c pandaexpress:m \
+  egg:c pandaegg:m \
+  event:c pipeline:c \
+  pnmimagetypes:c pnmimage:c mathutil:c linmath:c putil:c \
+  panda:m \
+  pandabase:c express:c pandaexpress:m \
   interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 #define UNIX_SYS_LIBS m
 

pandatool/src/flt/Sources.pp

@@ -4,7 +4,11 @@
   #define TARGET flt
   #define LOCAL_LIBS converter pandatoolbase
   #define OTHER_LIBS \
-    mathutil:c linmath:c putil:c event:c express:c panda:m \
+    egg:c pandaegg:m \
+    pipeline:c \
+    mathutil:c linmath:c putil:c event:c express:c \
+    panda:m \
+    pandabase:c pandaexpress:m \
     interrogatedb:c prc:c dconfig:c dtoolconfig:m \
     dtoolutil:c dtoolbase:c dtool:m
   #define UNIX_SYS_LIBS m

pandatool/src/fltegg/Sources.pp

@@ -2,8 +2,10 @@
   #define TARGET fltegg
   #define LOCAL_LIBS converter flt pandatoolbase
   #define OTHER_LIBS \
-    egg:c event:c pandaegg:m \
-    mathutil:c linmath:c putil:c express:c panda:m \
+    egg:c pandaegg:m \
+    mathutil:c linmath:c putil:c event:c pipeline:c \
+    panda:m \
+    pandabase:c express:c pandaexpress:m \
     interrogatedb:c prc:c dconfig:c dtoolconfig:m \
     dtoolutil:c dtoolbase:c dtool:m
   #define UNIX_SYS_LIBS \

pandatool/src/fltprogs/Sources.pp

@@ -1,16 +1,17 @@
 #define UNIX_SYS_LIBS m
 
+#define OTHER_LIBS \
+  egg:c pandaegg:m \
+  linmath:c pnmimagetypes:c pnmimage:c event:c \
+  putil:c mathutil:c pipeline:c \
+  panda:m \
+  pandabase:c express:c pandaexpress:m \
+  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+
 #begin bin_target
   #define TARGET fltcopy
   #define LOCAL_LIBS cvscopy flt
 
-  #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    linmath:c pnmimagetypes:c pnmimage:c event:c \
-    putil:c mathutil:c panda:m \
-    express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-
   #define SOURCES \
     fltCopy.cxx fltCopy.h
 
@@ -20,11 +21,6 @@
   #define TARGET flt-trans
   #define LOCAL_LIBS \
     progbase flt
-  #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    linmath:c pnmimagetypes:c pnmimage:c putil:c event:c mathutil:c panda:m \
-    express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     fltTrans.cxx fltTrans.h
@@ -35,12 +31,6 @@
   #define TARGET flt-info
   #define LOCAL_LIBS \
     progbase flt
-  #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    event:c linmath:c mathutil:c \
-    pnmimagetypes:c pnmimage:c putil:c panda:m \
-    express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     fltInfo.cxx fltInfo.h
@@ -51,12 +41,6 @@
   #define TARGET flt2egg
   #define LOCAL_LIBS flt fltegg eggbase progbase
 
-  #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    linmath:c pnmimagetypes:c pnmimage:c putil:c mathutil:c event:c panda:m \
-    express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-
   #define SOURCES \
     fltToEgg.cxx fltToEgg.h
 
@@ -66,12 +50,6 @@
   #define TARGET egg2flt
   #define LOCAL_LIBS flt eggbase progbase
 
-  #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    putil:c event:c linmath:c pnmimagetypes:c pnmimage:c mathutil:c panda:m \
-    express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-
   #define SOURCES \
     eggToFlt.cxx eggToFlt.h
 

pandatool/src/imagebase/Sources.pp

@@ -3,9 +3,9 @@
   #define LOCAL_LIBS \
     progbase
   #define OTHER_LIBS \
-    pnmimage:c panda:m \
-    pystub \
-    express:c linmath:c putil:c \
+    linmath:c putil:c pnmimage:c pipeline:c event:c \
+    panda:m \
+    pandabase:c express:c pandaexpress:m \
     interrogatedb:c prc:c dconfig:c dtoolconfig:m \
     dtoolutil:c dtoolbase:c dtool:m
 

pandatool/src/imageprogs/Sources.pp

@@ -2,12 +2,11 @@
   imagebase progbase
 #define OTHER_LIBS \
   egg:c pandaegg:m \
-  linmath:c \
-  pnmimagetypes:c pnmimage:c putil:c express:c panda:m \
-  pandaexpress:m \
-  dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-#define UNIX_SYS_LIBS \
-  m
+  linmath:c event:c pipeline:c mathutil:c \
+  pnmimagetypes:c pnmimage:c putil:c express:c \
+  panda:m \
+  pandabase:c pandaexpress:m \
+  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
 #begin bin_target
   #define TARGET image-trans

pandatool/src/lwo/Sources.pp

@@ -1,6 +1,8 @@
 #define LOCAL_LIBS pandatoolbase
 #define OTHER_LIBS \
-  mathutil:c linmath:c putil:c express:c panda:m pandaexpress:m \
+  mathutil:c linmath:c putil:c pipeline:c event:c \
+  panda:m \
+  pandabase:c express:c pandaexpress:m \
   interrogatedb:c prc:c dconfig:c dtoolconfig:m \
   dtoolutil:c dtoolbase:c dtool:m
 #define UNIX_SYS_LIBS m

pandatool/src/lwoegg/Sources.pp

@@ -3,7 +3,9 @@
   #define LOCAL_LIBS converter lwo pandatoolbase
   #define OTHER_LIBS \
     egg:c pandaegg:m \
-    mathutil:c linmath:c putil:c express:c panda:m \
+    mathutil:c linmath:c putil:c pipeline:c event:c \
+    panda:m \
+    pandabase:c express:c pandaexpress:m \
     interrogatedb:c prc:c dconfig:c dtoolconfig:m \
     dtoolutil:c dtoolbase:c dtool:m
   #define UNIX_SYS_LIBS m

pandatool/src/lwoprogs/Sources.pp

@@ -1,15 +1,15 @@
+#define OTHER_LIBS \
+  egg:c pandaegg:m \
+  linmath:c mathutil:c pipeline:c event:c \
+  pnmimagetypes:c pnmimage:c putil:c \
+  panda:m \
+  pandabase:c express:c pandaexpress:m \
+  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+
 #begin bin_target
   #define TARGET lwo2egg
   #define LOCAL_LIBS lwo lwoegg eggbase progbase
 
-  #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    linmath:c \
-    pnmimagetypes:c pnmimage:c \
-    putil:c panda:m \
-    express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-
   #define SOURCES \
     lwoToEgg.cxx lwoToEgg.h
 
@@ -19,12 +19,6 @@
   #define TARGET lwo-scan
   #define LOCAL_LIBS lwo progbase
 
-  #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    linmath:c pnmimagetypes:c pnmimage:c putil:c panda:m \
-    express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-
   #define SOURCES \
     lwoScan.cxx lwoScan.h
 

pandatool/src/miscprogs/Sources.pp

@@ -1,10 +1,10 @@
 #define LOCAL_LIBS \
   progbase
 #define OTHER_LIBS \
-  pnmimage:c linmath:c \
-  putil:c panda:m \
-  express:c pandaexpress:m \
-  dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+  pnmimage:c linmath:c pipeline:c event:c putil:c \
+  panda:m \
+  pandabase:c express:c pandaexpress:m \
+  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 #define UNIX_SYS_LIBS m
 
 #begin bin_target

pandatool/src/palettizer/Sources.pp

@@ -3,10 +3,14 @@
   #define LOCAL_LIBS \
     pandatoolbase
   #define OTHER_LIBS \
-    egg:c display:c pgraph:c linmath:c putil:c express:c pnmimage:c pnmimagetypes:c \
-    event:c mathutil:c \
-    pandaegg:m panda:m pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m
+    egg:c pandaegg:m \
+    display:c pgraph:c linmath:c putil:c pnmimage:c \
+    pnmimagetypes:c pipeline:c cull:c gsgbase:c gobj:c \
+    event:c mathutil:c pstatclient:c lerp:c \
+    $[if $[HAVE_NET],net:c] \
+    panda:m \
+    pandabase:c express:c downloader:c pandaexpress:m \
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m
   
   #define COMBINED_SOURCES $[TARGET]_composite1.cxx     
 

pandatool/src/pandatoolbase/Sources.pp

@@ -1,5 +1,8 @@
-#define OTHER_LIBS interrogatedb:c prc:c dconfig:c dtoolconfig:m \
-                   dtoolutil:c dtoolbase:c dtool:m express:c putil:c
+#define OTHER_LIBS \
+   pipeline:c panda:m \
+   express:c putil:c pandabase:c pandaexpress:m \
+   interrogatedb:c prc:c dconfig:c dtoolconfig:m \
+   dtoolutil:c dtoolbase:c dtool:m
 
 #begin ss_lib_target
   #define TARGET pandatoolbase

pandatool/src/progbase/Sources.pp

@@ -5,7 +5,8 @@
   #define LOCAL_LIBS \
     pandatoolbase
   #define OTHER_LIBS \
-    pnmimage:c linmath:c putil:c express:c panda:m pystub \
+    pipeline:c event:c panda:m \
+    pandabase:c pnmimage:c linmath:c putil:c express:c \
     interrogatedb:c prc:c dconfig:c dtoolconfig:m \
     dtoolutil:c dtoolbase:c dtool:m
     
@@ -33,6 +34,7 @@
   #define TARGET test_prog
   #define LOCAL_LIBS \
     progbase
+  #define OTHER_LIBS pystub
 
   #define SOURCES \
     test_prog.cxx

pandatool/src/pstatserver/Sources.pp

@@ -4,9 +4,10 @@
   #define TARGET pstatserver
   #define LOCAL_LIBS pandatoolbase
   #define OTHER_LIBS \
-    pstatclient:c net:c putil:c express:c panda:m dtool
-  #define UNIX_SYS_LIBS \
-    m
+    pstatclient:c net:c putil:c pipeline:c \
+    panda:m \
+    pandabase:c express:c pandaexpress:m \
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m
 
   #define SOURCES \
     pStatClientData.cxx pStatClientData.h pStatGraph.I pStatGraph.cxx \

pandatool/src/ptloader/Sources.pp

@@ -6,13 +6,15 @@
     converter pandatoolbase
   #define OTHER_LIBS \
     egg2pg:c egg:c pandaegg:m \
-    mathutil:c linmath:c putil:c \
+    pstatclient:c mathutil:c linmath:c putil:c \
     gobj:c chan:c parametrics:c pgraph:c \
     pnmimage:c grutil:c collide:c tform:c text:c \
-    char:c dgraph:c display:c \
-    downloader:c \
-    event:c gsgbase:c lerp:c panda:m \
-    express:c pandaexpress:m \
+    char:c dgraph:c display:c device:c cull:c \
+    downloader:c pipeline:c pnmtext:c \
+    event:c gsgbase:c lerp:c \
+    $[if $[HAVE_NET],net:c] \
+    panda:m \
+    pandabase:c express:c pandaexpress:m \
     interrogatedb:c prc:c dconfig:c dtoolconfig:m \
     dtoolutil:c dtoolbase:c dtool:m
   #define UNIX_SYS_LIBS \

pandatool/src/softprogs/Sources.pp

@@ -5,9 +5,10 @@
   #define OTHER_LIBS \
     egg:c pandaegg:m \
     pnmimage:c putil:c \
-    linmath:c panda:m \
-    express:c pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+    linmath:c pipeline:c event:c \
+    panda:m \
+    pandabase:c express:c pandaexpress:m \
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     softCVS.cxx softCVS.h softFilename.cxx softFilename.h

pandatool/src/text-stats/Sources.pp

@@ -5,11 +5,12 @@
   #define LOCAL_LIBS \
     progbase pstatserver
   #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    pstatclient:c linmath:c putil:c express:c panda:m pandaexpress:m \
-    dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-  #define UNIX_SYS_LIBS \
-    m
+    pstatclient:c linmath:c putil:c pipeline:c event:c \
+    pnmimage:c mathutil:c \
+    $[if $[HAVE_NET],net:c] \
+    panda:m \
+    pandabase:c express:c pandaexpress:m \
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     textMonitor.cxx textMonitor.h textStats.cxx textStats.h

pandatool/src/vrml/Sources.pp

@@ -5,8 +5,10 @@
   #define LOCAL_LIBS \
     pandatoolbase
   #define OTHER_LIBS \
-    mathutil:c linmath:c panda:m \
-    dtoolbase:c dtool:m
+    mathutil:c linmath:c pipeline:c \
+    panda:m \
+    pandabase:c express:c pandaexpress:m \
+    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m
 
   #define USE_PACKAGES zlib
 

pandatool/src/vrmlegg/Sources.pp

@@ -2,8 +2,11 @@
   #define TARGET vrmlegg
   #define LOCAL_LIBS converter pvrml pandatoolbase
   #define OTHER_LIBS \
-    egg:c event:c pandaegg:m \
-    mathutil:c linmath:c putil:c express:c panda:m \
+    egg:c pandaegg:m \
+    mathutil:c linmath:c event:c putil:c express:c \
+    pipeline:c \
+    panda:m \
+    pandabase:c pandaexpress:m \
     interrogatedb:c prc:c dconfig:c dtoolconfig:m \
     dtoolutil:c dtoolbase:c dtool:m
 

pandatool/src/vrmlprogs/Sources.pp

@@ -1,13 +1,15 @@
+#define OTHER_LIBS \
+  egg:c pandaegg:m \
+  linmath:c pnmimagetypes:c pnmimage:c putil:c mathutil:c event:c \
+  pipeline:c \
+  panda:m \
+  pandabase:c express:c pandaexpress:m \
+  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+
 #begin bin_target
   #define TARGET vrml2egg
   #define LOCAL_LIBS pvrml vrmlegg eggbase progbase
 
-  #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    linmath:c pnmimagetypes:c pnmimage:c putil:c mathutil:c event:c panda:m \
-    express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-
   #define SOURCES \
     vrmlToEgg.cxx vrmlToEgg.h
 
@@ -17,11 +19,7 @@
   #define TARGET vrml-trans
   #define LOCAL_LIBS \
     progbase pvrml
-  #define OTHER_LIBS \
-    linmath:c panda:m \
-    express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
-
+a
   #define SOURCES \
     vrmlTrans.cxx vrmlTrans.h
 

pandatool/src/xfile/Sources.pp

@@ -8,7 +8,9 @@
   #define LOCAL_LIBS pandatoolbase
   #define OTHER_LIBS \
     mathutil:c linmath:c panda:m \
-    dtoolbase:c dtool:m
+    pandabase:c express:c pandaexpress:m \
+    interrogatedb:c prc:c dconfig:c dtoolconfig:m \
+    dtoolutil:c dtoolbase:c dtool:m
 
   #define USE_PACKAGES zlib
 

pandatool/src/xfileegg/Sources.pp

@@ -3,9 +3,12 @@
   #define LOCAL_LIBS xfile eggbase progbase pandatoolbase
   #define OTHER_LIBS \
     egg:c pandaegg:m \
-    mathutil:c linmath:c putil:c panda:m \
-    express:c pandaexpress:m \
-    dtoolconfig dtool pystub \
+    mathutil:c linmath:c putil:c pipeline:c event:c \
+    pnmimage:c \
+    panda:m \
+    pandabase:c express:c pandaexpress:m \
+    interrogatedb:c prc:c dconfig:c dtoolconfig:m \
+    dtoolutil:c dtoolbase:c dtool:m
     
   #define COMBINED_SOURCES $[TARGET]_composite1.cxx     
     

pandatool/src/xfileprogs/Sources.pp

@@ -1,11 +1,14 @@
+#define OTHER_LIBS \
+  egg:c pandaegg:m \
+  pipeline:c mathutil:c linmath:c putil:c \
+  event:c pnmimage:c \
+  panda:m \
+  pandabase:c express:c pandaexpress:m \
+  interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
+
 #begin bin_target
   #define TARGET egg2x
   #define LOCAL_LIBS xfileegg xfile eggbase progbase pandatoolbase
-  #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    mathutil:c linmath:c putil:c panda:m \
-    express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     eggToX.cxx eggToX.h
@@ -15,11 +18,6 @@
 #begin bin_target
   #define TARGET x2egg
   #define LOCAL_LIBS xfileegg xfile converter eggbase progbase pandatoolbase
-  #define OTHER_LIBS \
-    egg:c pandaegg:m \
-    mathutil:c linmath:c putil:c panda:m \
-    express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     xFileToEgg.cxx xFileToEgg.h
@@ -30,10 +28,6 @@
   #define TARGET x-trans
   #define LOCAL_LIBS \
     progbase xfile
-  #define OTHER_LIBS \
-    linmath:c panda:m \
-    express:c pandaexpress:m \
-    interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     xFileTrans.cxx xFileTrans.h