diff --git a/pandatool/src/bam/Sources.pp b/pandatool/src/bam/Sources.pp index 9f83a72c66..502742e397 100644 --- a/pandatool/src/bam/Sources.pp +++ b/pandatool/src/bam/Sources.pp @@ -4,8 +4,10 @@ progbase #define OTHER_LIBS \ recorder:c parametrics:c collide:c chan:c char:c \ - egg:c pnmimagetypes:c pgraph:c gobj:c \ - putil:c linmath:c event:c express:c pandaegg:m panda:m pandaexpress:m \ + 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 dconfig:c dtoolconfig:m dtool:m pystub #define UNIX_SYS_LIBS \ m @@ -13,8 +15,7 @@ #define SOURCES \ bamInfo.cxx bamInfo.h - #define INSTALL_HEADERS \ - + #define INSTALL_HEADERS #end bin_target #begin bin_target @@ -22,17 +23,18 @@ #define LOCAL_LIBS \ eggbase progbase #define OTHER_LIBS \ - dgraph:c \ - egg2pg:c builder:c egg:c pnmimagetypes:c \ - pgraph:c gobj:c chan:c putil:c linmath:c \ - event:c express:c pandaegg:m panda:m pandaexpress:m \ + builder:c 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 dconfig:c dtoolconfig:m dtool:m pystub #define UNIX_SYS_LIBS \ m #define SOURCES \ eggToBam.cxx eggToBam.h - #end bin_target @@ -43,14 +45,13 @@ #define OTHER_LIBS \ egg:c pandaegg:m \ pgraph:c parametrics:c collide:c chan:c char:c \ - gobj:c pnmimagetypes:c pstatclient: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 dconfig:c dtoolconfig:m dtool:m pystub - #define UNIX_SYS_LIBS \ m #define SOURCES \ bamToEgg.cxx bamToEgg.h - #end bin_target diff --git a/pandatool/src/converter/Sources.pp b/pandatool/src/converter/Sources.pp index 8310857d73..cd186d0689 100644 --- a/pandatool/src/converter/Sources.pp +++ b/pandatool/src/converter/Sources.pp @@ -3,7 +3,9 @@ #define LOCAL_LIBS pandatoolbase #define OTHER_LIBS \ egg:c pandaegg:m \ - mathutil:c linmath:c putil:c express:c panda:m dtoolconfig dtool + mathutil:c linmath:c putil:c express:c panda:m \ + interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define UNIX_SYS_LIBS \ m diff --git a/pandatool/src/cvscopy/Sources.pp b/pandatool/src/cvscopy/Sources.pp index 4d0bd69e76..095d33c7c0 100644 --- a/pandatool/src/cvscopy/Sources.pp +++ b/pandatool/src/cvscopy/Sources.pp @@ -4,6 +4,7 @@ progbase pandatoolbase #define OTHER_LIBS \ + express:c dtoolutil:c dtoolbase:c pnmimagetypes:c pnmimage:c putil:c \ linmath:c panda:m dconfig:c dtool:m pystub #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/egg-optchar/Sources.pp b/pandatool/src/egg-optchar/Sources.pp index f247d3b535..8da7da9e90 100644 --- a/pandatool/src/egg-optchar/Sources.pp +++ b/pandatool/src/egg-optchar/Sources.pp @@ -1,7 +1,7 @@ #define LOCAL_LIBS \ eggcharbase converter eggbase progbase #define OTHER_LIBS \ - egg:c pandaegg:m \ + egg:c event:c pandaegg:m \ pnmimagetypes:c pnmimage:c mathutil:c linmath:c putil:c panda:m \ express:c pandaexpress:m \ dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub diff --git a/pandatool/src/egg-palettize/Sources.pp b/pandatool/src/egg-palettize/Sources.pp index e04daf95e6..43c475922a 100644 --- a/pandatool/src/egg-palettize/Sources.pp +++ b/pandatool/src/egg-palettize/Sources.pp @@ -3,7 +3,8 @@ #define LOCAL_LIBS \ palettizer eggbase progbase #define OTHER_LIBS \ - egg:c pgraph:c linmath:c putil:c express:c pnmimage:c pnmimagetypes:c \ + 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 \ dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub diff --git a/pandatool/src/egg-qtess/Sources.pp b/pandatool/src/egg-qtess/Sources.pp index 13e040f093..56529797e4 100644 --- a/pandatool/src/egg-qtess/Sources.pp +++ b/pandatool/src/egg-qtess/Sources.pp @@ -3,7 +3,9 @@ #define LOCAL_LIBS \ eggbase progbase #define OTHER_LIBS \ - egg2pg:c event:c parametrics:c pgraph:c egg:c pandaegg:m \ + chan:c char:c downloader:c egg2pg:c event:c lerp:c builder: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 \ dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub diff --git a/pandatool/src/eggbase/Sources.pp b/pandatool/src/eggbase/Sources.pp index a7e6f04d4c..348e31cd41 100644 --- a/pandatool/src/eggbase/Sources.pp +++ b/pandatool/src/eggbase/Sources.pp @@ -3,7 +3,9 @@ #define LOCAL_LIBS \ progbase converter #define OTHER_LIBS \ - egg:c linmath:c panda:m + egg:c linmath:c express:c putil:c pnmimage:c panda:m \ + interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m pystub #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/eggcharbase/Sources.pp b/pandatool/src/eggcharbase/Sources.pp index dac8480d7f..11bebcb95f 100644 --- a/pandatool/src/eggcharbase/Sources.pp +++ b/pandatool/src/eggcharbase/Sources.pp @@ -3,7 +3,9 @@ #define LOCAL_LIBS \ eggbase progbase #define OTHER_LIBS \ - egg:c panda:m + egg:c event:c express:c linmath:c mathutil:c pnmimage:c putil:c panda:m pystub \ + interrogatedb:c dconfig:c dtooolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define USE_PACKAGES zlib #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/eggprogs/Sources.pp b/pandatool/src/eggprogs/Sources.pp index 01fe986ad3..a651bdfe14 100644 --- a/pandatool/src/eggprogs/Sources.pp +++ b/pandatool/src/eggprogs/Sources.pp @@ -1,7 +1,7 @@ #define LOCAL_LIBS \ converter eggbase progbase #define OTHER_LIBS \ - egg:c pandaegg:m \ + egg:c event:c pandaegg:m \ pnmimagetypes:c pnmimage:c mathutil:c linmath:c putil:c panda:m \ express:c pandaexpress:m \ dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub diff --git a/pandatool/src/flt/Sources.pp b/pandatool/src/flt/Sources.pp index 9affcc5897..e07ce05f9d 100644 --- a/pandatool/src/flt/Sources.pp +++ b/pandatool/src/flt/Sources.pp @@ -2,7 +2,9 @@ #define TARGET flt #define LOCAL_LIBS converter pandatoolbase #define OTHER_LIBS \ - mathutil:c linmath:c putil:c express:c panda:m dtoolconfig dtool + mathutil:c linmath:c putil:c event:c express:c panda:m \ + interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define UNIX_SYS_LIBS m #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/fltegg/Sources.pp b/pandatool/src/fltegg/Sources.pp index e9a82576f2..4b9ecde5b3 100644 --- a/pandatool/src/fltegg/Sources.pp +++ b/pandatool/src/fltegg/Sources.pp @@ -2,8 +2,10 @@ #define TARGET fltegg #define LOCAL_LIBS converter flt pandatoolbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - mathutil:c linmath:c putil:c express:c panda:m dtoolconfig dtool + egg:c event:c pandaegg:m \ + mathutil:c linmath:c putil:c express:c panda:m \ + interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define UNIX_SYS_LIBS \ m diff --git a/pandatool/src/fltprogs/Sources.pp b/pandatool/src/fltprogs/Sources.pp index 28c5afefa6..9eb1c50a83 100644 --- a/pandatool/src/fltprogs/Sources.pp +++ b/pandatool/src/fltprogs/Sources.pp @@ -6,7 +6,8 @@ #define OTHER_LIBS \ egg:c pandaegg:m \ - linmath:c panda:m \ + linmath:c pnmimagetypes:c pnmimage:c event:c \ + putil:c mathutil:c panda:m \ express:c pandaexpress:m \ dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub @@ -21,7 +22,7 @@ progbase flt #define OTHER_LIBS \ egg:c pandaegg:m \ - linmath:c panda:m \ + linmath:c pnmimagetypes:c pnmimage:c putil:c event:c mathutil:c panda:m \ express:c pandaexpress:m \ dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub @@ -36,7 +37,8 @@ progbase flt #define OTHER_LIBS \ egg:c pandaegg:m \ - linmath:c panda:m \ + event:c linmath:c mathutil:c \ + pnmimagetypes:c pnmimage:c putil:c panda:m \ express:c pandaexpress:m \ dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub @@ -51,7 +53,7 @@ #define OTHER_LIBS \ egg:c pandaegg:m \ - linmath:c panda:m \ + linmath:c pnmimagetypes:c pnmimage:c putil:c mathutil:c event:c panda:m \ express:c pandaexpress:m \ dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub @@ -66,7 +68,7 @@ #define OTHER_LIBS \ egg:c pandaegg:m \ - putil:c linmath:c panda:m \ + putil:c event:c linmath:c pnmimagetypes:c pnmimage:c mathutil:c panda:m \ express:c pandaexpress:m \ dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub diff --git a/pandatool/src/imagebase/Sources.pp b/pandatool/src/imagebase/Sources.pp index 4074d4c642..f34c82be92 100644 --- a/pandatool/src/imagebase/Sources.pp +++ b/pandatool/src/imagebase/Sources.pp @@ -3,7 +3,11 @@ #define LOCAL_LIBS \ progbase #define OTHER_LIBS \ - pnmimage:c panda:m + pnmimage:c panda:m \ + pystub \ + express:c linmath:c putil:c \ + interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/imageprogs/Sources.pp b/pandatool/src/imageprogs/Sources.pp index 33c9c820ad..fa84e4bfe5 100644 --- a/pandatool/src/imageprogs/Sources.pp +++ b/pandatool/src/imageprogs/Sources.pp @@ -2,6 +2,7 @@ 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 dconfig:c dtoolconfig:m dtool:m pystub diff --git a/pandatool/src/lwo/Sources.pp b/pandatool/src/lwo/Sources.pp index 0cb0656efa..2f73ac72e1 100644 --- a/pandatool/src/lwo/Sources.pp +++ b/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 dtoolconfig dtool + mathutil:c linmath:c putil:c express:c panda:m pandaexpress:m \ + interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define UNIX_SYS_LIBS m #begin ss_lib_target diff --git a/pandatool/src/lwoegg/Sources.pp b/pandatool/src/lwoegg/Sources.pp index 848b0e59bb..206a64173f 100644 --- a/pandatool/src/lwoegg/Sources.pp +++ b/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 dtoolconfig dtool + mathutil:c linmath:c putil:c express:c panda:m \ + interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define UNIX_SYS_LIBS m #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/lwoprogs/Sources.pp b/pandatool/src/lwoprogs/Sources.pp index 9b3e80ff5a..97c2e7c7f5 100644 --- a/pandatool/src/lwoprogs/Sources.pp +++ b/pandatool/src/lwoprogs/Sources.pp @@ -4,7 +4,9 @@ #define OTHER_LIBS \ egg:c pandaegg:m \ - linmath:c panda:m \ + linmath:c \ + pnmimagetypes:c pnmimage:c \ + putil:c panda:m \ express:c pandaexpress:m \ dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub @@ -19,7 +21,7 @@ #define OTHER_LIBS \ egg:c pandaegg:m \ - linmath:c panda:m \ + linmath:c pnmimagetypes:c pnmimage:c putil:c panda:m \ express:c pandaexpress:m \ dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub diff --git a/pandatool/src/miscprogs/Sources.pp b/pandatool/src/miscprogs/Sources.pp index 65a7512813..0bc3550ea3 100644 --- a/pandatool/src/miscprogs/Sources.pp +++ b/pandatool/src/miscprogs/Sources.pp @@ -1,6 +1,7 @@ #define LOCAL_LIBS \ progbase #define OTHER_LIBS \ + pnmimage:c linmath:c \ putil:c panda:m \ express:c pandaexpress:m \ dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub diff --git a/pandatool/src/pandatoolbase/Sources.pp b/pandatool/src/pandatoolbase/Sources.pp index 2f50398d09..7b9b3489a1 100644 --- a/pandatool/src/pandatoolbase/Sources.pp +++ b/pandatool/src/pandatoolbase/Sources.pp @@ -1,3 +1,6 @@ +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m express:c putil:c + #begin ss_lib_target #define TARGET pandatoolbase diff --git a/pandatool/src/progbase/Sources.pp b/pandatool/src/progbase/Sources.pp index f447117aeb..adaa3d43d2 100644 --- a/pandatool/src/progbase/Sources.pp +++ b/pandatool/src/progbase/Sources.pp @@ -3,7 +3,9 @@ #define LOCAL_LIBS \ pandatoolbase #define OTHER_LIBS \ - pnmimage:c linmath:c putil:c express:c panda:m pystub dtool + pnmimage:c linmath:c putil:c express:c panda:m pystub \ + interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/progbase/programBase.cxx b/pandatool/src/progbase/programBase.cxx index b020ad3650..35f2c4747e 100644 --- a/pandatool/src/progbase/programBase.cxx +++ b/pandatool/src/progbase/programBase.cxx @@ -40,9 +40,9 @@ // If our system getopt() doesn't come with getopt_long_only(), then use // the GNU flavor that we've got in tool for this purpose. #ifndef HAVE_GETOPT_LONG_ONLY -#include "gnu_getopt.h" + #include "gnu_getopt.h" #else -#include + #include #endif // This manifest is defined if we are running on a system (e.g. most @@ -50,10 +50,12 @@ // screen via an ioctl() call. It's just handy to know for formatting // output nicely for the user. #ifdef IOCTL_TERMINAL_WIDTH -#include -#ifndef TIOCGWINSZ -#include -#endif // TIOCGWINSZ + #include + #ifndef TIOCGWINSZ + #include + #elif __APPLE__ + #include + #endif // TIOCGWINSZ #endif // IOCTL_TERMINAL_WIDTH bool ProgramBase::SortOptionsByIndex:: diff --git a/pandatool/src/ptloader/Sources.pp b/pandatool/src/ptloader/Sources.pp index f62072e568..04bf713a3d 100644 --- a/pandatool/src/ptloader/Sources.pp +++ b/pandatool/src/ptloader/Sources.pp @@ -5,9 +5,15 @@ fltegg flt lwoegg lwo converter pandatoolbase #define OTHER_LIBS \ egg2pg:c builder:c egg:c pandaegg:m \ - mathutil:c linmath:c putil:c panda:m \ + 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 \ - dtoolconfig dtool + interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define UNIX_SYS_LIBS \ m diff --git a/pandatool/src/softprogs/Sources.pp b/pandatool/src/softprogs/Sources.pp index f40ef2e751..14cc248858 100644 --- a/pandatool/src/softprogs/Sources.pp +++ b/pandatool/src/softprogs/Sources.pp @@ -4,6 +4,7 @@ #define OTHER_LIBS \ egg:c pandaegg:m \ + pnmimage:c putil:c \ linmath:c panda:m \ express:c pandaexpress:m \ dtoolutil:c dtoolbase:c dconfig:c dtoolconfig:m dtool:m pystub