From 1759e6859ae07d1fed7c118997add24ec7776dcc Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 27 Jul 2010 17:49:16 +0000 Subject: [PATCH] more build issues (win32) --- pandatool/src/dxfprogs/Sources.pp | 4 +++- pandatool/src/egg-mkfont/Sources.pp | 4 +++- pandatool/src/imageprogs/Sources.pp | 4 +++- pandatool/src/lwoprogs/Sources.pp | 4 +++- pandatool/src/miscprogs/Sources.pp | 5 ++++- pandatool/src/softprogs/Sources.pp | 4 +++- pandatool/src/vrmlprogs/Sources.pp | 4 +++- pandatool/src/xfileprogs/Sources.pp | 4 +++- 8 files changed, 25 insertions(+), 8 deletions(-) diff --git a/pandatool/src/dxfprogs/Sources.pp b/pandatool/src/dxfprogs/Sources.pp index a89b7e0313..e46f269920 100644 --- a/pandatool/src/dxfprogs/Sources.pp +++ b/pandatool/src/dxfprogs/Sources.pp @@ -5,10 +5,12 @@ egg:c pandaegg:m \ pipeline:c event:c pstatclient:c panda:m \ pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ + pandaexpress:m \ interrogatedb:c prc:c dconfig:c dtoolconfig:m \ dtoolutil:c dtoolbase:c dtool:m \ $[if $[WANT_NATIVE_NET],nativenet:c] \ - $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] \ + pystub #begin bin_target #define TARGET dxf-points diff --git a/pandatool/src/egg-mkfont/Sources.pp b/pandatool/src/egg-mkfont/Sources.pp index 68602eb44a..5f3f683b1e 100644 --- a/pandatool/src/egg-mkfont/Sources.pp +++ b/pandatool/src/egg-mkfont/Sources.pp @@ -9,10 +9,12 @@ egg:c pandaegg:m \ pipeline:c event:c pstatclient:c panda:m \ pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ + pandaexpress:m \ interrogatedb:c prc:c dconfig:c dtoolconfig:m \ dtoolutil:c dtoolbase:c dtool:m \ $[if $[WANT_NATIVE_NET],nativenet:c] \ - $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] \ + pystub #begin bin_target #define TARGET egg-mkfont diff --git a/pandatool/src/imageprogs/Sources.pp b/pandatool/src/imageprogs/Sources.pp index 1b9e37921d..48eeaae615 100644 --- a/pandatool/src/imageprogs/Sources.pp +++ b/pandatool/src/imageprogs/Sources.pp @@ -4,10 +4,12 @@ #define OTHER_LIBS \ pipeline:c event:c pstatclient:c panda:m \ pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ + pandaexpress:m \ interrogatedb:c prc:c dconfig:c dtoolconfig:m \ dtoolutil:c dtoolbase:c dtool:m \ $[if $[WANT_NATIVE_NET],nativenet:c] \ - $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] \ + pystub #begin bin_target #define TARGET image-trans diff --git a/pandatool/src/lwoprogs/Sources.pp b/pandatool/src/lwoprogs/Sources.pp index f2531c1b26..71b8a6e642 100644 --- a/pandatool/src/lwoprogs/Sources.pp +++ b/pandatool/src/lwoprogs/Sources.pp @@ -3,10 +3,12 @@ egg:c pandaegg:m \ pipeline:c event:c pstatclient:c panda:m \ pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ + pandaexpress:m \ interrogatedb:c prc:c dconfig:c dtoolconfig:m \ dtoolutil:c dtoolbase:c dtool:m \ $[if $[WANT_NATIVE_NET],nativenet:c] \ - $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] \ + pystub #begin bin_target #define TARGET lwo2egg diff --git a/pandatool/src/miscprogs/Sources.pp b/pandatool/src/miscprogs/Sources.pp index 11f81cc06e..e83bfeeb5f 100644 --- a/pandatool/src/miscprogs/Sources.pp +++ b/pandatool/src/miscprogs/Sources.pp @@ -4,10 +4,13 @@ #define OTHER_LIBS \ pipeline:c event:c pstatclient:c panda:m \ pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ + pandaexpress:m \ interrogatedb:c prc:c dconfig:c dtoolconfig:m \ dtoolutil:c dtoolbase:c dtool:m \ $[if $[WANT_NATIVE_NET],nativenet:c] \ - $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] \ + pystub + #define UNIX_SYS_LIBS m #begin bin_target diff --git a/pandatool/src/softprogs/Sources.pp b/pandatool/src/softprogs/Sources.pp index 6bdf7c410b..5e94232c75 100644 --- a/pandatool/src/softprogs/Sources.pp +++ b/pandatool/src/softprogs/Sources.pp @@ -7,10 +7,12 @@ egg:c pandaegg:m \ pipeline:c event:c pstatclient:c panda:m \ pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ + pandaexpress:m \ interrogatedb:c prc:c dconfig:c dtoolconfig:m \ dtoolutil:c dtoolbase:c dtool:m \ $[if $[WANT_NATIVE_NET],nativenet:c] \ - $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] \ + pystub #define SOURCES \ softCVS.cxx softCVS.h softFilename.cxx softFilename.h diff --git a/pandatool/src/vrmlprogs/Sources.pp b/pandatool/src/vrmlprogs/Sources.pp index 09370fef76..c248b26c0f 100644 --- a/pandatool/src/vrmlprogs/Sources.pp +++ b/pandatool/src/vrmlprogs/Sources.pp @@ -2,10 +2,12 @@ egg:c pandaegg:m \ pipeline:c event:c pstatclient:c panda:m \ pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ + pandaexpress:m \ interrogatedb:c prc:c dconfig:c dtoolconfig:m \ dtoolutil:c dtoolbase:c dtool:m \ $[if $[WANT_NATIVE_NET],nativenet:c] \ - $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] \ + pystub #begin bin_target #define TARGET vrml2egg diff --git a/pandatool/src/xfileprogs/Sources.pp b/pandatool/src/xfileprogs/Sources.pp index ec8d340f03..a3842d09e4 100644 --- a/pandatool/src/xfileprogs/Sources.pp +++ b/pandatool/src/xfileprogs/Sources.pp @@ -2,10 +2,12 @@ egg:c pandaegg:m \ pipeline:c event:c pstatclient:c panda:m \ pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ + pandaexpress:m \ interrogatedb:c prc:c dconfig:c dtoolconfig:m \ dtoolutil:c dtoolbase:c dtool:m \ $[if $[WANT_NATIVE_NET],nativenet:c] \ - $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],net:c downloader:c] \ + pystub #begin bin_target #define TARGET egg2x