From dfe16c64f60e79ffc54a41c155c484c4d629d601 Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 6 Dec 2011 02:39:21 +0000 Subject: [PATCH] rename all Panda-built libraries to begin with libp3 or libpanda --- contrib/src/ai/Sources.pp | 14 +- .../{ai_composite.cxx => p3ai_composite.cxx} | 0 ...{ai_composite1.cxx => p3ai_composite1.cxx} | 0 contrib/src/contribbase/Sources.pp | 6 +- direct/metalibs/direct/Sources.pp | 22 +- direct/src/dcparse/Sources.pp | 16 +- direct/src/dcparser/Sources.pp | 16 +- direct/src/dcparser/dcparser_composite.cxx | 2 - ...mposite1.cxx => p3dcparser_composite1.cxx} | 0 ...mposite2.cxx => p3dcparser_composite2.cxx} | 0 direct/src/deadrec/Sources.pp | 14 +- direct/src/deadrec/deadrec_composite.cxx | 1 - ...omposite1.cxx => p3deadrec_composite1.cxx} | 0 direct/src/directbase/Sources.pp | 2 +- direct/src/directd/Sources.pp | 6 +- direct/src/directdServer/Sources.pp | 14 +- direct/src/distributed/Sources.pp | 16 +- direct/src/heapq/Sources.pp | 6 +- direct/src/http/Sources.pp | 16 +- ...p_composite1.cxx => p3http_composite1.cxx} | 0 direct/src/interval/Sources.pp | 20 +- direct/src/interval/interval_composite.cxx | 1 - ...mposite1.cxx => p3interval_composite1.cxx} | 0 direct/src/motiontrail/Sources.pp | 50 +- direct/src/p3d/panda3d.pdef | 6 +- direct/src/plugin/Sources.pp | 58 +- direct/src/plugin_standalone/Sources.pp | 42 +- direct/src/showbase/Sources.pp | 22 +- direct/src/showutil/FreezeTool.py | 10 +- dmodels/Sources.pp | 2 +- dmodels/src/fonts/Sources.pp | 4 +- dmodels/src/gui/Sources.pp | 4 +- dmodels/src/icons/Sources.pp | 6 +- dmodels/src/level_editor/Sources.pp | 6 +- dmodels/src/misc/Sources.pp | 8 +- dtool/Config.pp | 2 +- dtool/metalibs/dtool/Sources.pp | 4 +- dtool/metalibs/dtoolconfig/Sources.pp | 6 +- dtool/src/cppparser/Sources.pp | 4 +- dtool/src/cppparser/cppParser_composite.cxx | 2 - ...posite1.cxx => p3cppParser_composite1.cxx} | 0 ...posite2.cxx => p3cppParser_composite2.cxx} | 0 dtool/src/dconfig/Sources.pp | 12 +- dtool/src/dconfig/dconfig_composite.cxx | 1 - ...omposite1.cxx => p3dconfig_composite1.cxx} | 0 dtool/src/dtoolbase/Sources.pp | 2 +- ...posite1.cxx => p3dtoolbase_composite1.cxx} | 0 ...posite2.cxx => p3dtoolbase_composite2.cxx} | 0 dtool/src/dtoolutil/Sources.pp | 8 +- dtool/src/dtoolutil/dtoolutil_composite.cxx | 2 - ...posite1.cxx => p3dtoolutil_composite1.cxx} | 0 ...posite2.cxx => p3dtoolutil_composite2.cxx} | 0 dtool/src/interrogate/Sources.pp | 2 +- .../src/interrogate/interrogate_composite.cxx | 2 - dtool/src/interrogatedb/Sources.pp | 4 +- .../interrogatedb/interrogatedb_composite.cxx | 2 - ...te1.cxx => p3interrogatedb_composite1.cxx} | 0 ...te2.cxx => p3interrogatedb_composite2.cxx} | 0 dtool/src/newheader/Sources.pp | 2 +- dtool/src/prc/Sources.pp | 4 +- ...rc_composite1.cxx => p3prc_composite1.cxx} | 0 ...rc_composite2.cxx => p3prc_composite2.cxx} | 0 dtool/src/prc/prc_composite.cxx | 2 - dtool/src/prckeys/Sources.pp | 2 +- dtool/src/pystub/Sources.pp | 4 +- dtool/src/test_interrogate/Sources.pp | 2 +- makepanda/makepanda.py | 1480 +++++++++-------- panda/metalibs/panda/Sources.pp | 28 +- panda/metalibs/pandabullet/Sources.pp | 8 +- panda/metalibs/pandadx8/Sources.pp | 6 +- panda/metalibs/pandadx9/Sources.pp | 6 +- panda/metalibs/pandaegg/Sources.pp | 8 +- panda/metalibs/pandaexpress/Sources.pp | 6 +- panda/metalibs/pandafx/Sources.pp | 8 +- panda/metalibs/pandagl/Sources.pp | 10 +- panda/metalibs/pandagles/Sources.pp | 8 +- panda/metalibs/pandagles2/Sources.pp | 8 +- panda/metalibs/pandaode/Sources.pp | 6 +- panda/metalibs/pandaphysics/Sources.pp | 8 +- panda/metalibs/pandaphysx/Sources.pp | 8 +- panda/src/audio/Sources.pp | 12 +- panda/src/audio/audio_composite.cxx | 1 - ..._composite1.cxx => p3audio_composite1.cxx} | 0 panda/src/audiotraits/Sources.pp | 12 +- .../src/audiotraits/fmod_audio_composite.cxx | 1 - .../src/audiotraits/miles_audio_composite.cxx | 1 - .../audiotraits/openal_audio_composite.cxx | 1 - panda/src/awesomium/Sources.pp | 10 +- panda/src/bullet/Sources.pp | 10 +- ...t_composite.cxx => p3bullet_composite.cxx} | 0 panda/src/cftalk/Sources.pp | 10 +- ...composite1.cxx => p3cftalk_composite1.cxx} | 0 ...composite2.cxx => p3cftalk_composite2.cxx} | 0 panda/src/chan/Sources.pp | 8 +- panda/src/chan/chan_composite.cxx | 2 - ...n_composite1.cxx => p3chan_composite1.cxx} | 0 ...n_composite2.cxx => p3chan_composite2.cxx} | 0 panda/src/char/Sources.pp | 10 +- panda/src/char/char_composite.cxx | 2 - ...r_composite1.cxx => p3char_composite1.cxx} | 0 ...r_composite2.cxx => p3char_composite2.cxx} | 0 panda/src/collada/Sources.pp | 8 +- ...omposite1.cxx => p3collada_composite1.cxx} | 0 panda/src/collide/Sources.pp | 14 +- panda/src/collide/collide_composite.cxx | 2 - ...omposite1.cxx => p3collide_composite1.cxx} | 0 ...omposite2.cxx => p3collide_composite2.cxx} | 0 panda/src/configfiles/panda.prc.pp | 4 +- panda/src/cull/Sources.pp | 10 +- panda/src/cull/cull_composite.cxx | 2 - ...l_composite1.cxx => p3cull_composite1.cxx} | 0 ...l_composite2.cxx => p3cull_composite2.cxx} | 0 panda/src/device/Sources.pp | 8 +- panda/src/device/device_composite.cxx | 2 - ...composite1.cxx => p3device_composite1.cxx} | 0 ...composite2.cxx => p3device_composite2.cxx} | 0 panda/src/dgraph/Sources.pp | 8 +- panda/src/dgraph/dgraph_composite.cxx | 2 - ...composite1.cxx => p3dgraph_composite1.cxx} | 0 ...composite2.cxx => p3dgraph_composite2.cxx} | 0 panda/src/display/Sources.pp | 14 +- panda/src/display/display_composite.cxx | 2 - ...omposite1.cxx => p3display_composite1.cxx} | 0 ...omposite2.cxx => p3display_composite2.cxx} | 0 panda/src/distort/Sources.pp | 8 +- panda/src/distort/distort_composite.cxx | 1 - ...omposite1.cxx => p3distort_composite1.cxx} | 0 panda/src/doc/Sources.pp | 4 +- panda/src/downloader/Sources.pp | 10 +- panda/src/downloader/downloader_composite.cxx | 2 - ...osite1.cxx => p3downloader_composite1.cxx} | 0 ...osite2.cxx => p3downloader_composite2.cxx} | 0 panda/src/downloadertools/Sources.pp | 6 +- panda/src/dxgsg8/Sources.pp | 10 +- panda/src/dxgsg8/dxgsg8_composite.cxx | 1 - ...composite1.cxx => p3dxgsg8_composite1.cxx} | 0 panda/src/dxgsg9/Sources.pp | 10 +- panda/src/dxgsg9/dxgsg9_composite.cxx | 1 - ...composite1.cxx => p3dxgsg9_composite1.cxx} | 0 panda/src/dxml/Sources.pp | 10 +- ...l_composite1.cxx => p3dxml_composite1.cxx} | 0 panda/src/egg/Sources.pp | 10 +- panda/src/egg/egg_composite.cxx | 2 - ...gg_composite1.cxx => p3egg_composite1.cxx} | 0 ...gg_composite2.cxx => p3egg_composite2.cxx} | 0 panda/src/egg2pg/Sources.pp | 8 +- panda/src/egg2pg/egg2pg_composite.cxx | 2 - ...composite1.cxx => p3egg2pg_composite1.cxx} | 0 ...composite2.cxx => p3egg2pg_composite2.cxx} | 0 panda/src/egldisplay/Sources.pp | 10 +- ...osite1.cxx => p3egldisplay_composite1.cxx} | 0 panda/src/event/Sources.pp | 14 +- panda/src/event/event_composite.cxx | 2 - ..._composite1.cxx => p3event_composite1.cxx} | 0 ..._composite2.cxx => p3event_composite2.cxx} | 0 panda/src/express/Sources.pp | 24 +- panda/src/express/express_composite.cxx | 2 - ...omposite1.cxx => p3express_composite1.cxx} | 0 ...omposite2.cxx => p3express_composite2.cxx} | 0 panda/src/framework/Sources.pp | 14 +- panda/src/framework/framework_composite.cxx | 1 - ...posite1.cxx => p3framework_composite1.cxx} | 0 panda/src/gles2gsg/Sources.pp | 10 +- panda/src/gles2gsg/gles2gsg_composite.cxx | 1 - ...mposite1.cxx => p3gles2gsg_composite1.cxx} | 0 panda/src/glesgsg/Sources.pp | 10 +- panda/src/glesgsg/glesgsg_composite.cxx | 1 - ...omposite1.cxx => p3glesgsg_composite1.cxx} | 0 panda/src/glgsg/Sources.pp | 10 +- panda/src/glgsg/glgsg_composite.cxx | 1 - ..._composite1.cxx => p3glgsg_composite1.cxx} | 0 panda/src/glstuff/Sources.pp | 10 +- panda/src/glxdisplay/Sources.pp | 8 +- panda/src/glxdisplay/glxdisplay_composite.cxx | 1 - ...osite1.cxx => p3glxdisplay_composite1.cxx} | 0 panda/src/gobj/Sources.pp | 10 +- panda/src/gobj/gobj_composite.cxx | 2 - ...j_composite1.cxx => p3gobj_composite1.cxx} | 0 ...j_composite2.cxx => p3gobj_composite2.cxx} | 0 panda/src/grutil/Sources.pp | 8 +- panda/src/grutil/grutil_composite.cxx | 2 - ...composite1.cxx => p3grutil_composite1.cxx} | 0 ...composite2.cxx => p3grutil_composite2.cxx} | 0 panda/src/gsgbase/Sources.pp | 10 +- panda/src/gsgbase/gsgbase_composite.cxx | 1 - ...omposite1.cxx => p3gsgbase_composite1.cxx} | 0 panda/src/iphone/Sources.pp | 16 +- panda/src/iphonedisplay/Sources.pp | 14 +- panda/src/lerp/Sources.pp | 8 +- panda/src/lerp/lerp_composite.cxx | 1 - ...p_composite1.cxx => p3lerp_composite1.cxx} | 0 panda/src/linmath/Sources.pp | 12 +- panda/src/linmath/linmath_composite.cxx | 2 - ...omposite1.cxx => p3linmath_composite1.cxx} | 0 ...omposite2.cxx => p3linmath_composite2.cxx} | 0 panda/src/mathutil/Sources.pp | 16 +- panda/src/mathutil/mathutil_composite.cxx | 2 - ...mposite1.cxx => p3mathutil_composite1.cxx} | 0 ...mposite2.cxx => p3mathutil_composite2.cxx} | 0 panda/src/mesadisplay/Sources.pp | 10 +- .../src/mesadisplay/mesadisplay_composite.cxx | 1 - ...site1.cxx => p3mesadisplay_composite1.cxx} | 0 panda/src/movies/Sources.pp | 8 +- panda/src/movies/movies_composite.cxx | 1 - ...composite1.cxx => p3movies_composite1.cxx} | 0 panda/src/nativenet/Sources.pp | 8 +- ...posite1.cxx => p3nativenet_composite1.cxx} | 0 panda/src/net/Sources.pp | 42 +- panda/src/net/net_composite.cxx | 2 - ...et_composite1.cxx => p3net_composite1.cxx} | 0 ...et_composite2.cxx => p3net_composite2.cxx} | 0 panda/src/ode/Sources.pp | 8 +- ...de_composite1.cxx => p3ode_composite1.cxx} | 0 ...de_composite2.cxx => p3ode_composite2.cxx} | 0 ...de_composite3.cxx => p3ode_composite3.cxx} | 0 panda/src/osxdisplay/Sources.pp | 8 +- ...osite1.cxx => p3osxdisplay_composite1.cxx} | 0 panda/src/pandabase/Sources.pp | 6 +- panda/src/parametrics/Sources.pp | 10 +- ...site1.cxx => p3parametrics_composite1.cxx} | 0 ...site2.cxx => p3parametrics_composite2.cxx} | 0 .../src/parametrics/parametrics_composite.cxx | 2 - panda/src/particlesystem/Sources.pp | 8 +- ...e1.cxx => p3particlesystem_composite1.cxx} | 0 ...e2.cxx => p3particlesystem_composite2.cxx} | 0 .../particlesystem_composite.cxx | 2 - panda/src/pgraph/Sources.pp | 16 +- ...composite1.cxx => p3pgraph_composite1.cxx} | 0 ...composite2.cxx => p3pgraph_composite2.cxx} | 0 ...composite3.cxx => p3pgraph_composite3.cxx} | 0 ...composite4.cxx => p3pgraph_composite4.cxx} | 0 panda/src/pgraph/pgraph_composite.cxx | 4 - panda/src/pgraphnodes/Sources.pp | 10 +- ...site1.cxx => p3pgraphnodes_composite1.cxx} | 0 ...site2.cxx => p3pgraphnodes_composite2.cxx} | 0 .../src/pgraphnodes/pgraphnodes_composite.cxx | 4 - panda/src/pgui/Sources.pp | 20 +- ...i_composite1.cxx => p3pgui_composite1.cxx} | 0 ...i_composite2.cxx => p3pgui_composite2.cxx} | 0 panda/src/pgui/pgui_composite.cxx | 2 - panda/src/physics/Sources.pp | 10 +- ...omposite1.cxx => p3physics_composite1.cxx} | 0 ...omposite2.cxx => p3physics_composite2.cxx} | 0 panda/src/physics/physics_composite.cxx | 2 - panda/src/physx/Sources.pp | 10 +- ...sx_composite.cxx => p3physx_composite.cxx} | 0 panda/src/pipeline/Sources.pp | 50 +- ...mposite1.cxx => p3pipeline_composite1.cxx} | 0 ...mposite2.cxx => p3pipeline_composite2.cxx} | 0 panda/src/pipeline/pipeline_composite.cxx | 2 - panda/src/pnmimage/Sources.pp | 8 +- ...mposite1.cxx => p3pnmimage_composite1.cxx} | 0 ...mposite2.cxx => p3pnmimage_composite2.cxx} | 0 panda/src/pnmimage/pnmimage_composite.cxx | 2 - panda/src/pnmimagetypes/Sources.pp | 8 +- ...te1.cxx => p3pnmimagetypes_composite1.cxx} | 0 ...te2.cxx => p3pnmimagetypes_composite2.cxx} | 0 .../pnmimagetypes/pnmimagetypes_composite.cxx | 2 - panda/src/pnmtext/Sources.pp | 8 +- ...omposite1.cxx => p3pnmtext_composite1.cxx} | 0 panda/src/pnmtext/pnmtext_composite.cxx | 1 - panda/src/pstatclient/Sources.pp | 12 +- ...site1.cxx => p3pstatclient_composite1.cxx} | 0 ...site2.cxx => p3pstatclient_composite2.cxx} | 0 .../src/pstatclient/pstatclient_composite.cxx | 2 - panda/src/putil/Sources.pp | 20 +- ..._composite1.cxx => p3putil_composite1.cxx} | 0 ..._composite2.cxx => p3putil_composite2.cxx} | 0 panda/src/putil/putil_composite.cxx | 2 - panda/src/recorder/Sources.pp | 8 +- ...mposite1.cxx => p3recorder_composite1.cxx} | 0 ...mposite2.cxx => p3recorder_composite2.cxx} | 0 panda/src/recorder/recorder_composite.cxx | 2 - panda/src/skel/Sources.pp | 8 +- ...l_composite1.cxx => p3skel_composite1.cxx} | 0 panda/src/skel/skel_composite.cxx | 1 - panda/src/speedtree/Sources.pp | 8 +- panda/src/testbed/Sources.pp | 12 +- panda/src/text/Sources.pp | 12 +- ...t_composite1.cxx => p3text_composite1.cxx} | 0 ...t_composite2.cxx => p3text_composite2.cxx} | 0 panda/src/text/text_composite.cxx | 2 - panda/src/tform/Sources.pp | 10 +- ..._composite1.cxx => p3tform_composite1.cxx} | 0 ..._composite2.cxx => p3tform_composite2.cxx} | 0 panda/src/tform/tform_composite.cxx | 2 - panda/src/tinydisplay/Sources.pp | 10 +- ...site1.cxx => p3tinydisplay_composite1.cxx} | 0 ...site2.cxx => p3tinydisplay_composite2.cxx} | 0 panda/src/vision/Sources.pp | 8 +- ...composite1.cxx => p3vision_composite1.cxx} | 0 panda/src/vrpn/Sources.pp | 8 +- ...n_composite1.cxx => p3vrpn_composite1.cxx} | 0 panda/src/vrpn/vrpn_composite.cxx | 1 - panda/src/wgldisplay/Sources.pp | 8 +- ...osite1.cxx => p3wgldisplay_composite1.cxx} | 0 panda/src/wgldisplay/wgldisplay_composite.cxx | 1 - panda/src/windisplay/Sources.pp | 8 +- ...osite1.cxx => p3windisplay_composite1.cxx} | 0 panda/src/windisplay/windisplay_composite.cxx | 1 - panda/src/x11display/Sources.pp | 8 +- ...osite1.cxx => p3x11display_composite1.cxx} | 0 panda/src/x11display/x11display_composite.cxx | 1 - pandatool/Sources.pp | 2 +- pandatool/src/assimp/Sources.pp | 26 +- pandatool/src/bam/Sources.pp | 32 +- pandatool/src/configfiles/pandatool.prc.pp | 2 +- pandatool/src/converter/Sources.pp | 14 +- pandatool/src/cvscopy/Sources.pp | 20 +- ...omposite1.cxx => p3cvscopy_composite1.cxx} | 0 pandatool/src/daeegg/Sources.pp | 14 +- ...composite1.cxx => p3daeegg_composite1.cxx} | 0 pandatool/src/daeprogs/Sources.pp | 12 +- pandatool/src/dxf/Sources.pp | 10 +- ...xf_composite1.cxx => p3dxf_composite1.cxx} | 0 pandatool/src/dxfegg/Sources.pp | 18 +- pandatool/src/dxfprogs/Sources.pp | 22 +- pandatool/src/egg-mkfont/Sources.pp | 20 +- pandatool/src/egg-optchar/Sources.pp | 12 +- pandatool/src/egg-palettize/Sources.pp | 24 +- pandatool/src/egg-qtess/Sources.pp | 26 +- pandatool/src/eggbase/Sources.pp | 16 +- ...omposite1.cxx => p3eggbase_composite1.cxx} | 0 pandatool/src/eggcharbase/Sources.pp | 16 +- ...site1.cxx => p3eggcharbase_composite1.cxx} | 0 pandatool/src/eggprogs/Sources.pp | 16 +- pandatool/src/flt/Sources.pp | 16 +- ...lt_composite1.cxx => p3flt_composite1.cxx} | 0 pandatool/src/fltegg/Sources.pp | 16 +- pandatool/src/fltprogs/Sources.pp | 20 +- pandatool/src/gtk-stats/Sources.pp | 14 +- pandatool/src/imagebase/Sources.pp | 16 +- ...posite1.cxx => p3imagebase_composite1.cxx} | 0 pandatool/src/imageprogs/Sources.pp | 18 +- pandatool/src/lwo/Sources.pp | 12 +- ...wo_composite1.cxx => p3lwo_composite1.cxx} | 0 pandatool/src/lwoegg/Sources.pp | 14 +- ...composite1.cxx => p3lwoegg_composite1.cxx} | 0 pandatool/src/lwoprogs/Sources.pp | 20 +- ...composite1.cxx => p3maxegg_composite1.cxx} | 0 pandatool/src/maya/Sources.pp | 12 +- ...a_composite1.cxx => p3maya_composite1.cxx} | 0 pandatool/src/mayaegg/Sources.pp | 16 +- ...omposite1.cxx => p3mayaegg_composite1.cxx} | 0 pandatool/src/mayaprogs/Sources.pp | 136 +- pandatool/src/miscprogs/Sources.pp | 16 +- pandatool/src/objegg/Sources.pp | 18 +- pandatool/src/objprogs/Sources.pp | 18 +- pandatool/src/palettizer/Sources.pp | 18 +- ...osite1.cxx => p3palettizer_composite1.cxx} | 0 pandatool/src/pandatoolbase/Sources.pp | 10 +- ...te1.cxx => p3pandatoolbase_composite1.cxx} | 0 pandatool/src/pfmprogs/Sources.pp | 22 +- pandatool/src/progbase/Sources.pp | 20 +- ...mposite1.cxx => p3progbase_composite1.cxx} | 0 pandatool/src/pstatserver/Sources.pp | 12 +- ...site1.cxx => p3pstatserver_composite1.cxx} | 0 pandatool/src/ptloader/Sources.pp | 34 +- pandatool/src/softegg/Sources.pp | 12 +- pandatool/src/softprogs/Sources.pp | 18 +- pandatool/src/text-stats/Sources.pp | 12 +- pandatool/src/vrml/Sources.pp | 10 +- pandatool/src/vrmlegg/Sources.pp | 16 +- pandatool/src/vrmlprogs/Sources.pp | 20 +- pandatool/src/win-stats/Sources.pp | 10 +- pandatool/src/xfile/Sources.pp | 12 +- ..._composite1.cxx => p3xfile_composite1.cxx} | 0 pandatool/src/xfileegg/Sources.pp | 16 +- ...mposite1.cxx => p3xfileegg_composite1.cxx} | 0 pandatool/src/xfileprogs/Sources.pp | 22 +- 370 files changed, 1924 insertions(+), 1955 deletions(-) rename contrib/src/ai/{ai_composite.cxx => p3ai_composite.cxx} (100%) rename contrib/src/ai/{ai_composite1.cxx => p3ai_composite1.cxx} (100%) delete mode 100644 direct/src/dcparser/dcparser_composite.cxx rename direct/src/dcparser/{dcparser_composite1.cxx => p3dcparser_composite1.cxx} (100%) rename direct/src/dcparser/{dcparser_composite2.cxx => p3dcparser_composite2.cxx} (100%) delete mode 100644 direct/src/deadrec/deadrec_composite.cxx rename direct/src/deadrec/{deadrec_composite1.cxx => p3deadrec_composite1.cxx} (100%) rename direct/src/http/{http_composite1.cxx => p3http_composite1.cxx} (100%) delete mode 100644 direct/src/interval/interval_composite.cxx rename direct/src/interval/{interval_composite1.cxx => p3interval_composite1.cxx} (100%) delete mode 100644 dtool/src/cppparser/cppParser_composite.cxx rename dtool/src/cppparser/{cppParser_composite1.cxx => p3cppParser_composite1.cxx} (100%) rename dtool/src/cppparser/{cppParser_composite2.cxx => p3cppParser_composite2.cxx} (100%) delete mode 100644 dtool/src/dconfig/dconfig_composite.cxx rename dtool/src/dconfig/{dconfig_composite1.cxx => p3dconfig_composite1.cxx} (100%) rename dtool/src/dtoolbase/{dtoolbase_composite1.cxx => p3dtoolbase_composite1.cxx} (100%) rename dtool/src/dtoolbase/{dtoolbase_composite2.cxx => p3dtoolbase_composite2.cxx} (100%) delete mode 100644 dtool/src/dtoolutil/dtoolutil_composite.cxx rename dtool/src/dtoolutil/{dtoolutil_composite1.cxx => p3dtoolutil_composite1.cxx} (100%) rename dtool/src/dtoolutil/{dtoolutil_composite2.cxx => p3dtoolutil_composite2.cxx} (100%) delete mode 100644 dtool/src/interrogate/interrogate_composite.cxx delete mode 100644 dtool/src/interrogatedb/interrogatedb_composite.cxx rename dtool/src/interrogatedb/{interrogatedb_composite1.cxx => p3interrogatedb_composite1.cxx} (100%) rename dtool/src/interrogatedb/{interrogatedb_composite2.cxx => p3interrogatedb_composite2.cxx} (100%) rename dtool/src/prc/{prc_composite1.cxx => p3prc_composite1.cxx} (100%) rename dtool/src/prc/{prc_composite2.cxx => p3prc_composite2.cxx} (100%) delete mode 100644 dtool/src/prc/prc_composite.cxx delete mode 100644 panda/src/audio/audio_composite.cxx rename panda/src/audio/{audio_composite1.cxx => p3audio_composite1.cxx} (100%) delete mode 100644 panda/src/audiotraits/fmod_audio_composite.cxx delete mode 100644 panda/src/audiotraits/miles_audio_composite.cxx delete mode 100644 panda/src/audiotraits/openal_audio_composite.cxx rename panda/src/bullet/{bullet_composite.cxx => p3bullet_composite.cxx} (100%) rename panda/src/cftalk/{cftalk_composite1.cxx => p3cftalk_composite1.cxx} (100%) rename panda/src/cftalk/{cftalk_composite2.cxx => p3cftalk_composite2.cxx} (100%) delete mode 100644 panda/src/chan/chan_composite.cxx rename panda/src/chan/{chan_composite1.cxx => p3chan_composite1.cxx} (100%) rename panda/src/chan/{chan_composite2.cxx => p3chan_composite2.cxx} (100%) delete mode 100644 panda/src/char/char_composite.cxx rename panda/src/char/{char_composite1.cxx => p3char_composite1.cxx} (100%) rename panda/src/char/{char_composite2.cxx => p3char_composite2.cxx} (100%) rename panda/src/collada/{collada_composite1.cxx => p3collada_composite1.cxx} (100%) delete mode 100644 panda/src/collide/collide_composite.cxx rename panda/src/collide/{collide_composite1.cxx => p3collide_composite1.cxx} (100%) rename panda/src/collide/{collide_composite2.cxx => p3collide_composite2.cxx} (100%) delete mode 100644 panda/src/cull/cull_composite.cxx rename panda/src/cull/{cull_composite1.cxx => p3cull_composite1.cxx} (100%) rename panda/src/cull/{cull_composite2.cxx => p3cull_composite2.cxx} (100%) delete mode 100644 panda/src/device/device_composite.cxx rename panda/src/device/{device_composite1.cxx => p3device_composite1.cxx} (100%) rename panda/src/device/{device_composite2.cxx => p3device_composite2.cxx} (100%) delete mode 100644 panda/src/dgraph/dgraph_composite.cxx rename panda/src/dgraph/{dgraph_composite1.cxx => p3dgraph_composite1.cxx} (100%) rename panda/src/dgraph/{dgraph_composite2.cxx => p3dgraph_composite2.cxx} (100%) delete mode 100644 panda/src/display/display_composite.cxx rename panda/src/display/{display_composite1.cxx => p3display_composite1.cxx} (100%) rename panda/src/display/{display_composite2.cxx => p3display_composite2.cxx} (100%) delete mode 100644 panda/src/distort/distort_composite.cxx rename panda/src/distort/{distort_composite1.cxx => p3distort_composite1.cxx} (100%) delete mode 100644 panda/src/downloader/downloader_composite.cxx rename panda/src/downloader/{downloader_composite1.cxx => p3downloader_composite1.cxx} (100%) rename panda/src/downloader/{downloader_composite2.cxx => p3downloader_composite2.cxx} (100%) delete mode 100644 panda/src/dxgsg8/dxgsg8_composite.cxx rename panda/src/dxgsg8/{dxgsg8_composite1.cxx => p3dxgsg8_composite1.cxx} (100%) delete mode 100644 panda/src/dxgsg9/dxgsg9_composite.cxx rename panda/src/dxgsg9/{dxgsg9_composite1.cxx => p3dxgsg9_composite1.cxx} (100%) rename panda/src/dxml/{dxml_composite1.cxx => p3dxml_composite1.cxx} (100%) delete mode 100644 panda/src/egg/egg_composite.cxx rename panda/src/egg/{egg_composite1.cxx => p3egg_composite1.cxx} (100%) rename panda/src/egg/{egg_composite2.cxx => p3egg_composite2.cxx} (100%) delete mode 100644 panda/src/egg2pg/egg2pg_composite.cxx rename panda/src/egg2pg/{egg2pg_composite1.cxx => p3egg2pg_composite1.cxx} (100%) rename panda/src/egg2pg/{egg2pg_composite2.cxx => p3egg2pg_composite2.cxx} (100%) rename panda/src/egldisplay/{egldisplay_composite1.cxx => p3egldisplay_composite1.cxx} (100%) delete mode 100644 panda/src/event/event_composite.cxx rename panda/src/event/{event_composite1.cxx => p3event_composite1.cxx} (100%) rename panda/src/event/{event_composite2.cxx => p3event_composite2.cxx} (100%) delete mode 100644 panda/src/express/express_composite.cxx rename panda/src/express/{express_composite1.cxx => p3express_composite1.cxx} (100%) rename panda/src/express/{express_composite2.cxx => p3express_composite2.cxx} (100%) delete mode 100644 panda/src/framework/framework_composite.cxx rename panda/src/framework/{framework_composite1.cxx => p3framework_composite1.cxx} (100%) delete mode 100644 panda/src/gles2gsg/gles2gsg_composite.cxx rename panda/src/gles2gsg/{gles2gsg_composite1.cxx => p3gles2gsg_composite1.cxx} (100%) delete mode 100644 panda/src/glesgsg/glesgsg_composite.cxx rename panda/src/glesgsg/{glesgsg_composite1.cxx => p3glesgsg_composite1.cxx} (100%) delete mode 100644 panda/src/glgsg/glgsg_composite.cxx rename panda/src/glgsg/{glgsg_composite1.cxx => p3glgsg_composite1.cxx} (100%) delete mode 100644 panda/src/glxdisplay/glxdisplay_composite.cxx rename panda/src/glxdisplay/{glxdisplay_composite1.cxx => p3glxdisplay_composite1.cxx} (100%) delete mode 100644 panda/src/gobj/gobj_composite.cxx rename panda/src/gobj/{gobj_composite1.cxx => p3gobj_composite1.cxx} (100%) rename panda/src/gobj/{gobj_composite2.cxx => p3gobj_composite2.cxx} (100%) delete mode 100644 panda/src/grutil/grutil_composite.cxx rename panda/src/grutil/{grutil_composite1.cxx => p3grutil_composite1.cxx} (100%) rename panda/src/grutil/{grutil_composite2.cxx => p3grutil_composite2.cxx} (100%) delete mode 100644 panda/src/gsgbase/gsgbase_composite.cxx rename panda/src/gsgbase/{gsgbase_composite1.cxx => p3gsgbase_composite1.cxx} (100%) delete mode 100644 panda/src/lerp/lerp_composite.cxx rename panda/src/lerp/{lerp_composite1.cxx => p3lerp_composite1.cxx} (100%) delete mode 100644 panda/src/linmath/linmath_composite.cxx rename panda/src/linmath/{linmath_composite1.cxx => p3linmath_composite1.cxx} (100%) rename panda/src/linmath/{linmath_composite2.cxx => p3linmath_composite2.cxx} (100%) delete mode 100644 panda/src/mathutil/mathutil_composite.cxx rename panda/src/mathutil/{mathutil_composite1.cxx => p3mathutil_composite1.cxx} (100%) rename panda/src/mathutil/{mathutil_composite2.cxx => p3mathutil_composite2.cxx} (100%) delete mode 100644 panda/src/mesadisplay/mesadisplay_composite.cxx rename panda/src/mesadisplay/{mesadisplay_composite1.cxx => p3mesadisplay_composite1.cxx} (100%) delete mode 100644 panda/src/movies/movies_composite.cxx rename panda/src/movies/{movies_composite1.cxx => p3movies_composite1.cxx} (100%) rename panda/src/nativenet/{nativenet_composite1.cxx => p3nativenet_composite1.cxx} (100%) delete mode 100644 panda/src/net/net_composite.cxx rename panda/src/net/{net_composite1.cxx => p3net_composite1.cxx} (100%) rename panda/src/net/{net_composite2.cxx => p3net_composite2.cxx} (100%) rename panda/src/ode/{pode_composite1.cxx => p3ode_composite1.cxx} (100%) rename panda/src/ode/{pode_composite2.cxx => p3ode_composite2.cxx} (100%) rename panda/src/ode/{pode_composite3.cxx => p3ode_composite3.cxx} (100%) rename panda/src/osxdisplay/{osxdisplay_composite1.cxx => p3osxdisplay_composite1.cxx} (100%) rename panda/src/parametrics/{parametrics_composite1.cxx => p3parametrics_composite1.cxx} (100%) rename panda/src/parametrics/{parametrics_composite2.cxx => p3parametrics_composite2.cxx} (100%) delete mode 100644 panda/src/parametrics/parametrics_composite.cxx rename panda/src/particlesystem/{particlesystem_composite1.cxx => p3particlesystem_composite1.cxx} (100%) rename panda/src/particlesystem/{particlesystem_composite2.cxx => p3particlesystem_composite2.cxx} (100%) delete mode 100644 panda/src/particlesystem/particlesystem_composite.cxx rename panda/src/pgraph/{pgraph_composite1.cxx => p3pgraph_composite1.cxx} (100%) rename panda/src/pgraph/{pgraph_composite2.cxx => p3pgraph_composite2.cxx} (100%) rename panda/src/pgraph/{pgraph_composite3.cxx => p3pgraph_composite3.cxx} (100%) rename panda/src/pgraph/{pgraph_composite4.cxx => p3pgraph_composite4.cxx} (100%) delete mode 100644 panda/src/pgraph/pgraph_composite.cxx rename panda/src/pgraphnodes/{pgraphnodes_composite1.cxx => p3pgraphnodes_composite1.cxx} (100%) rename panda/src/pgraphnodes/{pgraphnodes_composite2.cxx => p3pgraphnodes_composite2.cxx} (100%) delete mode 100644 panda/src/pgraphnodes/pgraphnodes_composite.cxx rename panda/src/pgui/{pgui_composite1.cxx => p3pgui_composite1.cxx} (100%) rename panda/src/pgui/{pgui_composite2.cxx => p3pgui_composite2.cxx} (100%) delete mode 100644 panda/src/pgui/pgui_composite.cxx rename panda/src/physics/{physics_composite1.cxx => p3physics_composite1.cxx} (100%) rename panda/src/physics/{physics_composite2.cxx => p3physics_composite2.cxx} (100%) delete mode 100644 panda/src/physics/physics_composite.cxx rename panda/src/physx/{physx_composite.cxx => p3physx_composite.cxx} (100%) rename panda/src/pipeline/{pipeline_composite1.cxx => p3pipeline_composite1.cxx} (100%) rename panda/src/pipeline/{pipeline_composite2.cxx => p3pipeline_composite2.cxx} (100%) delete mode 100644 panda/src/pipeline/pipeline_composite.cxx rename panda/src/pnmimage/{pnmimage_composite1.cxx => p3pnmimage_composite1.cxx} (100%) rename panda/src/pnmimage/{pnmimage_composite2.cxx => p3pnmimage_composite2.cxx} (100%) delete mode 100644 panda/src/pnmimage/pnmimage_composite.cxx rename panda/src/pnmimagetypes/{pnmimagetypes_composite1.cxx => p3pnmimagetypes_composite1.cxx} (100%) rename panda/src/pnmimagetypes/{pnmimagetypes_composite2.cxx => p3pnmimagetypes_composite2.cxx} (100%) delete mode 100644 panda/src/pnmimagetypes/pnmimagetypes_composite.cxx rename panda/src/pnmtext/{pnmtext_composite1.cxx => p3pnmtext_composite1.cxx} (100%) delete mode 100644 panda/src/pnmtext/pnmtext_composite.cxx rename panda/src/pstatclient/{pstatclient_composite1.cxx => p3pstatclient_composite1.cxx} (100%) rename panda/src/pstatclient/{pstatclient_composite2.cxx => p3pstatclient_composite2.cxx} (100%) delete mode 100644 panda/src/pstatclient/pstatclient_composite.cxx rename panda/src/putil/{putil_composite1.cxx => p3putil_composite1.cxx} (100%) rename panda/src/putil/{putil_composite2.cxx => p3putil_composite2.cxx} (100%) delete mode 100644 panda/src/putil/putil_composite.cxx rename panda/src/recorder/{recorder_composite1.cxx => p3recorder_composite1.cxx} (100%) rename panda/src/recorder/{recorder_composite2.cxx => p3recorder_composite2.cxx} (100%) delete mode 100644 panda/src/recorder/recorder_composite.cxx rename panda/src/skel/{skel_composite1.cxx => p3skel_composite1.cxx} (100%) delete mode 100644 panda/src/skel/skel_composite.cxx rename panda/src/text/{text_composite1.cxx => p3text_composite1.cxx} (100%) rename panda/src/text/{text_composite2.cxx => p3text_composite2.cxx} (100%) delete mode 100644 panda/src/text/text_composite.cxx rename panda/src/tform/{tform_composite1.cxx => p3tform_composite1.cxx} (100%) rename panda/src/tform/{tform_composite2.cxx => p3tform_composite2.cxx} (100%) delete mode 100644 panda/src/tform/tform_composite.cxx rename panda/src/tinydisplay/{tinydisplay_composite1.cxx => p3tinydisplay_composite1.cxx} (100%) rename panda/src/tinydisplay/{tinydisplay_composite2.cxx => p3tinydisplay_composite2.cxx} (100%) rename panda/src/vision/{vision_composite1.cxx => p3vision_composite1.cxx} (100%) rename panda/src/vrpn/{vrpn_composite1.cxx => p3vrpn_composite1.cxx} (100%) delete mode 100644 panda/src/vrpn/vrpn_composite.cxx rename panda/src/wgldisplay/{wgldisplay_composite1.cxx => p3wgldisplay_composite1.cxx} (100%) delete mode 100644 panda/src/wgldisplay/wgldisplay_composite.cxx rename panda/src/windisplay/{windisplay_composite1.cxx => p3windisplay_composite1.cxx} (100%) delete mode 100644 panda/src/windisplay/windisplay_composite.cxx rename panda/src/x11display/{x11display_composite1.cxx => p3x11display_composite1.cxx} (100%) delete mode 100644 panda/src/x11display/x11display_composite.cxx rename pandatool/src/cvscopy/{cvscopy_composite1.cxx => p3cvscopy_composite1.cxx} (100%) rename pandatool/src/daeegg/{daeegg_composite1.cxx => p3daeegg_composite1.cxx} (100%) rename pandatool/src/dxf/{dxf_composite1.cxx => p3dxf_composite1.cxx} (100%) rename pandatool/src/eggbase/{eggbase_composite1.cxx => p3eggbase_composite1.cxx} (100%) rename pandatool/src/eggcharbase/{eggcharbase_composite1.cxx => p3eggcharbase_composite1.cxx} (100%) rename pandatool/src/flt/{flt_composite1.cxx => p3flt_composite1.cxx} (100%) rename pandatool/src/imagebase/{imagebase_composite1.cxx => p3imagebase_composite1.cxx} (100%) rename pandatool/src/lwo/{lwo_composite1.cxx => p3lwo_composite1.cxx} (100%) rename pandatool/src/lwoegg/{lwoegg_composite1.cxx => p3lwoegg_composite1.cxx} (100%) rename pandatool/src/maxegg/{maxegg_composite1.cxx => p3maxegg_composite1.cxx} (100%) rename pandatool/src/maya/{maya_composite1.cxx => p3maya_composite1.cxx} (100%) rename pandatool/src/mayaegg/{mayaegg_composite1.cxx => p3mayaegg_composite1.cxx} (100%) rename pandatool/src/palettizer/{palettizer_composite1.cxx => p3palettizer_composite1.cxx} (100%) rename pandatool/src/pandatoolbase/{pandatoolbase_composite1.cxx => p3pandatoolbase_composite1.cxx} (100%) rename pandatool/src/progbase/{progbase_composite1.cxx => p3progbase_composite1.cxx} (100%) rename pandatool/src/pstatserver/{pstatserver_composite1.cxx => p3pstatserver_composite1.cxx} (100%) rename pandatool/src/xfile/{xfile_composite1.cxx => p3xfile_composite1.cxx} (100%) rename pandatool/src/xfileegg/{xfileegg_composite1.cxx => p3xfileegg_composite1.cxx} (100%) diff --git a/contrib/src/ai/Sources.pp b/contrib/src/ai/Sources.pp index bf4e50e33a..051fbd3858 100755 --- a/contrib/src/ai/Sources.pp +++ b/contrib/src/ai/Sources.pp @@ -1,16 +1,16 @@ -#define LOCAL_LIBS contribbase +#define LOCAL_LIBS p3contribbase #define BUILDING_DLL BUILDING_PANDAAI #define OTHER_LIBS \ panda:c \ - express:c putil:c pandabase:c pandaexpress:m \ - interrogatedb:c prc:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + p3express:c p3putil:c p3pandabase:c pandaexpress:m \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #begin lib_target #define TARGET pandaai - #define COMBINED_SOURCES ai_composite1.cxx + #define COMBINED_SOURCES p3ai_composite1.cxx #define SOURCES \ aiBehaviors.h \ @@ -39,8 +39,8 @@ aiNode.cxx \ aiPathFinder.cxx \ aiWorld.cxx \ - ai_composite.cxx \ - ai_composite1.cxx \ + p3ai_composite.cxx \ + p3ai_composite1.cxx \ arrival.cxx \ config_ai.cxx \ evade.cxx \ diff --git a/contrib/src/ai/ai_composite.cxx b/contrib/src/ai/p3ai_composite.cxx similarity index 100% rename from contrib/src/ai/ai_composite.cxx rename to contrib/src/ai/p3ai_composite.cxx diff --git a/contrib/src/ai/ai_composite1.cxx b/contrib/src/ai/p3ai_composite1.cxx similarity index 100% rename from contrib/src/ai/ai_composite1.cxx rename to contrib/src/ai/p3ai_composite1.cxx diff --git a/contrib/src/contribbase/Sources.pp b/contrib/src/contribbase/Sources.pp index 1d6ebf40b4..9c95349a8e 100644 --- a/contrib/src/contribbase/Sources.pp +++ b/contrib/src/contribbase/Sources.pp @@ -1,8 +1,8 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET contribbase + #define TARGET p3contribbase #define SOURCES \ contribbase.cxx contribbase.h contribsymbols.h \ diff --git a/direct/metalibs/direct/Sources.pp b/direct/metalibs/direct/Sources.pp index ea3229a6f8..e5711ab86b 100644 --- a/direct/metalibs/direct/Sources.pp +++ b/direct/metalibs/direct/Sources.pp @@ -9,23 +9,23 @@ #define USE_PACKAGES native_net #define COMPONENT_LIBS \ - directbase dcparser showbase deadrec directd interval distributed motiontrail http + p3directbase p3dcparser p3showbase p3deadrec p3directd p3interval p3distributed p3motiontrail p3http #define OTHER_LIBS \ panda:m \ pandaexpress:m \ - parametrics:c \ - interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m \ - express:c pstatclient:c prc:c pandabase:c linmath:c \ - putil:c display:c event:c pgraph:c pgraphnodes:c \ - gsgbase:c gobj:c mathutil:c \ - lerp:c downloader:c pnmimage:c chan:c \ - pipeline:c cull:c \ - $[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] + p3parametrics:c \ + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + p3express:c p3pstatclient:c p3prc:c p3pandabase:c p3linmath:c \ + p3putil:c p3display:c p3event:c p3pgraph:c p3pgraphnodes:c \ + p3gsgbase:c p3gobj:c p3mathutil:c \ + p3lerp:c p3downloader:c p3pnmimage:c p3chan:c \ + p3pipeline:c p3cull:c \ + $[if $[HAVE_NET],p3net:c] $[if $[WANT_NATIVE_NET],p3nativenet:c] #begin metalib_target - #define TARGET direct + #define TARGET p3direct #define SOURCES direct.cxx #end metalib_target diff --git a/direct/src/dcparse/Sources.pp b/direct/src/dcparse/Sources.pp index e59e8378be..e89232f924 100644 --- a/direct/src/dcparse/Sources.pp +++ b/direct/src/dcparse/Sources.pp @@ -1,14 +1,14 @@ #define LOCAL_LIBS \ - dcparser + p3dcparser #define OTHER_LIBS \ - express:c pandaexpress:m \ - interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m \ - prc:c pstatclient:c pandabase:c linmath:c putil:c \ - pipeline:c downloader:c \ - $[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] \ + p3express:c pandaexpress:m \ + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + p3prc:c p3pstatclient:c p3pandabase:c p3linmath:c p3putil:c \ + p3pipeline:c p3downloader:c \ + $[if $[HAVE_NET],p3net:c] $[if $[WANT_NATIVE_NET],p3nativenet:c] \ panda:m \ - pystub + p3pystub #define C++FLAGS -DWITHIN_PANDA diff --git a/direct/src/dcparser/Sources.pp b/direct/src/dcparser/Sources.pp index 20cf9126d9..7e6610b12b 100644 --- a/direct/src/dcparser/Sources.pp +++ b/direct/src/dcparser/Sources.pp @@ -1,20 +1,20 @@ #define OTHER_LIBS \ - express:c pandaexpress:m \ - pstatclient:c pipeline:c panda:m \ - interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c pandabase:c \ - downloader:c $[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] \ - linmath:c putil:c + p3express:c pandaexpress:m \ + p3pstatclient:c p3pipeline:c panda:m \ + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c p3pandabase:c \ + p3downloader:c $[if $[HAVE_NET],p3net:c] $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + p3linmath:c p3putil:c #define LOCAL_LIBS \ - directbase + p3directbase #define YACC_PREFIX dcyy #define C++FLAGS -DWITHIN_PANDA #define UNIX_SYS_LIBS m #define USE_PACKAGES python #begin lib_target - #define TARGET dcparser + #define TARGET p3dcparser #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/direct/src/dcparser/dcparser_composite.cxx b/direct/src/dcparser/dcparser_composite.cxx deleted file mode 100644 index 1923e43ede..0000000000 --- a/direct/src/dcparser/dcparser_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "dcparser_composite1.cxx" -#include "dcparser_composite2.cxx" diff --git a/direct/src/dcparser/dcparser_composite1.cxx b/direct/src/dcparser/p3dcparser_composite1.cxx similarity index 100% rename from direct/src/dcparser/dcparser_composite1.cxx rename to direct/src/dcparser/p3dcparser_composite1.cxx diff --git a/direct/src/dcparser/dcparser_composite2.cxx b/direct/src/dcparser/p3dcparser_composite2.cxx similarity index 100% rename from direct/src/dcparser/dcparser_composite2.cxx rename to direct/src/dcparser/p3dcparser_composite2.cxx diff --git a/direct/src/deadrec/Sources.pp b/direct/src/deadrec/Sources.pp index 37ec9ce08c..d4aa44db58 100644 --- a/direct/src/deadrec/Sources.pp +++ b/direct/src/deadrec/Sources.pp @@ -1,13 +1,13 @@ #begin lib_target - #define TARGET deadrec + #define TARGET p3deadrec #define LOCAL_LIBS \ - directbase + p3directbase #define OTHER_LIBS \ - express:c linmath:c \ - interrogatedb:c dconfig:c \ - dtoolutil:c dtoolbase:c dtool:m \ - prc:c pandabase:c putil:c \ - pipeline:c + p3express:c p3linmath:c \ + p3interrogatedb:c p3dconfig:c \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + p3prc:c p3pandabase:c p3putil:c \ + p3pipeline:c #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/direct/src/deadrec/deadrec_composite.cxx b/direct/src/deadrec/deadrec_composite.cxx deleted file mode 100644 index 0d239e8896..0000000000 --- a/direct/src/deadrec/deadrec_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "deadrec_composite1.cxx" diff --git a/direct/src/deadrec/deadrec_composite1.cxx b/direct/src/deadrec/p3deadrec_composite1.cxx similarity index 100% rename from direct/src/deadrec/deadrec_composite1.cxx rename to direct/src/deadrec/p3deadrec_composite1.cxx diff --git a/direct/src/directbase/Sources.pp b/direct/src/directbase/Sources.pp index c463cdaade..432770e485 100644 --- a/direct/src/directbase/Sources.pp +++ b/direct/src/directbase/Sources.pp @@ -1,7 +1,7 @@ #define USE_PACKAGES cg // from gobj. #begin lib_target - #define TARGET directbase + #define TARGET p3directbase #define SOURCES \ directbase.cxx directbase.h directsymbols.h \ diff --git a/direct/src/directd/Sources.pp b/direct/src/directd/Sources.pp index 8f78358a3d..48d26a2582 100644 --- a/direct/src/directd/Sources.pp +++ b/direct/src/directd/Sources.pp @@ -4,13 +4,13 @@ #define BUILD_DIRECTORY $[and $[WINDOWS_PLATFORM],$[HAVE_NET],$[HAVE_DIRECTD]] #define LOCAL_LIBS \ - directbase + p3directbase #define OTHER_LIBS \ - $[if $[HAVE_NET],net:c] linmath:c putil:c express:c panda:m pandaexpress:m dtoolconfig dtool + $[if $[HAVE_NET],p3net:c] p3linmath:c p3putil:c p3express:c panda:m pandaexpress:m p3dtoolconfig p3dtool #define WIN_SYS_LIBS $[WIN_SYS_LIBS] user32.lib //advapi32.lib #begin lib_target - #define TARGET directd + #define TARGET p3directd #define SOURCES \ directd.h directd.cxx diff --git a/direct/src/directdServer/Sources.pp b/direct/src/directdServer/Sources.pp index 0bc33598d7..d9cf9f413a 100644 --- a/direct/src/directdServer/Sources.pp +++ b/direct/src/directdServer/Sources.pp @@ -4,15 +4,15 @@ #define BUILD_DIRECTORY $[and $[WINDOWS_PLATFORM],$[HAVE_NET],$[HAVE_DIRECTD]] //#define LOCAL_LIBS \ -// directbase +// p3directbase #define OTHER_LIBS \ - $[if $[HAVE_NET],net:c] linmath:c putil:c express:c panda:m pandaexpress:m dtoolconfig dtool + $[if $[HAVE_NET],p3net:c] p3linmath:c p3putil:c p3express:c panda:m pandaexpress:m p3dtoolconfig p3dtool #define WIN_SYS_LIBS $[WIN_SYS_LIBS] user32.lib //advapi32.lib #begin bin_target - #define TARGET directdServer - #define LOCAL_LIBS directd - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define TARGET p3directdServer + #define LOCAL_LIBS p3directd + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define SOURCES \ directdServer.cxx directdServer.h @@ -21,8 +21,8 @@ #begin test_bin_target #define TARGET directdClient - #define LOCAL_LIBS directd - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define LOCAL_LIBS p3directd + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define SOURCES \ directdClient.cxx directdClient.h diff --git a/direct/src/distributed/Sources.pp b/direct/src/distributed/Sources.pp index b86dddcc11..8625393b3c 100644 --- a/direct/src/distributed/Sources.pp +++ b/direct/src/distributed/Sources.pp @@ -2,17 +2,17 @@ #begin lib_target #define BUILD_TARGET $[HAVE_PYTHON] - #define USE_PACKAGES openssl native_net net + #define USE_PACKAGES openssl native_net p3net - #define TARGET distributed + #define TARGET p3distributed #define LOCAL_LIBS \ - directbase dcparser + p3directbase p3dcparser #define OTHER_LIBS \ - event:c downloader:c panda:m express:c pandaexpress:m \ - interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m \ - prc:c pstatclient:c pandabase:c linmath:c putil:c \ - pipeline:c $[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] + p3event:c p3downloader:c panda:m p3express:c pandaexpress:m \ + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + p3prc:c p3pstatclient:c p3pandabase:c p3linmath:c p3putil:c \ + p3pipeline:c $[if $[HAVE_NET],p3net:c] $[if $[WANT_NATIVE_NET],p3nativenet:c] #define SOURCES \ config_distributed.cxx config_distributed.h \ diff --git a/direct/src/heapq/Sources.pp b/direct/src/heapq/Sources.pp index f7e38c66ee..e072ecf367 100755 --- a/direct/src/heapq/Sources.pp +++ b/direct/src/heapq/Sources.pp @@ -13,11 +13,11 @@ #define OTHER_LIBS \ pandaexpress:m \ - dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c prc:c dtool:m + p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3prc:c p3dtool:m #begin metalib_target - #define TARGET heapq + #define TARGET p3heapq // Tell ppremake to treat this file as if it had been generated via // interrogate. On OSX, this will move it into the .so, instead of diff --git a/direct/src/http/Sources.pp b/direct/src/http/Sources.pp index e6d709693d..9b19488778 100644 --- a/direct/src/http/Sources.pp +++ b/direct/src/http/Sources.pp @@ -2,21 +2,21 @@ #define USE_PACKAGES native_net #define OTHER_LIBS \ - express:c pandaexpress:m \ - pstatclient:c pipeline:c panda:m \ - interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c pandabase:c \ - $[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] \ - linmath:c putil:c + p3express:c pandaexpress:m \ + p3pstatclient:c p3pipeline:c panda:m \ + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c p3pandabase:c \ + $[if $[HAVE_NET],p3net:c] $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + p3linmath:c p3putil:c #define LOCAL_LIBS \ - directbase + p3directbase #define C++FLAGS -DWITHIN_PANDA #define UNIX_SYS_LIBS m #define USE_PACKAGES python #begin lib_target - #define TARGET http + #define TARGET p3http #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/direct/src/http/http_composite1.cxx b/direct/src/http/p3http_composite1.cxx similarity index 100% rename from direct/src/http/http_composite1.cxx rename to direct/src/http/p3http_composite1.cxx diff --git a/direct/src/interval/Sources.pp b/direct/src/interval/Sources.pp index 523fd825eb..afdbc52549 100644 --- a/direct/src/interval/Sources.pp +++ b/direct/src/interval/Sources.pp @@ -1,16 +1,16 @@ #begin lib_target - #define TARGET interval + #define TARGET p3interval #define LOCAL_LIBS \ - directbase + p3directbase #define OTHER_LIBS \ - downloader:c linmath:c lerp:c \ - chan:c event:c gobj:c pnmimage:c mathutil:c \ - pgraph:c putil:c panda:m express:c pandaexpress:m \ - interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m \ - pandabase:c prc:c gsgbase:c pstatclient:c \ - $[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] \ - pipeline:c + p3downloader:c p3linmath:c p3lerp:c \ + p3chan:c p3event:c p3gobj:c p3pnmimage:c p3mathutil:c \ + p3pgraph:c p3putil:c panda:m p3express:c pandaexpress:m \ + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + p3pandabase:c p3prc:c p3gsgbase:c p3pstatclient:c \ + $[if $[HAVE_NET],p3net:c] $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + p3pipeline:c #define SOURCES \ config_interval.cxx config_interval.h \ diff --git a/direct/src/interval/interval_composite.cxx b/direct/src/interval/interval_composite.cxx deleted file mode 100644 index ef71d1ea53..0000000000 --- a/direct/src/interval/interval_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "interval_composite1.cxx" diff --git a/direct/src/interval/interval_composite1.cxx b/direct/src/interval/p3interval_composite1.cxx similarity index 100% rename from direct/src/interval/interval_composite1.cxx rename to direct/src/interval/p3interval_composite1.cxx diff --git a/direct/src/motiontrail/Sources.pp b/direct/src/motiontrail/Sources.pp index 1b879ab77c..514fcf0b69 100644 --- a/direct/src/motiontrail/Sources.pp +++ b/direct/src/motiontrail/Sources.pp @@ -1,34 +1,34 @@ #begin lib_target - #define TARGET motiontrail + #define TARGET p3motiontrail #define LOCAL_LIBS \ - directbase + p3directbase #define OTHER_LIBS \ - linmath:c \ - mathutil:c \ - gobj:c \ - putil:c \ - pipeline:c \ - event:c \ - pstatclient:c \ - pnmimage:c \ - $[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] \ - pgraph:c \ - lerp:c \ + p3linmath:c \ + p3mathutil:c \ + p3gobj:c \ + p3putil:c \ + p3pipeline:c \ + p3event:c \ + p3pstatclient:c \ + p3pnmimage:c \ + $[if $[HAVE_NET],p3net:c] $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + p3pgraph:c \ + p3lerp:c \ panda:m \ - express:c \ - downloader:c \ + p3express:c \ + p3downloader:c \ pandaexpress:m \ - interrogatedb:c \ - dconfig:c \ - dtoolconfig:m \ - dtoolutil:c \ - dtoolbase:c \ - dtool:m \ - pandabase:c \ - prc:c \ - gsgbase:c \ - parametrics:c + p3interrogatedb:c \ + p3dconfig:c \ + p3dtoolconfig:m \ + p3dtoolutil:c \ + p3dtoolbase:c \ + p3dtool:m \ + p3pandabase:c \ + p3prc:c \ + p3gsgbase:c \ + p3parametrics:c #define SOURCES \ diff --git a/direct/src/p3d/panda3d.pdef b/direct/src/p3d/panda3d.pdef index 08ca6de602..dcebbc3fcf 100755 --- a/direct/src/p3d/panda3d.pdef +++ b/direct/src/p3d/panda3d.pdef @@ -90,7 +90,7 @@ class panda3d(package): # that are also needed, but aren't referenced by any code. Again, # note that the .dll extension is automatically replaced with the # platform-specific extension for an executable. - file('libpandagl.dll', 'libtinydisplay.dll') + file('libpandagl.dll', 'libp3tinydisplay.dll') if platform.startswith('win'): file('libpandadx8.dll', 'libpandadx9.dll') @@ -101,12 +101,12 @@ class panda3d(package): aux-display pandagl aux-display pandadx9 aux-display pandadx8 -aux-display tinydisplay +aux-display p3tinydisplay """ else: auxDisplays = """ aux-display pandagl -aux-display tinydisplay +aux-display p3tinydisplay """ file('Config.prc', extract = True, text = """ diff --git a/direct/src/plugin/Sources.pp b/direct/src/plugin/Sources.pp index 1fe7376699..c7fe599b5d 100644 --- a/direct/src/plugin/Sources.pp +++ b/direct/src/plugin/Sources.pp @@ -120,7 +120,7 @@ #define LINK_FORCE_STATIC_RELEASE_C_RUNTIME $[P3D_PLUGIN_MT] #define OTHER_LIBS \ - p3tinyxml$[_MT] $[if $[OSX_PLATFORM],subprocbuffer] + p3tinyxml$[_MT] $[if $[OSX_PLATFORM],p3subprocbuffer] #define COMBINED_SOURCES p3d_plugin_composite1.cxx #define SOURCES $[COREAPI_SOURCES] @@ -145,7 +145,7 @@ #define BUILDING_DLL BUILDING_P3D_PLUGIN #define OTHER_LIBS \ - p3tinyxml $[if $[OSX_PLATFORM],subprocbuffer] + p3tinyxml $[if $[OSX_PLATFORM],p3subprocbuffer] #define COMBINED_SOURCES p3d_plugin_composite1.cxx #define SOURCES $[COREAPI_SOURCES] @@ -242,15 +242,15 @@ #define TARGET p3dpython #define OTHER_LIBS \ - dtoolutil:c dtoolbase:c dtool:m \ - interrogatedb:c dconfig:c dtoolconfig:m \ - express:c pandaexpress:m dxml:c \ - pgraph:c pgraphnodes:c cull:c gsgbase:c gobj:c \ - mathutil:c lerp:c downloader:c pnmimage:c \ - prc:c pstatclient:c pandabase:c linmath:c putil:c \ - pipeline:c event:c display:c panda:m \ - $[if $[WANT_NATIVE_NET],nativenet:c] \ - $[if $[HAVE_NET],net:c] \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3express:c pandaexpress:m p3dxml:c \ + p3pgraph:c p3pgraphnodes:c p3cull:c p3gsgbase:c p3gobj:c \ + p3mathutil:c p3lerp:c p3downloader:c p3pnmimage:c \ + p3prc:c p3pstatclient:c p3pandabase:c p3linmath:c p3putil:c \ + p3pipeline:c p3event:c p3display:c panda:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[HAVE_NET],p3net:c] \ p3tinyxml #define SOURCES \ @@ -292,15 +292,15 @@ #define EXTRA_CDEFS NON_CONSOLE #define OTHER_LIBS \ - dtoolutil:c dtoolbase:c dtool:m \ - interrogatedb:c dconfig:c dtoolconfig:m \ - express:c pandaexpress:m dxml:c \ - pgraph:c pgraphnodes:c cull:c gsgbase:c gobj:c \ - mathutil:c lerp:c downloader:c pnmimage:c \ - prc:c pstatclient:c pandabase:c linmath:c putil:c \ - pipeline:c event:c display:c panda:m \ - $[if $[WANT_NATIVE_NET],nativenet:c] \ - $[if $[HAVE_NET],net:c] \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3express:c pandaexpress:m p3dxml:c \ + p3pgraph:c p3pgraphnodes:c p3cull:c p3gsgbase:c p3gobj:c \ + p3mathutil:c p3lerp:c p3downloader:c p3pnmimage:c \ + p3prc:c p3pstatclient:c p3pandabase:c p3linmath:c p3putil:c \ + p3pipeline:c p3event:c p3display:c panda:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[HAVE_NET],p3net:c] \ p3tinyxml #define SOURCES \ @@ -338,15 +338,15 @@ #define LIB_PREFIX #define OTHER_LIBS \ - dtoolutil:c dtoolbase:c dtool:m \ - interrogatedb:c dconfig:c dtoolconfig:m \ - express:c pandaexpress:m dxml:c \ - pgraph:c pgraphnodes:c cull:c gsgbase:c gobj:c \ - mathutil:c lerp:c downloader:c pnmimage:c \ - prc:c pstatclient:c pandabase:c linmath:c putil:c \ - pipeline:c event:c display:c panda:m \ - $[if $[WANT_NATIVE_NET],nativenet:c] \ - $[if $[HAVE_NET],net:c] \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3express:c pandaexpress:m p3dxml:c \ + p3pgraph:c p3pgraphnodes:c p3cull:c p3gsgbase:c p3gobj:c \ + p3mathutil:c p3lerp:c p3downloader:c p3pnmimage:c \ + p3prc:c p3pstatclient:c p3pandabase:c p3linmath:c p3putil:c \ + p3pipeline:c p3event:c p3display:c panda:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[HAVE_NET],p3net:c] \ p3tinyxml #define SOURCES \ diff --git a/direct/src/plugin_standalone/Sources.pp b/direct/src/plugin_standalone/Sources.pp index c36a0a8465..b96c49d5ab 100644 --- a/direct/src/plugin_standalone/Sources.pp +++ b/direct/src/plugin_standalone/Sources.pp @@ -11,10 +11,10 @@ #define LOCAL_LIBS plugin_common #define OTHER_LIBS \ - prc:c dtoolutil:c dtoolbase:c dtool:m \ - interrogatedb:c dconfig:c dtoolconfig:m \ - pandabase:c downloader:c express:c pandaexpress:m \ - pystub p3tinyxml + p3prc:c p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3pandabase:c p3downloader:c p3express:c pandaexpress:m \ + p3pystub p3tinyxml #define OSX_SYS_FRAMEWORKS Foundation AppKit Carbon @@ -39,10 +39,10 @@ #define LOCAL_LIBS plugin_common #define OTHER_LIBS \ - prc:c dtoolutil:c dtoolbase:c dtool:m \ - interrogatedb:c dconfig:c dtoolconfig:m \ - pandabase:c downloader:c express:c pandaexpress:m \ - pystub p3tinyxml + p3prc:c p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3pandabase:c p3downloader:c p3express:c pandaexpress:m \ + p3pystub p3tinyxml #define OSX_SYS_FRAMEWORKS Foundation AppKit Carbon @@ -68,10 +68,10 @@ #define LOCAL_LIBS plugin_common #define OTHER_LIBS \ - prc:c dtoolutil:c dtoolbase:c dtool:m \ - interrogatedb:c dconfig:c dtoolconfig:m \ - pandabase:c downloader:c express:c pandaexpress:m \ - pystub p3tinyxml + p3prc:c p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3pandabase:c p3downloader:c p3express:c pandaexpress:m \ + p3pystub p3tinyxml #define OSX_SYS_FRAMEWORKS Foundation AppKit Carbon @@ -94,11 +94,11 @@ #define EXTRA_CDEFS BUILDING_P3D_PLUGIN #define OTHER_LIBS \ - prc:c dtoolutil:c dtoolbase:c dtool:m \ - interrogatedb:c dconfig:c dtoolconfig:m \ - pandabase:c downloader:c express:c pandaexpress:m \ - pystub p3tinyxml \ - $[if $[OSX_PLATFORM],subprocbuffer] + p3prc:c p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3pandabase:c p3downloader:c p3express:c pandaexpress:m \ + p3pystub p3tinyxml \ + $[if $[OSX_PLATFORM],p3subprocbuffer] #define OSX_SYS_FRAMEWORKS Foundation AppKit Carbon @@ -126,10 +126,10 @@ #define EXTRA_CDEFS BUILDING_P3D_PLUGIN P3DEMBEDW #define OTHER_LIBS \ - prc:c dtoolutil:c dtoolbase:c dtool:m \ - interrogatedb:c dconfig:c dtoolconfig:m \ - pandabase:c downloader:c express:c pandaexpress:m \ - pystub p3tinyxml + p3prc:c p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3pandabase:c p3downloader:c p3express:c pandaexpress:m \ + p3pystub p3tinyxml #define SOURCES \ panda3dBase.cxx panda3dBase.h panda3dBase.I \ diff --git a/direct/src/showbase/Sources.pp b/direct/src/showbase/Sources.pp index a0d98c6403..b391a73fa2 100644 --- a/direct/src/showbase/Sources.pp +++ b/direct/src/showbase/Sources.pp @@ -1,16 +1,16 @@ #begin lib_target - #define TARGET showbase + #define TARGET p3showbase #define LOCAL_LIBS \ - directbase + p3directbase #define OTHER_LIBS \ - pgraph:c pgraphnodes:c gsgbase:c gobj:c mathutil:c pstatclient:c \ - lerp:c downloader:c pandabase:c pnmimage:c prc:c \ - pipeline:c cull:c \ - $[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] \ - display:c linmath:c event:c putil:c panda:m \ - express:c pandaexpress:m \ - interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + p3pgraph:c p3pgraphnodes:c p3gsgbase:c p3gobj:c p3mathutil:c p3pstatclient:c \ + p3lerp:c p3downloader:c p3pandabase:c p3pnmimage:c p3prc:c \ + p3pipeline:c p3cull:c \ + $[if $[HAVE_NET],p3net:c] $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + p3display:c p3linmath:c p3event:c p3putil:c panda:m \ + p3express:c pandaexpress:m \ + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define WIN_SYS_LIBS \ User32.lib @@ -26,7 +26,7 @@ // This is a pure C module; it involves no Panda code or C++ code. #begin lib_target #define BUILD_TARGET $[HAVE_PYTHON] - #define TARGET extend_frozen + #define TARGET p3extend_frozen #define LIB_PREFIX #if $[OSX_PLATFORM] #define LINK_AS_BUNDLE 1 diff --git a/direct/src/showutil/FreezeTool.py b/direct/src/showutil/FreezeTool.py index e02b90a7cc..00246e223d 100644 --- a/direct/src/showutil/FreezeTool.py +++ b/direct/src/showutil/FreezeTool.py @@ -10,11 +10,11 @@ import platform import types from distutils.sysconfig import PREFIX, get_python_inc, get_python_version -# Temporary (?) try..except to protect against unbuilt extend_frozen. +# Temporary (?) try..except to protect against unbuilt p3extend_frozen. try: - import extend_frozen + import p3extend_frozen except ImportError: - extend_frozen = None + p3extend_frozen = None import direct from pandac.PandaModules import * @@ -1371,7 +1371,7 @@ class PandaModuleFinder(modulefinder.ModuleFinder): # though. raise - if extend_frozen and extend_frozen.is_frozen_module(name): + if p3extend_frozen and p3extend_frozen.is_frozen_module(name): # It's a frozen module. return (None, name, ('', '', imp.PY_FROZEN)) @@ -1390,7 +1390,7 @@ class PandaModuleFinder(modulefinder.ModuleFinder): def load_module(self, fqname, fp, pathname, (suffix, mode, type)): if type == imp.PY_FROZEN: # It's a frozen module. - co, isPackage = extend_frozen.get_frozen_module_code(pathname) + co, isPackage = p3extend_frozen.get_frozen_module_code(pathname) m = self.add_module(fqname) m.__file__ = '' if isPackage: diff --git a/dmodels/Sources.pp b/dmodels/Sources.pp index 395f6c15a0..9784bd2fac 100644 --- a/dmodels/Sources.pp +++ b/dmodels/Sources.pp @@ -1,4 +1,4 @@ // This is the toplevel directory for a models tree. #define DIR_TYPE models_toplevel -#define TEXATTRIB_DIR src/maps +#define TEXATTRIB_DIR src/p3maps diff --git a/dmodels/src/fonts/Sources.pp b/dmodels/src/fonts/Sources.pp index e0185d5787..50beb72934 100644 --- a/dmodels/src/fonts/Sources.pp +++ b/dmodels/src/fonts/Sources.pp @@ -1,8 +1,8 @@ #define DIR_TYPE models -#define INSTALL_TO models/fonts +#define INSTALL_TO models/p3fonts //#begin install_egg -// #define SOURCES Comic.egg +// #define SOURCES Comic.p3egg //#end install_egg diff --git a/dmodels/src/gui/Sources.pp b/dmodels/src/gui/Sources.pp index 4b336411af..6cd76d5148 100644 --- a/dmodels/src/gui/Sources.pp +++ b/dmodels/src/gui/Sources.pp @@ -1,5 +1,5 @@ #define DIR_TYPE models -#define INSTALL_TO models/gui +#define INSTALL_TO models/p3gui #begin flt_egg #define SOURCES $[wildcard *.flt] @@ -10,5 +10,5 @@ #end install_egg #begin install_egg - #define SOURCES radio_button_gui.egg + #define SOURCES radio_button_gui.p3egg #end install_egg diff --git a/dmodels/src/icons/Sources.pp b/dmodels/src/icons/Sources.pp index 1e354e6c2e..951e82175a 100644 --- a/dmodels/src/icons/Sources.pp +++ b/dmodels/src/icons/Sources.pp @@ -1,5 +1,5 @@ #define DIR_TYPE models -#define INSTALL_TO icons +#define INSTALL_TO p3icons #define fltfiles $[wildcard *.flt] #begin flt_egg @@ -12,9 +12,9 @@ #end maya_egg #define eggfiles $[wildcard *.egg] -#begin egg +#begin p3egg #define SOURCES $[eggfiles] -#end egg +#end p3egg #begin install_icons #define SOURCES \ diff --git a/dmodels/src/level_editor/Sources.pp b/dmodels/src/level_editor/Sources.pp index a1745b8d7f..1391362fcf 100644 --- a/dmodels/src/level_editor/Sources.pp +++ b/dmodels/src/level_editor/Sources.pp @@ -1,5 +1,5 @@ #define DIR_TYPE models -#define INSTALL_TO models/level_editor +#define INSTALL_TO models/p3level_editor #begin flt_egg #define SOURCES $[wildcard *.flt] @@ -8,6 +8,6 @@ // #begin install_egg // #define SOURCES \ -// donalds_dock_layout.egg minnies_melody_land_layout.egg \ -// the_burrrgh_layout.egg toontown_central_layout.egg +// donalds_dock_layout.p3egg minnies_melody_land_layout.p3egg \ +// the_burrrgh_layout.p3egg toontown_central_layout.p3egg // #end install_egg diff --git a/dmodels/src/misc/Sources.pp b/dmodels/src/misc/Sources.pp index a0ca3a2ab8..eb401fe928 100644 --- a/dmodels/src/misc/Sources.pp +++ b/dmodels/src/misc/Sources.pp @@ -1,5 +1,5 @@ #define DIR_TYPE models -#define INSTALL_TO models/misc +#define INSTALL_TO models/p3misc #begin flt_egg #define SOURCES $[wildcard *.flt] @@ -8,15 +8,15 @@ #begin install_egg #define UNPAL_SOURCES \ - camera.egg rgbCube.egg xyzAxis.egg + camera.p3egg rgbCube.p3egg xyzAxis.p3egg #end install_egg #begin install_egg #define SOURCES \ - gridBack.egg objectHandles.egg sphere.egg smiley.egg lilsmiley.egg + gridBack.p3egg objectHandles.p3egg sphere.p3egg smiley.p3egg lilsmiley.p3egg #end install_egg #begin install_egg #define SOURCES \ - fade_sphere.egg fade.egg iris.egg + fade_sphere.p3egg fade.p3egg iris.p3egg #end install_egg diff --git a/dtool/Config.pp b/dtool/Config.pp index 9d8c752293..dcb9c8b296 100644 --- a/dtool/Config.pp +++ b/dtool/Config.pp @@ -335,7 +335,7 @@ // genPyCode. You may wish to add to this list to add your own // libraries, or if you want to use some of the more obscure // interfaces like libpandaegg and libpandafx. -#defer GENPYCODE_LIBS libpandaexpress libpanda libpandaphysics libdirect libpandafx libp3vision $[if $[HAVE_ODE],libpandaode] +#defer GENPYCODE_LIBS libpandaexpress libpanda libpandaphysics libp3direct libpandafx libp3vision $[if $[HAVE_ODE],libpandaode] // Normally, Python source files are copied into the INSTALL_LIB_DIR // defined above, along with the compiled C++ library objects, when diff --git a/dtool/metalibs/dtool/Sources.pp b/dtool/metalibs/dtool/Sources.pp index a34ca1680f..d5f7ef930f 100644 --- a/dtool/metalibs/dtool/Sources.pp +++ b/dtool/metalibs/dtool/Sources.pp @@ -7,10 +7,10 @@ #define DIR_TYPE metalib #define BUILDING_DLL BUILDING_DTOOL -#define COMPONENT_LIBS dtoolutil dtoolbase +#define COMPONENT_LIBS p3dtoolutil p3dtoolbase #begin metalib_target - #define TARGET dtool + #define TARGET p3dtool #define SOURCES dtool.cxx #end metalib_target diff --git a/dtool/metalibs/dtoolconfig/Sources.pp b/dtool/metalibs/dtoolconfig/Sources.pp index 0791e97f5c..fe99ee6351 100644 --- a/dtool/metalibs/dtoolconfig/Sources.pp +++ b/dtool/metalibs/dtoolconfig/Sources.pp @@ -7,12 +7,12 @@ #define DIR_TYPE metalib #define BUILDING_DLL BUILDING_DTOOLCONFIG -#define COMPONENT_LIBS interrogatedb dconfig prc -#define LOCAL_LIBS dtoolutil dtoolbase +#define COMPONENT_LIBS p3interrogatedb p3dconfig p3prc +#define LOCAL_LIBS p3dtoolutil p3dtoolbase #define USE_PACKAGES python ssl #begin metalib_target - #define TARGET dtoolconfig + #define TARGET p3dtoolconfig #define SOURCES dtoolconfig.cxx \ $[if $[HAVE_PYTHON], pydtool.cxx] diff --git a/dtool/src/cppparser/Sources.pp b/dtool/src/cppparser/Sources.pp index 24dd507c64..96bb4c7ff3 100644 --- a/dtool/src/cppparser/Sources.pp +++ b/dtool/src/cppparser/Sources.pp @@ -1,10 +1,10 @@ #define BUILD_DIRECTORY $[HAVE_INTERROGATE] -#define LOCAL_LIBS dtoolutil dtoolbase +#define LOCAL_LIBS p3dtoolutil p3dtoolbase #define YACC_PREFIX cppyy #begin static_lib_target - #define TARGET cppParser + #define TARGET p3cppParser #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/dtool/src/cppparser/cppParser_composite.cxx b/dtool/src/cppparser/cppParser_composite.cxx deleted file mode 100644 index ac6a4bbfc2..0000000000 --- a/dtool/src/cppparser/cppParser_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "cppParser_composite1.cxx" -#include "cppParser_composite2.cxx" diff --git a/dtool/src/cppparser/cppParser_composite1.cxx b/dtool/src/cppparser/p3cppParser_composite1.cxx similarity index 100% rename from dtool/src/cppparser/cppParser_composite1.cxx rename to dtool/src/cppparser/p3cppParser_composite1.cxx diff --git a/dtool/src/cppparser/cppParser_composite2.cxx b/dtool/src/cppparser/p3cppParser_composite2.cxx similarity index 100% rename from dtool/src/cppparser/cppParser_composite2.cxx rename to dtool/src/cppparser/p3cppParser_composite2.cxx diff --git a/dtool/src/dconfig/Sources.pp b/dtool/src/dconfig/Sources.pp index 5c87f6adcf..7ffbeae592 100644 --- a/dtool/src/dconfig/Sources.pp +++ b/dtool/src/dconfig/Sources.pp @@ -1,7 +1,7 @@ -#define LOCAL_LIBS dtoolutil dtoolbase prc +#define LOCAL_LIBS p3dtoolutil p3dtoolbase p3prc #begin lib_target - #define TARGET dconfig + #define TARGET p3dconfig #define COMBINED_SOURCES $[TARGET]_composite1.cxx @@ -21,23 +21,23 @@ #begin test_bin_target #define TARGET test_config #define SOURCES test_config.cxx - #define LOCAL_LIBS dconfig $[LOCAL_LIBS] + #define LOCAL_LIBS p3dconfig $[LOCAL_LIBS] #end test_bin_target #begin test_bin_target #define TARGET test_expand #define SOURCES test_expand.cxx - #define LOCAL_LIBS dconfig $[LOCAL_LIBS] + #define LOCAL_LIBS p3dconfig $[LOCAL_LIBS] #end test_bin_target #begin test_bin_target #define TARGET test_pfstream #define SOURCES test_pfstream.cxx - #define LOCAL_LIBS dconfig $[LOCAL_LIBS] + #define LOCAL_LIBS p3dconfig $[LOCAL_LIBS] #end test_bin_target #begin test_bin_target #define TARGET test_searchpath #define SOURCES test_searchpath.cxx - #define LOCAL_LIBS dconfig $[LOCAL_LIBS] + #define LOCAL_LIBS p3dconfig $[LOCAL_LIBS] #end test_bin_target diff --git a/dtool/src/dconfig/dconfig_composite.cxx b/dtool/src/dconfig/dconfig_composite.cxx deleted file mode 100644 index 082a6ba5fe..0000000000 --- a/dtool/src/dconfig/dconfig_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "dconfig_composite1.cxx" diff --git a/dtool/src/dconfig/dconfig_composite1.cxx b/dtool/src/dconfig/p3dconfig_composite1.cxx similarity index 100% rename from dtool/src/dconfig/dconfig_composite1.cxx rename to dtool/src/dconfig/p3dconfig_composite1.cxx diff --git a/dtool/src/dtoolbase/Sources.pp b/dtool/src/dtoolbase/Sources.pp index 2697507ba5..de0eb225e3 100644 --- a/dtool/src/dtoolbase/Sources.pp +++ b/dtool/src/dtoolbase/Sources.pp @@ -2,7 +2,7 @@ #define USE_PACKAGES threads #begin lib_target - #define TARGET dtoolbase + #define TARGET p3dtoolbase #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/dtool/src/dtoolbase/dtoolbase_composite1.cxx b/dtool/src/dtoolbase/p3dtoolbase_composite1.cxx similarity index 100% rename from dtool/src/dtoolbase/dtoolbase_composite1.cxx rename to dtool/src/dtoolbase/p3dtoolbase_composite1.cxx diff --git a/dtool/src/dtoolbase/dtoolbase_composite2.cxx b/dtool/src/dtoolbase/p3dtoolbase_composite2.cxx similarity index 100% rename from dtool/src/dtoolbase/dtoolbase_composite2.cxx rename to dtool/src/dtoolbase/p3dtoolbase_composite2.cxx diff --git a/dtool/src/dtoolutil/Sources.pp b/dtool/src/dtoolutil/Sources.pp index 6cecd97158..b73ee2e067 100644 --- a/dtool/src/dtoolutil/Sources.pp +++ b/dtool/src/dtoolutil/Sources.pp @@ -1,6 +1,6 @@ #begin lib_target - #define TARGET dtoolutil - #define LOCAL_LIBS dtoolbase + #define TARGET p3dtoolutil + #define LOCAL_LIBS p3dtoolbase #if $[ne $[PLATFORM], FreeBSD] #define UNIX_SYS_LIBS dl #endif @@ -73,14 +73,14 @@ #begin test_bin_target #define TARGET test_pfstream - #define LOCAL_LIBS dtoolbase dtoolutil + #define LOCAL_LIBS p3dtoolbase p3dtoolutil #define SOURCES test_pfstream.cxx #end test_bin_target #begin test_bin_target #define TARGET test_touch - #define LOCAL_LIBS dtoolbase dtoolutil + #define LOCAL_LIBS p3dtoolbase p3dtoolutil #define SOURCES test_touch.cxx #end test_bin_target diff --git a/dtool/src/dtoolutil/dtoolutil_composite.cxx b/dtool/src/dtoolutil/dtoolutil_composite.cxx deleted file mode 100644 index b1b8819d12..0000000000 --- a/dtool/src/dtoolutil/dtoolutil_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "dtoolutil_composite1.cxx" -#include "dtoolutil_composite2.cxx" diff --git a/dtool/src/dtoolutil/dtoolutil_composite1.cxx b/dtool/src/dtoolutil/p3dtoolutil_composite1.cxx similarity index 100% rename from dtool/src/dtoolutil/dtoolutil_composite1.cxx rename to dtool/src/dtoolutil/p3dtoolutil_composite1.cxx diff --git a/dtool/src/dtoolutil/dtoolutil_composite2.cxx b/dtool/src/dtoolutil/p3dtoolutil_composite2.cxx similarity index 100% rename from dtool/src/dtoolutil/dtoolutil_composite2.cxx rename to dtool/src/dtoolutil/p3dtoolutil_composite2.cxx diff --git a/dtool/src/interrogate/Sources.pp b/dtool/src/interrogate/Sources.pp index 8bc1e057fe..667f344fd5 100644 --- a/dtool/src/interrogate/Sources.pp +++ b/dtool/src/interrogate/Sources.pp @@ -1,6 +1,6 @@ #define BUILD_DIRECTORY $[HAVE_INTERROGATE] -#define LOCAL_LIBS cppParser interrogatedb dconfig dtoolutil dtoolbase pystub +#define LOCAL_LIBS p3cppParser p3interrogatedb p3dconfig p3dtoolutil p3dtoolbase p3pystub #define USE_PACKAGES openssl #begin bin_target diff --git a/dtool/src/interrogate/interrogate_composite.cxx b/dtool/src/interrogate/interrogate_composite.cxx deleted file mode 100644 index a195d50227..0000000000 --- a/dtool/src/interrogate/interrogate_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "interrogate_composite1.cxx" -#include "interrogate_composite2.cxx" diff --git a/dtool/src/interrogatedb/Sources.pp b/dtool/src/interrogatedb/Sources.pp index 4596d2e0b4..572467bd65 100644 --- a/dtool/src/interrogatedb/Sources.pp +++ b/dtool/src/interrogatedb/Sources.pp @@ -1,7 +1,7 @@ -#define LOCAL_LIBS dconfig dtoolutil dtoolbase +#define LOCAL_LIBS p3dconfig p3dtoolutil p3dtoolbase #begin lib_target - #define TARGET interrogatedb + #define TARGET p3interrogatedb #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/dtool/src/interrogatedb/interrogatedb_composite.cxx b/dtool/src/interrogatedb/interrogatedb_composite.cxx deleted file mode 100644 index b2cbedaf08..0000000000 --- a/dtool/src/interrogatedb/interrogatedb_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "interrogatedb_composite1.cxx" -#include "interrogatedb_composite2.cxx" diff --git a/dtool/src/interrogatedb/interrogatedb_composite1.cxx b/dtool/src/interrogatedb/p3interrogatedb_composite1.cxx similarity index 100% rename from dtool/src/interrogatedb/interrogatedb_composite1.cxx rename to dtool/src/interrogatedb/p3interrogatedb_composite1.cxx diff --git a/dtool/src/interrogatedb/interrogatedb_composite2.cxx b/dtool/src/interrogatedb/p3interrogatedb_composite2.cxx similarity index 100% rename from dtool/src/interrogatedb/interrogatedb_composite2.cxx rename to dtool/src/interrogatedb/p3interrogatedb_composite2.cxx diff --git a/dtool/src/newheader/Sources.pp b/dtool/src/newheader/Sources.pp index 70f13c7fb1..0cfb46a643 100644 --- a/dtool/src/newheader/Sources.pp +++ b/dtool/src/newheader/Sources.pp @@ -3,7 +3,7 @@ #define BUILD_DIRECTORY $[CTPROJS] #if $[CTPROJS] - #define LOCAL_LIBS dtoolbase pystub + #define LOCAL_LIBS p3dtoolbase p3pystub #begin bin_target #define TARGET newheader diff --git a/dtool/src/prc/Sources.pp b/dtool/src/prc/Sources.pp index 60f2b708ee..1ecf9b1ac3 100644 --- a/dtool/src/prc/Sources.pp +++ b/dtool/src/prc/Sources.pp @@ -1,8 +1,8 @@ -#define LOCAL_LIBS dtoolutil dtoolbase +#define LOCAL_LIBS p3dtoolutil p3dtoolbase #define USE_PACKAGES openssl #begin lib_target - #define TARGET prc + #define TARGET p3prc #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/dtool/src/prc/prc_composite1.cxx b/dtool/src/prc/p3prc_composite1.cxx similarity index 100% rename from dtool/src/prc/prc_composite1.cxx rename to dtool/src/prc/p3prc_composite1.cxx diff --git a/dtool/src/prc/prc_composite2.cxx b/dtool/src/prc/p3prc_composite2.cxx similarity index 100% rename from dtool/src/prc/prc_composite2.cxx rename to dtool/src/prc/p3prc_composite2.cxx diff --git a/dtool/src/prc/prc_composite.cxx b/dtool/src/prc/prc_composite.cxx deleted file mode 100644 index 31439b98f4..0000000000 --- a/dtool/src/prc/prc_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "prc_composite1.cxx" -#include "prc_composite2.cxx" diff --git a/dtool/src/prckeys/Sources.pp b/dtool/src/prckeys/Sources.pp index a2eb2175e7..7580258555 100644 --- a/dtool/src/prckeys/Sources.pp +++ b/dtool/src/prckeys/Sources.pp @@ -1,4 +1,4 @@ -#define LOCAL_LIBS dtoolutil dtoolbase prc dconfig interrogatedb pystub +#define LOCAL_LIBS p3dtoolutil p3dtoolbase p3prc p3dconfig p3interrogatedb p3pystub #begin bin_target #define BUILD_TARGET $[HAVE_OPENSSL] diff --git a/dtool/src/pystub/Sources.pp b/dtool/src/pystub/Sources.pp index ab55bc7b2a..58bf9a076a 100644 --- a/dtool/src/pystub/Sources.pp +++ b/dtool/src/pystub/Sources.pp @@ -1,8 +1,8 @@ #define BUILDING_DLL BUILDING_DTOOLCONFIG -#define LOCAL_LIBS dtoolbase +#define LOCAL_LIBS p3dtoolbase #begin lib_target - #define TARGET pystub + #define TARGET p3pystub #define SOURCES \ pystub.cxx pystub.h diff --git a/dtool/src/test_interrogate/Sources.pp b/dtool/src/test_interrogate/Sources.pp index a36d5868f3..c8ef051e16 100644 --- a/dtool/src/test_interrogate/Sources.pp +++ b/dtool/src/test_interrogate/Sources.pp @@ -1,5 +1,5 @@ #define BUILD_DIRECTORY $[HAVE_INTERROGATE] -#define LOCAL_LIBS interrogatedb dconfig dtoolutil dtoolbase pystub +#define LOCAL_LIBS p3interrogatedb p3dconfig p3dtoolutil p3dtoolbase p3pystub #define USE_PACKAGES openssl #begin bin_target diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index eb1017e3ef..d0e6c1bf1f 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -110,7 +110,7 @@ def usage(problem): print " --host URL (set the host url (runtime build only))" print " --threads N (use the multithreaded build system. see manual)" print " --osxtarget N (the OSX version number to build for (OSX only))" - print " --override \"O=V\" (override dtool_config/prc option value)" + print " --override \"O=V\" (override dtool_config/p3prc option value)" print " --static (builds libraries for static linking)" print "" for pkg in PkgListGet(): @@ -1912,8 +1912,8 @@ else: if (sys.platform.startswith("win")): configprc = configprc.replace("$HOME/.panda3d", "$USER_APPDATA/Panda3D-%s" % MAJOR_VERSION) else: - configprc = configprc.replace("aux-display pandadx9", "") - configprc = configprc.replace("aux-display pandadx8", "") + configprc = configprc.replace("aux-p3display pandadx9", "") + configprc = configprc.replace("aux-p3display pandadx8", "") if (sys.platform == "darwin"): configprc = configprc.replace(".panda3d/cache", "Library/Caches/Panda3D-%s" % MAJOR_VERSION) @@ -2190,10 +2190,10 @@ COMMON_PANDA_LIBS=[ ] + COMMON_DTOOL_LIBS COMMON_EGG2X_LIBS=[ - 'libeggbase.lib', - 'libprogbase.lib', - 'libconverter.lib', - 'libpandatoolbase.lib', + 'libp3eggbase.lib', + 'libp3progbase.lib', + 'libp3converter.lib', + 'libp3pandatoolbase.lib', 'libpandaegg.dll', ] + COMMON_PANDA_LIBS @@ -2225,34 +2225,36 @@ if (sys.platform.startswith("win")): # OPTS=['DIR:dtool/src/dtoolbase', 'BUILDING:DTOOL'] -TargetAdd('dtoolbase_composite1.obj', opts=OPTS, input='dtoolbase_composite1.cxx') -TargetAdd('dtoolbase_composite2.obj', opts=OPTS, input='dtoolbase_composite2.cxx') -TargetAdd('dtoolbase_lookup3.obj', opts=OPTS, input='lookup3.c') -TargetAdd('dtoolbase_indent.obj', opts=OPTS, input='indent.cxx') +TargetAdd('p3dtoolbase_composite1.obj', opts=OPTS, input='p3dtoolbase_composite1.cxx') +TargetAdd('p3dtoolbase_composite2.obj', opts=OPTS, input='p3dtoolbase_composite2.cxx') +TargetAdd('p3dtoolbase_lookup3.obj', opts=OPTS, input='lookup3.c') +TargetAdd('p3dtoolbase_indent.obj', opts=OPTS, input='indent.cxx') # # DIRECTORY: dtool/src/dtoolutil/ # OPTS=['DIR:dtool/src/dtoolutil', 'BUILDING:DTOOL'] -TargetAdd('dtoolutil_composite.obj', opts=OPTS, input='dtoolutil_composite.cxx') +TargetAdd('p3dtoolutil_composite1.obj', opts=OPTS, input='p3dtoolutil_composite1.cxx') +TargetAdd('p3dtoolutil_composite2.obj', opts=OPTS, input='p3dtoolutil_composite2.cxx') if (sys.platform == 'darwin'): - TargetAdd('dtoolutil_filename_assist.obj', opts=OPTS, input='filename_assist.mm') + TargetAdd('p3dtoolutil_filename_assist.obj', opts=OPTS, input='filename_assist.mm') # # DIRECTORY: dtool/metalibs/dtool/ # OPTS=['DIR:dtool/metalibs/dtool', 'BUILDING:DTOOL'] -TargetAdd('dtool_dtool.obj', opts=OPTS, input='dtool.cxx') -TargetAdd('libp3dtool.dll', input='dtool_dtool.obj') -TargetAdd('libp3dtool.dll', input='dtoolutil_composite.obj') +TargetAdd('p3dtool_dtool.obj', opts=OPTS, input='dtool.cxx') +TargetAdd('libp3dtool.dll', input='p3dtool_dtool.obj') +TargetAdd('libp3dtool.dll', input='p3dtoolutil_composite1.obj') +TargetAdd('libp3dtool.dll', input='p3dtoolutil_composite2.obj') if (sys.platform == 'darwin'): - TargetAdd('libp3dtool.dll', input='dtoolutil_filename_assist.obj') -TargetAdd('libp3dtool.dll', input='dtoolbase_composite1.obj') -TargetAdd('libp3dtool.dll', input='dtoolbase_composite2.obj') -TargetAdd('libp3dtool.dll', input='dtoolbase_indent.obj') -TargetAdd('libp3dtool.dll', input='dtoolbase_lookup3.obj') + TargetAdd('libp3dtool.dll', input='p3dtoolutil_filename_assist.obj') +TargetAdd('libp3dtool.dll', input='p3dtoolbase_composite1.obj') +TargetAdd('libp3dtool.dll', input='p3dtoolbase_composite2.obj') +TargetAdd('libp3dtool.dll', input='p3dtoolbase_indent.obj') +TargetAdd('libp3dtool.dll', input='p3dtoolbase_lookup3.obj') TargetAdd('libp3dtool.dll', opts=['ADVAPI','WINSHELL','WINKERNEL']) # @@ -2262,32 +2264,36 @@ TargetAdd('libp3dtool.dll', opts=['ADVAPI','WINSHELL','WINKERNEL']) if (not RUNTIME): OPTS=['DIR:dtool/src/cppparser', 'BISONPREFIX_cppyy'] CreateFile(GetOutputDir()+"/include/cppBison.h") - TargetAdd('cppParser_cppBison.obj', opts=OPTS, input='cppBison.yxx') - TargetAdd('cppBison.h', input='cppParser_cppBison.obj', opts=['DEPENDENCYONLY']) - TargetAdd('cppParser_composite.obj', opts=OPTS, input='cppParser_composite.cxx') - TargetAdd('libcppParser.ilb', input='cppParser_composite.obj') - TargetAdd('libcppParser.ilb', input='cppParser_cppBison.obj') + TargetAdd('p3cppParser_cppBison.obj', opts=OPTS, input='cppBison.yxx') + TargetAdd('cppBison.h', input='p3cppParser_cppBison.obj', opts=['DEPENDENCYONLY']) + TargetAdd('p3cppParser_composite1.obj', opts=OPTS, input='p3cppParser_composite1.cxx') + TargetAdd('p3cppParser_composite2.obj', opts=OPTS, input='p3cppParser_composite2.cxx') + TargetAdd('libp3cppParser.ilb', input='p3cppParser_composite1.obj') + TargetAdd('libp3cppParser.ilb', input='p3cppParser_composite2.obj') + TargetAdd('libp3cppParser.ilb', input='p3cppParser_cppBison.obj') # # DIRECTORY: dtool/src/prc/ # OPTS=['DIR:dtool/src/prc', 'BUILDING:DTOOLCONFIG', 'OPENSSL'] -TargetAdd('prc_composite.obj', opts=OPTS, input='prc_composite.cxx') +TargetAdd('p3prc_composite1.obj', opts=OPTS, input='p3prc_composite1.cxx') +TargetAdd('p3prc_composite2.obj', opts=OPTS, input='p3prc_composite2.cxx') # # DIRECTORY: dtool/src/dconfig/ # OPTS=['DIR:dtool/src/dconfig', 'BUILDING:DTOOLCONFIG'] -TargetAdd('dconfig_composite.obj', opts=OPTS, input='dconfig_composite.cxx') +TargetAdd('p3dconfig_composite1.obj', opts=OPTS, input='p3dconfig_composite1.cxx') # # DIRECTORY: dtool/src/interrogatedb/ # OPTS=['DIR:dtool/src/interrogatedb', 'BUILDING:DTOOLCONFIG'] -TargetAdd('interrogatedb_composite.obj', opts=OPTS, input='interrogatedb_composite.cxx') +TargetAdd('p3interrogatedb_composite1.obj', opts=OPTS, input='p3interrogatedb_composite1.cxx') +TargetAdd('p3interrogatedb_composite2.obj', opts=OPTS, input='p3interrogatedb_composite2.cxx') # # DIRECTORY: dtool/metalibs/dtoolconfig/ @@ -2295,16 +2301,18 @@ TargetAdd('interrogatedb_composite.obj', opts=OPTS, input='interrogatedb_composi OPTS=['DIR:dtool/metalibs/dtoolconfig', 'BUILDING:DTOOLCONFIG'] if (PkgSkip("PYTHON")): - TargetAdd('dtoolconfig_pydtool.obj', opts=OPTS, input="null.cxx") + TargetAdd('p3dtoolconfig_pydtool.obj', opts=OPTS, input="null.cxx") else: - TargetAdd('dtoolconfig_pydtool.obj', opts=OPTS, input="pydtool.cxx") -TargetAdd('dtoolconfig_dtoolconfig.obj', opts=OPTS, input='dtoolconfig.cxx') -TargetAdd('dtoolconfig_pydtool.obj', dep='dtool_have_python.dat') -TargetAdd('libp3dtoolconfig.dll', input='dtoolconfig_dtoolconfig.obj') -TargetAdd('libp3dtoolconfig.dll', input='dtoolconfig_pydtool.obj') -TargetAdd('libp3dtoolconfig.dll', input='interrogatedb_composite.obj') -TargetAdd('libp3dtoolconfig.dll', input='dconfig_composite.obj') -TargetAdd('libp3dtoolconfig.dll', input='prc_composite.obj') + TargetAdd('p3dtoolconfig_pydtool.obj', opts=OPTS, input="pydtool.cxx") +TargetAdd('p3dtoolconfig_dtoolconfig.obj', opts=OPTS, input='dtoolconfig.cxx') +TargetAdd('p3dtoolconfig_pydtool.obj', dep='dtool_have_python.dat') +TargetAdd('libp3dtoolconfig.dll', input='p3dtoolconfig_dtoolconfig.obj') +TargetAdd('libp3dtoolconfig.dll', input='p3dtoolconfig_pydtool.obj') +TargetAdd('libp3dtoolconfig.dll', input='p3interrogatedb_composite1.obj') +TargetAdd('libp3dtoolconfig.dll', input='p3interrogatedb_composite2.obj') +TargetAdd('libp3dtoolconfig.dll', input='p3dconfig_composite1.obj') +TargetAdd('libp3dtoolconfig.dll', input='p3prc_composite1.obj') +TargetAdd('libp3dtoolconfig.dll', input='p3prc_composite2.obj') TargetAdd('libp3dtoolconfig.dll', input='libp3dtool.dll') TargetAdd('libp3dtoolconfig.dll', opts=['ADVAPI', 'OPENSSL']) @@ -2313,8 +2321,8 @@ TargetAdd('libp3dtoolconfig.dll', opts=['ADVAPI', 'OPENSSL']) # OPTS=['DIR:dtool/src/pystub', 'BUILDING:DTOOLCONFIG'] -TargetAdd('pystub_pystub.obj', opts=OPTS, input='pystub.cxx') -TargetAdd('libp3pystub.dll', input='pystub_pystub.obj') +TargetAdd('p3pystub_pystub.obj', opts=OPTS, input='pystub.cxx') +TargetAdd('libp3pystub.dll', input='p3pystub_pystub.obj') TargetAdd('libp3pystub.dll', input='libp3dtool.dll') TargetAdd('libp3pystub.dll', opts=['ADVAPI']) @@ -2324,22 +2332,24 @@ TargetAdd('libp3pystub.dll', opts=['ADVAPI']) if (not RUNTIME): OPTS=['DIR:dtool/src/interrogate', 'DIR:dtool/src/cppparser', 'DIR:dtool/src/interrogatedb'] - TargetAdd('interrogate_composite.obj', opts=OPTS, input='interrogate_composite.cxx') - TargetAdd('interrogate.exe', input='interrogate_composite.obj') - TargetAdd('interrogate.exe', input='libcppParser.ilb') + TargetAdd('interrogate_composite1.obj', opts=OPTS, input='interrogate_composite1.cxx') + TargetAdd('interrogate_composite2.obj', opts=OPTS, input='interrogate_composite2.cxx') + TargetAdd('interrogate.exe', input='interrogate_composite1.obj') + TargetAdd('interrogate.exe', input='interrogate_composite2.obj') + TargetAdd('interrogate.exe', input='libp3cppParser.ilb') TargetAdd('interrogate.exe', input=COMMON_DTOOL_LIBS_PYSTUB) TargetAdd('interrogate.exe', opts=['ADVAPI', 'OPENSSL', 'WINSHELL']) TargetAdd('interrogate_module_interrogate_module.obj', opts=OPTS, input='interrogate_module.cxx') TargetAdd('interrogate_module.exe', input='interrogate_module_interrogate_module.obj') - TargetAdd('interrogate_module.exe', input='libcppParser.ilb') + TargetAdd('interrogate_module.exe', input='libp3cppParser.ilb') TargetAdd('interrogate_module.exe', input=COMMON_DTOOL_LIBS_PYSTUB) TargetAdd('interrogate_module.exe', opts=['ADVAPI', 'OPENSSL', 'WINSHELL']) if (not RTDIST): TargetAdd('parse_file_parse_file.obj', opts=OPTS, input='parse_file.cxx') TargetAdd('parse_file.exe', input='parse_file_parse_file.obj') - TargetAdd('parse_file.exe', input='libcppParser.ilb') + TargetAdd('parse_file.exe', input='libp3cppParser.ilb') TargetAdd('parse_file.exe', input=COMMON_DTOOL_LIBS_PYSTUB) TargetAdd('parse_file.exe', opts=['ADVAPI', 'OPENSSL', 'WINSHELL']) @@ -2370,30 +2380,31 @@ if (not RTDIST and not RUNTIME): # OPTS=['DIR:panda/src/pandabase', 'BUILDING:PANDAEXPRESS'] -TargetAdd('pandabase_pandabase.obj', opts=OPTS, input='pandabase.cxx') +TargetAdd('p3pandabase_pandabase.obj', opts=OPTS, input='pandabase.cxx') # # DIRECTORY: panda/src/express/ # OPTS=['DIR:panda/src/express', 'BUILDING:PANDAEXPRESS', 'OPENSSL', 'ZLIB'] -TargetAdd('express_composite1.obj', opts=OPTS, input='express_composite1.cxx') -TargetAdd('express_composite2.obj', opts=OPTS, input='express_composite2.cxx') +TargetAdd('p3express_composite1.obj', opts=OPTS, input='p3express_composite1.cxx') +TargetAdd('p3express_composite2.obj', opts=OPTS, input='p3express_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/express', ["*.h", "*_composite.cxx"]) -TargetAdd('libexpress.in', opts=OPTS, input=IGATEFILES) -TargetAdd('libexpress.in', opts=['IMOD:pandaexpress', 'ILIB:libexpress', 'SRCDIR:panda/src/express']) -TargetAdd('libexpress_igate.obj', input='libexpress.in', opts=["DEPENDENCYONLY"]) +TargetAdd('libp3express.in', opts=OPTS, input=IGATEFILES) +TargetAdd('libp3express.in', opts=['IMOD:pandaexpress', 'ILIB:libp3express', 'SRCDIR:panda/src/express']) +TargetAdd('libp3express_igate.obj', input='libp3express.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/downloader/ # OPTS=['DIR:panda/src/downloader', 'BUILDING:PANDAEXPRESS', 'OPENSSL', 'ZLIB'] -TargetAdd('downloader_composite.obj', opts=OPTS, input='downloader_composite.cxx') +TargetAdd('p3downloader_composite1.obj', opts=OPTS, input='p3downloader_composite1.cxx') +TargetAdd('p3downloader_composite2.obj', opts=OPTS, input='p3downloader_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/downloader', ["*.h", "*_composite.cxx"]) -TargetAdd('libdownloader.in', opts=OPTS, input=IGATEFILES) -TargetAdd('libdownloader.in', opts=['IMOD:pandaexpress', 'ILIB:libdownloader', 'SRCDIR:panda/src/downloader']) -TargetAdd('libdownloader_igate.obj', input='libdownloader.in', opts=["DEPENDENCYONLY"]) +TargetAdd('libp3downloader.in', opts=OPTS, input=IGATEFILES) +TargetAdd('libp3downloader.in', opts=['IMOD:pandaexpress', 'ILIB:libp3downloader', 'SRCDIR:panda/src/downloader']) +TargetAdd('libp3downloader_igate.obj', input='libp3downloader.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/metalibs/pandaexpress/ @@ -2401,19 +2412,20 @@ TargetAdd('libdownloader_igate.obj', input='libdownloader.in', opts=["DEPENDENCY OPTS=['DIR:panda/metalibs/pandaexpress', 'BUILDING:PANDAEXPRESS', 'ZLIB'] TargetAdd('pandaexpress_pandaexpress.obj', opts=OPTS, input='pandaexpress.cxx') -TargetAdd('libpandaexpress_module.obj', input='libdownloader.in') -TargetAdd('libpandaexpress_module.obj', input='libexpress.in') +TargetAdd('libpandaexpress_module.obj', input='libp3downloader.in') +TargetAdd('libpandaexpress_module.obj', input='libp3express.in') TargetAdd('libpandaexpress_module.obj', opts=['ADVAPI', 'OPENSSL']) TargetAdd('libpandaexpress_module.obj', opts=['IMOD:pandaexpress', 'ILIB:libpandaexpress']) TargetAdd('libpandaexpress.dll', input='pandaexpress_pandaexpress.obj') TargetAdd('libpandaexpress.dll', input='libpandaexpress_module.obj') -TargetAdd('libpandaexpress.dll', input='downloader_composite.obj') -TargetAdd('libpandaexpress.dll', input='libdownloader_igate.obj') -TargetAdd('libpandaexpress.dll', input='express_composite1.obj') -TargetAdd('libpandaexpress.dll', input='express_composite2.obj') -TargetAdd('libpandaexpress.dll', input='libexpress_igate.obj') -TargetAdd('libpandaexpress.dll', input='pandabase_pandabase.obj') +TargetAdd('libpandaexpress.dll', input='p3downloader_composite1.obj') +TargetAdd('libpandaexpress.dll', input='p3downloader_composite2.obj') +TargetAdd('libpandaexpress.dll', input='libp3downloader_igate.obj') +TargetAdd('libpandaexpress.dll', input='p3express_composite1.obj') +TargetAdd('libpandaexpress.dll', input='p3express_composite2.obj') +TargetAdd('libpandaexpress.dll', input='libp3express_igate.obj') +TargetAdd('libpandaexpress.dll', input='p3pandabase_pandabase.obj') TargetAdd('libpandaexpress.dll', input=COMMON_DTOOL_LIBS) TargetAdd('libpandaexpress.dll', opts=['ADVAPI', 'WINSOCK2', 'OPENSSL', 'ZLIB']) @@ -2423,12 +2435,13 @@ TargetAdd('libpandaexpress.dll', opts=['ADVAPI', 'WINSOCK2', 'OPENSSL', 'ZLIB'] if (not RUNTIME): OPTS=['DIR:panda/src/pipeline', 'BUILDING:PANDA'] - TargetAdd('pipeline_composite.obj', opts=OPTS, input='pipeline_composite.cxx') - TargetAdd('pipeline_contextSwitch.obj', opts=OPTS, input='contextSwitch.c') + TargetAdd('p3pipeline_composite1.obj', opts=OPTS, input='p3pipeline_composite1.cxx') + TargetAdd('p3pipeline_composite2.obj', opts=OPTS, input='p3pipeline_composite2.cxx') + TargetAdd('p3pipeline_contextSwitch.obj', opts=OPTS, input='contextSwitch.c') IGATEFILES=GetDirectoryContents('panda/src/pipeline', ["*.h", "*_composite.cxx"]) - TargetAdd('libpipeline.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libpipeline.in', opts=['IMOD:panda', 'ILIB:libpipeline', 'SRCDIR:panda/src/pipeline']) - TargetAdd('libpipeline_igate.obj', input='libpipeline.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3pipeline.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3pipeline.in', opts=['IMOD:panda', 'ILIB:libp3pipeline', 'SRCDIR:panda/src/pipeline']) + TargetAdd('libp3pipeline_igate.obj', input='libp3pipeline.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/putil/ @@ -2436,13 +2449,13 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/putil', 'BUILDING:PANDA', 'ZLIB'] - TargetAdd('putil_composite1.obj', opts=OPTS, input='putil_composite1.cxx') - TargetAdd('putil_composite2.obj', opts=OPTS, input='putil_composite2.cxx') + TargetAdd('p3putil_composite1.obj', opts=OPTS, input='p3putil_composite1.cxx') + TargetAdd('p3putil_composite2.obj', opts=OPTS, input='p3putil_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/putil', ["*.h", "*_composite.cxx"]) IGATEFILES.remove("test_bam.h") - TargetAdd('libputil.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libputil.in', opts=['IMOD:panda', 'ILIB:libputil', 'SRCDIR:panda/src/putil']) - TargetAdd('libputil_igate.obj', input='libputil.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3putil.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3putil.in', opts=['IMOD:panda', 'ILIB:libp3putil', 'SRCDIR:panda/src/putil']) + TargetAdd('libp3putil_igate.obj', input='libp3putil.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/audio/ @@ -2450,11 +2463,11 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/audio', 'BUILDING:PANDA'] - TargetAdd('audio_composite.obj', opts=OPTS, input='audio_composite.cxx') + TargetAdd('p3audio_composite1.obj', opts=OPTS, input='p3audio_composite1.cxx') IGATEFILES=["audio.h"] - TargetAdd('libaudio.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libaudio.in', opts=['IMOD:panda', 'ILIB:libaudio', 'SRCDIR:panda/src/audio']) - TargetAdd('libaudio_igate.obj', input='libaudio.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3audio.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3audio.in', opts=['IMOD:panda', 'ILIB:libp3audio', 'SRCDIR:panda/src/audio']) + TargetAdd('libp3audio_igate.obj', input='libp3audio.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/event/ @@ -2462,11 +2475,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/event', 'BUILDING:PANDA'] - TargetAdd('event_composite.obj', opts=OPTS, input='event_composite.cxx') + TargetAdd('p3event_composite1.obj', opts=OPTS, input='p3event_composite1.cxx') + TargetAdd('p3event_composite2.obj', opts=OPTS, input='p3event_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/event', ["*.h", "*_composite.cxx"]) - TargetAdd('libevent.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libevent.in', opts=['IMOD:panda', 'ILIB:libevent', 'SRCDIR:panda/src/event']) - TargetAdd('libevent_igate.obj', input='libevent.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3event.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3event.in', opts=['IMOD:panda', 'ILIB:libp3event', 'SRCDIR:panda/src/event']) + TargetAdd('libp3event_igate.obj', input='libp3event.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/linmath/ @@ -2474,15 +2488,16 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/linmath', 'BUILDING:PANDA'] - TargetAdd('linmath_composite.obj', opts=OPTS, input='linmath_composite.cxx') + TargetAdd('p3linmath_composite1.obj', opts=OPTS, input='p3linmath_composite1.cxx') + TargetAdd('p3linmath_composite2.obj', opts=OPTS, input='p3linmath_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/linmath', ["*.h", "*_ext.I", "*_composite.cxx"]) IGATEFILES.remove('lmat_ops_src.h') IGATEFILES.remove('cast_to_double.h') IGATEFILES.remove('lmat_ops.h') IGATEFILES.remove('cast_to_float.h') - TargetAdd('liblinmath.in', opts=OPTS, input=IGATEFILES) - TargetAdd('liblinmath.in', opts=['IMOD:panda', 'ILIB:liblinmath', 'SRCDIR:panda/src/linmath']) - TargetAdd('liblinmath_igate.obj', input='liblinmath.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3linmath.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3linmath.in', opts=['IMOD:panda', 'ILIB:libp3linmath', 'SRCDIR:panda/src/linmath']) + TargetAdd('libp3linmath_igate.obj', input='libp3linmath.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/mathutil/ @@ -2490,11 +2505,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/mathutil', 'BUILDING:PANDA', 'FFTW'] - TargetAdd('mathutil_composite.obj', opts=OPTS, input='mathutil_composite.cxx') + TargetAdd('p3mathutil_composite1.obj', opts=OPTS, input='p3mathutil_composite1.cxx') + TargetAdd('p3mathutil_composite2.obj', opts=OPTS, input='p3mathutil_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/mathutil', ["*.h", "*_composite.cxx"]) - TargetAdd('libmathutil.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libmathutil.in', opts=['IMOD:panda', 'ILIB:libmathutil', 'SRCDIR:panda/src/mathutil']) - TargetAdd('libmathutil_igate.obj', input='libmathutil.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3mathutil.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3mathutil.in', opts=['IMOD:panda', 'ILIB:libp3mathutil', 'SRCDIR:panda/src/mathutil']) + TargetAdd('libp3mathutil_igate.obj', input='libp3mathutil.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/gsgbase/ @@ -2502,11 +2518,11 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/gsgbase', 'BUILDING:PANDA'] - TargetAdd('gsgbase_composite.obj', opts=OPTS, input='gsgbase_composite.cxx') + TargetAdd('p3gsgbase_composite1.obj', opts=OPTS, input='p3gsgbase_composite1.cxx') IGATEFILES=GetDirectoryContents('panda/src/gsgbase', ["*.h", "*_composite.cxx"]) - TargetAdd('libgsgbase.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libgsgbase.in', opts=['IMOD:panda', 'ILIB:libgsgbase', 'SRCDIR:panda/src/gsgbase']) - TargetAdd('libgsgbase_igate.obj', input='libgsgbase.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3gsgbase.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3gsgbase.in', opts=['IMOD:panda', 'ILIB:libp3gsgbase', 'SRCDIR:panda/src/gsgbase']) + TargetAdd('libp3gsgbase_igate.obj', input='libp3gsgbase.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/pnmimage/ @@ -2514,11 +2530,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/pnmimage', 'BUILDING:PANDA', 'ZLIB'] - TargetAdd('pnmimage_composite.obj', opts=OPTS, input='pnmimage_composite.cxx') + TargetAdd('p3pnmimage_composite1.obj', opts=OPTS, input='p3pnmimage_composite1.cxx') + TargetAdd('p3pnmimage_composite2.obj', opts=OPTS, input='p3pnmimage_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/pnmimage', ["*.h", "*_composite.cxx"]) - TargetAdd('libpnmimage.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libpnmimage.in', opts=['IMOD:panda', 'ILIB:libpnmimage', 'SRCDIR:panda/src/pnmimage']) - TargetAdd('libpnmimage_igate.obj', input='libpnmimage.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3pnmimage.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3pnmimage.in', opts=['IMOD:panda', 'ILIB:libp3pnmimage', 'SRCDIR:panda/src/pnmimage']) + TargetAdd('libp3pnmimage_igate.obj', input='libp3pnmimage.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/nativenet/ @@ -2526,11 +2543,11 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/nativenet', 'OPENSSL', 'BUILDING:PANDA'] - TargetAdd('nativenet_composite.obj', opts=OPTS, input='nativenet_composite1.cxx') + TargetAdd('p3nativenet_composite1.obj', opts=OPTS, input='p3nativenet_composite1.cxx') IGATEFILES=GetDirectoryContents('panda/src/nativenet', ["*.h", "*_composite.cxx"]) - TargetAdd('libnativenet.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libnativenet.in', opts=['IMOD:panda', 'ILIB:libnativenet', 'SRCDIR:panda/src/nativenet']) - TargetAdd('libnativenet_igate.obj', input='libnativenet.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3nativenet.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3nativenet.in', opts=['IMOD:panda', 'ILIB:libp3nativenet', 'SRCDIR:panda/src/nativenet']) + TargetAdd('libp3nativenet_igate.obj', input='libp3nativenet.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/net/ @@ -2538,12 +2555,13 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/net', 'BUILDING:PANDA'] - TargetAdd('net_composite.obj', opts=OPTS, input='net_composite.cxx') + TargetAdd('p3net_composite1.obj', opts=OPTS, input='p3net_composite1.cxx') + TargetAdd('p3net_composite2.obj', opts=OPTS, input='p3net_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/net', ["*.h", "*_composite.cxx"]) IGATEFILES.remove("datagram_ui.h") - TargetAdd('libnet.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libnet.in', opts=['IMOD:panda', 'ILIB:libnet', 'SRCDIR:panda/src/net']) - TargetAdd('libnet_igate.obj', input='libnet.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3net.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3net.in', opts=['IMOD:panda', 'ILIB:libp3net', 'SRCDIR:panda/src/net']) + TargetAdd('libp3net_igate.obj', input='libp3net.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/pstatclient/ @@ -2551,11 +2569,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/pstatclient', 'BUILDING:PANDA'] - TargetAdd('pstatclient_composite.obj', opts=OPTS, input='pstatclient_composite.cxx') + TargetAdd('p3pstatclient_composite1.obj', opts=OPTS, input='p3pstatclient_composite1.cxx') + TargetAdd('p3pstatclient_composite2.obj', opts=OPTS, input='p3pstatclient_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/pstatclient', ["*.h", "*_composite.cxx"]) - TargetAdd('libpstatclient.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libpstatclient.in', opts=['IMOD:panda', 'ILIB:libpstatclient', 'SRCDIR:panda/src/pstatclient']) - TargetAdd('libpstatclient_igate.obj', input='libpstatclient.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3pstatclient.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3pstatclient.in', opts=['IMOD:panda', 'ILIB:libp3pstatclient', 'SRCDIR:panda/src/pstatclient']) + TargetAdd('libp3pstatclient_igate.obj', input='libp3pstatclient.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/gobj/ @@ -2563,13 +2582,13 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/gobj', 'BUILDING:PANDA', 'NVIDIACG', 'ZLIB', 'SQUISH', "BIGOBJ"] - TargetAdd('gobj_composite1.obj', opts=OPTS, input='gobj_composite1.cxx') - TargetAdd('gobj_composite2.obj', opts=OPTS, input='gobj_composite2.cxx') + TargetAdd('p3gobj_composite1.obj', opts=OPTS, input='p3gobj_composite1.cxx') + TargetAdd('p3gobj_composite2.obj', opts=OPTS, input='p3gobj_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/gobj', ["*.h", "*_composite.cxx"]) if ("cgfx_states.h" in IGATEFILES): IGATEFILES.remove("cgfx_states.h") - TargetAdd('libgobj.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libgobj.in', opts=['IMOD:panda', 'ILIB:libgobj', 'SRCDIR:panda/src/gobj']) - TargetAdd('libgobj_igate.obj', input='libgobj.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3gobj.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3gobj.in', opts=['IMOD:panda', 'ILIB:libp3gobj', 'SRCDIR:panda/src/gobj']) + TargetAdd('libp3gobj_igate.obj', input='libp3gobj.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/lerp/ @@ -2577,12 +2596,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/lerp', 'BUILDING:PANDA'] - TargetAdd('lerp_composite.obj', opts=OPTS, input='lerp_composite.cxx') + TargetAdd('p3lerp_composite1.obj', opts=OPTS, input='p3lerp_composite1.cxx') IGATEFILES=GetDirectoryContents('panda/src/lerp', ["*.h", "*_composite.cxx"]) IGATEFILES.remove("lerpchans.h") - TargetAdd('liblerp.in', opts=OPTS, input=IGATEFILES) - TargetAdd('liblerp.in', opts=['IMOD:panda', 'ILIB:liblerp', 'SRCDIR:panda/src/lerp']) - TargetAdd('liblerp_igate.obj', input='liblerp.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3lerp.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3lerp.in', opts=['IMOD:panda', 'ILIB:libp3lerp', 'SRCDIR:panda/src/lerp']) + TargetAdd('libp3lerp_igate.obj', input='libp3lerp.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/pgraphnodes/ @@ -2590,12 +2609,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/pgraphnodes', 'BUILDING:PANDA', "BIGOBJ"] - TargetAdd('pgraphnodes_composite1.obj', opts=OPTS, input='pgraphnodes_composite1.cxx') - TargetAdd('pgraphnodes_composite2.obj', opts=OPTS, input='pgraphnodes_composite2.cxx') + TargetAdd('p3pgraphnodes_composite1.obj', opts=OPTS, input='p3pgraphnodes_composite1.cxx') + TargetAdd('p3pgraphnodes_composite2.obj', opts=OPTS, input='p3pgraphnodes_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/pgraphnodes', ["*.h", "*_composite.cxx"]) - TargetAdd('libpgraphnodes.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libpgraphnodes.in', opts=['IMOD:panda', 'ILIB:libpgraphnodes', 'SRCDIR:panda/src/pgraphnodes']) - TargetAdd('libpgraphnodes_igate.obj', input='libpgraphnodes.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3pgraphnodes.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3pgraphnodes.in', opts=['IMOD:panda', 'ILIB:libp3pgraphnodes', 'SRCDIR:panda/src/pgraphnodes']) + TargetAdd('libp3pgraphnodes_igate.obj', input='libp3pgraphnodes.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/pgraph/ @@ -2603,15 +2622,15 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/pgraph', 'BUILDING:PANDA','BIGOBJ'] - TargetAdd('pgraph_nodePath.obj', opts=OPTS, input='nodePath.cxx') - TargetAdd('pgraph_composite1.obj', opts=OPTS, input='pgraph_composite1.cxx') - TargetAdd('pgraph_composite2.obj', opts=OPTS, input='pgraph_composite2.cxx') - TargetAdd('pgraph_composite3.obj', opts=OPTS, input='pgraph_composite3.cxx') - TargetAdd('pgraph_composite4.obj', opts=OPTS, input='pgraph_composite4.cxx') + TargetAdd('p3pgraph_nodePath.obj', opts=OPTS, input='nodePath.cxx') + TargetAdd('p3pgraph_composite1.obj', opts=OPTS, input='p3pgraph_composite1.cxx') + TargetAdd('p3pgraph_composite2.obj', opts=OPTS, input='p3pgraph_composite2.cxx') + TargetAdd('p3pgraph_composite3.obj', opts=OPTS, input='p3pgraph_composite3.cxx') + TargetAdd('p3pgraph_composite4.obj', opts=OPTS, input='p3pgraph_composite4.cxx') IGATEFILES=GetDirectoryContents('panda/src/pgraph', ["*.h", "nodePath.cxx", "*_composite.cxx"]) - TargetAdd('libpgraph.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libpgraph.in', opts=['IMOD:panda', 'ILIB:libpgraph', 'SRCDIR:panda/src/pgraph']) - TargetAdd('libpgraph_igate.obj', input='libpgraph.in', opts=["DEPENDENCYONLY","BIGOBJ"]) + TargetAdd('libp3pgraph.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3pgraph.in', opts=['IMOD:panda', 'ILIB:libp3pgraph', 'SRCDIR:panda/src/pgraph']) + TargetAdd('libp3pgraph_igate.obj', input='libp3pgraph.in', opts=["DEPENDENCYONLY","BIGOBJ"]) # # DIRECTORY: panda/src/cull/ @@ -2619,11 +2638,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/cull', 'BUILDING:PANDA', 'BIGOBJ'] - TargetAdd('cull_composite.obj', opts=OPTS, input='cull_composite.cxx') + TargetAdd('p3cull_composite1.obj', opts=OPTS, input='p3cull_composite1.cxx') + TargetAdd('p3cull_composite2.obj', opts=OPTS, input='p3cull_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/cull', ["*.h", "*_composite.cxx"]) - TargetAdd('libcull.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libcull.in', opts=['IMOD:panda', 'ILIB:libcull', 'SRCDIR:panda/src/cull']) - TargetAdd('libcull_igate.obj', input='libcull.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3cull.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3cull.in', opts=['IMOD:panda', 'ILIB:libp3cull', 'SRCDIR:panda/src/cull']) + TargetAdd('libp3cull_igate.obj', input='libp3cull.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/chan/ @@ -2631,13 +2651,14 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/chan', 'BUILDING:PANDA', 'BIGOBJ'] - TargetAdd('chan_composite.obj', opts=OPTS, input='chan_composite.cxx') + TargetAdd('p3chan_composite1.obj', opts=OPTS, input='p3chan_composite1.cxx') + TargetAdd('p3chan_composite2.obj', opts=OPTS, input='p3chan_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/chan', ["*.h", "*_composite.cxx"]) IGATEFILES.remove('movingPart.h') IGATEFILES.remove('animChannelFixed.h') - TargetAdd('libchan.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libchan.in', opts=['IMOD:panda', 'ILIB:libchan', 'SRCDIR:panda/src/chan']) - TargetAdd('libchan_igate.obj', input='libchan.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3chan.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3chan.in', opts=['IMOD:panda', 'ILIB:libp3chan', 'SRCDIR:panda/src/chan']) + TargetAdd('libp3chan_igate.obj', input='libp3chan.in', opts=["DEPENDENCYONLY"]) # DIRECTORY: panda/src/char/ @@ -2645,11 +2666,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/char', 'BUILDING:PANDA', 'BIGOBJ'] - TargetAdd('char_composite.obj', opts=OPTS, input='char_composite.cxx') + TargetAdd('p3char_composite1.obj', opts=OPTS, input='p3char_composite1.cxx') + TargetAdd('p3char_composite2.obj', opts=OPTS, input='p3char_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/char', ["*.h", "*_composite.cxx"]) - TargetAdd('libchar.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libchar.in', opts=['IMOD:panda', 'ILIB:libchar', 'SRCDIR:panda/src/char']) - TargetAdd('libchar_igate.obj', input='libchar.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3char.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3char.in', opts=['IMOD:panda', 'ILIB:libp3char', 'SRCDIR:panda/src/char']) + TargetAdd('libp3char_igate.obj', input='libp3char.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/dgraph/ @@ -2657,11 +2679,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/dgraph', 'BUILDING:PANDA'] - TargetAdd('dgraph_composite.obj', opts=OPTS, input='dgraph_composite.cxx') + TargetAdd('p3dgraph_composite1.obj', opts=OPTS, input='p3dgraph_composite1.cxx') + TargetAdd('p3dgraph_composite2.obj', opts=OPTS, input='p3dgraph_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/dgraph', ["*.h", "*_composite.cxx"]) - TargetAdd('libdgraph.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libdgraph.in', opts=['IMOD:panda', 'ILIB:libdgraph', 'SRCDIR:panda/src/dgraph']) - TargetAdd('libdgraph_igate.obj', input='libdgraph.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3dgraph.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3dgraph.in', opts=['IMOD:panda', 'ILIB:libp3dgraph', 'SRCDIR:panda/src/dgraph']) + TargetAdd('libp3dgraph_igate.obj', input='libp3dgraph.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/display/ @@ -2669,17 +2692,18 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/display', 'BUILDING:PANDA', 'BIGOBJ'] - TargetAdd('display_composite.obj', opts=OPTS, input='display_composite.cxx') + TargetAdd('p3display_composite1.obj', opts=OPTS, input='p3display_composite1.cxx') + TargetAdd('p3display_composite2.obj', opts=OPTS, input='p3display_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/display', ["*.h", "*_composite.cxx"]) IGATEFILES.remove("renderBuffer.h") - TargetAdd('libdisplay.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libdisplay.in', opts=['IMOD:panda', 'ILIB:libdisplay', 'SRCDIR:panda/src/display']) - TargetAdd('libdisplay_igate.obj', input='libdisplay.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3display.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3display.in', opts=['IMOD:panda', 'ILIB:libp3display', 'SRCDIR:panda/src/display']) + TargetAdd('libp3display_igate.obj', input='libp3display.in', opts=["DEPENDENCYONLY"]) if (RTDIST and sys.platform == "darwin"): OPTS=['DIR:panda/src/display'] TargetAdd('subprocessWindowBuffer.obj', opts=OPTS, input='subprocessWindowBuffer.cxx') - TargetAdd('libsubprocbuffer.ilb', input='subprocessWindowBuffer.obj') + TargetAdd('libp3subprocbuffer.ilb', input='subprocessWindowBuffer.obj') # # DIRECTORY: panda/src/device/ @@ -2687,11 +2711,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/device', 'BUILDING:PANDA', 'BIGOBJ'] - TargetAdd('device_composite.obj', opts=OPTS, input='device_composite.cxx') + TargetAdd('p3device_composite1.obj', opts=OPTS, input='p3device_composite1.cxx') + TargetAdd('p3device_composite2.obj', opts=OPTS, input='p3device_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/device', ["*.h", "*_composite.cxx"]) - TargetAdd('libdevice.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libdevice.in', opts=['IMOD:panda', 'ILIB:libdevice', 'SRCDIR:panda/src/device']) - TargetAdd('libdevice_igate.obj', input='libdevice.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3device.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3device.in', opts=['IMOD:panda', 'ILIB:libp3device', 'SRCDIR:panda/src/device']) + TargetAdd('libp3device_igate.obj', input='libp3device.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/pnmtext/ @@ -2699,11 +2724,11 @@ if (not RUNTIME): if (PkgSkip("FREETYPE")==0 and not RUNTIME): OPTS=['DIR:panda/src/pnmtext', 'BUILDING:PANDA', 'FREETYPE'] - TargetAdd('pnmtext_composite.obj', opts=OPTS, input='pnmtext_composite.cxx') + TargetAdd('p3pnmtext_composite1.obj', opts=OPTS, input='p3pnmtext_composite1.cxx') IGATEFILES=GetDirectoryContents('panda/src/pnmtext', ["*.h", "*_composite.cxx"]) - TargetAdd('libpnmtext.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libpnmtext.in', opts=['IMOD:panda', 'ILIB:libpnmtext', 'SRCDIR:panda/src/pnmtext']) - TargetAdd('libpnmtext_igate.obj', input='libpnmtext.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3pnmtext.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3pnmtext.in', opts=['IMOD:panda', 'ILIB:libp3pnmtext', 'SRCDIR:panda/src/pnmtext']) + TargetAdd('libp3pnmtext_igate.obj', input='libp3pnmtext.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/text/ @@ -2711,11 +2736,12 @@ if (PkgSkip("FREETYPE")==0 and not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/text', 'BUILDING:PANDA', 'ZLIB', 'FREETYPE', 'BIGOBJ'] - TargetAdd('text_composite.obj', opts=OPTS, input='text_composite.cxx') + TargetAdd('p3text_composite1.obj', opts=OPTS, input='p3text_composite1.cxx') + TargetAdd('p3text_composite2.obj', opts=OPTS, input='p3text_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/text', ["*.h", "*_composite.cxx"]) - TargetAdd('libtext.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libtext.in', opts=['IMOD:panda', 'ILIB:libtext', 'SRCDIR:panda/src/text']) - TargetAdd('libtext_igate.obj', input='libtext.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3text.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3text.in', opts=['IMOD:panda', 'ILIB:libp3text', 'SRCDIR:panda/src/text']) + TargetAdd('libp3text_igate.obj', input='libp3text.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/movies/ @@ -2723,11 +2749,11 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/movies', 'BUILDING:PANDA', 'FFMPEG'] - TargetAdd('movies_composite1.obj', opts=OPTS, input='movies_composite1.cxx') + TargetAdd('p3movies_composite1.obj', opts=OPTS, input='p3movies_composite1.cxx') IGATEFILES=GetDirectoryContents('panda/src/movies', ["*.h", "*_composite.cxx"]) - TargetAdd('libmovies.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libmovies.in', opts=['IMOD:panda', 'ILIB:libmovies', 'SRCDIR:panda/src/movies']) - TargetAdd('libmovies_igate.obj', input='libmovies.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3movies.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3movies.in', opts=['IMOD:panda', 'ILIB:libp3movies', 'SRCDIR:panda/src/movies']) + TargetAdd('libp3movies_igate.obj', input='libp3movies.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/grutil/ @@ -2735,13 +2761,13 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/grutil', 'BUILDING:PANDA', 'FFMPEG', 'BIGOBJ'] - TargetAdd('grutil_multitexReducer.obj', opts=OPTS, input='multitexReducer.cxx') - TargetAdd('grutil_composite1.obj', opts=OPTS, input='grutil_composite1.cxx') - TargetAdd('grutil_composite2.obj', opts=OPTS, input='grutil_composite2.cxx') + TargetAdd('p3grutil_multitexReducer.obj', opts=OPTS, input='multitexReducer.cxx') + TargetAdd('p3grutil_composite1.obj', opts=OPTS, input='p3grutil_composite1.cxx') + TargetAdd('p3grutil_composite2.obj', opts=OPTS, input='p3grutil_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/grutil', ["*.h", "*_composite.cxx"]) - TargetAdd('libgrutil.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libgrutil.in', opts=['IMOD:panda', 'ILIB:libgrutil', 'SRCDIR:panda/src/grutil']) - TargetAdd('libgrutil_igate.obj', input='libgrutil.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3grutil.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3grutil.in', opts=['IMOD:panda', 'ILIB:libp3grutil', 'SRCDIR:panda/src/grutil']) + TargetAdd('libp3grutil_igate.obj', input='libp3grutil.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/tform/ @@ -2749,11 +2775,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/tform', 'BUILDING:PANDA', 'BIGOBJ'] - TargetAdd('tform_composite.obj', opts=OPTS, input='tform_composite.cxx') + TargetAdd('p3tform_composite1.obj', opts=OPTS, input='p3tform_composite1.cxx') + TargetAdd('p3tform_composite2.obj', opts=OPTS, input='p3tform_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/tform', ["*.h", "*_composite.cxx"]) - TargetAdd('libtform.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libtform.in', opts=['IMOD:panda', 'ILIB:libtform', 'SRCDIR:panda/src/tform']) - TargetAdd('libtform_igate.obj', input='libtform.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3tform.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3tform.in', opts=['IMOD:panda', 'ILIB:libp3tform', 'SRCDIR:panda/src/tform']) + TargetAdd('libp3tform_igate.obj', input='libp3tform.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/collide/ @@ -2761,11 +2788,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/collide', 'BUILDING:PANDA', 'BIGOBJ'] - TargetAdd('collide_composite.obj', opts=OPTS, input='collide_composite.cxx') + TargetAdd('p3collide_composite1.obj', opts=OPTS, input='p3collide_composite1.cxx') + TargetAdd('p3collide_composite2.obj', opts=OPTS, input='p3collide_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/collide', ["*.h", "*_composite.cxx"]) - TargetAdd('libcollide.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libcollide.in', opts=['IMOD:panda', 'ILIB:libcollide', 'SRCDIR:panda/src/collide']) - TargetAdd('libcollide_igate.obj', input='libcollide.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3collide.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3collide.in', opts=['IMOD:panda', 'ILIB:libp3collide', 'SRCDIR:panda/src/collide']) + TargetAdd('libp3collide_igate.obj', input='libp3collide.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/parametrics/ @@ -2773,11 +2801,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/parametrics', 'BUILDING:PANDA', 'BIGOBJ'] - TargetAdd('parametrics_composite.obj', opts=OPTS, input='parametrics_composite.cxx') + TargetAdd('p3parametrics_composite1.obj', opts=OPTS, input='p3parametrics_composite1.cxx') + TargetAdd('p3parametrics_composite2.obj', opts=OPTS, input='p3parametrics_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/parametrics', ["*.h", "*_composite.cxx"]) - TargetAdd('libparametrics.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libparametrics.in', opts=['IMOD:panda', 'ILIB:libparametrics', 'SRCDIR:panda/src/parametrics']) - TargetAdd('libparametrics_igate.obj', input='libparametrics.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3parametrics.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3parametrics.in', opts=['IMOD:panda', 'ILIB:libp3parametrics', 'SRCDIR:panda/src/parametrics']) + TargetAdd('libp3parametrics_igate.obj', input='libp3parametrics.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/pgui/ @@ -2785,11 +2814,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/pgui', 'BUILDING:PANDA', 'BIGOBJ'] - TargetAdd('pgui_composite.obj', opts=OPTS, input='pgui_composite.cxx') + TargetAdd('p3pgui_composite1.obj', opts=OPTS, input='p3pgui_composite1.cxx') + TargetAdd('p3pgui_composite2.obj', opts=OPTS, input='p3pgui_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/pgui', ["*.h", "*_composite.cxx"]) - TargetAdd('libpgui.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libpgui.in', opts=['IMOD:panda', 'ILIB:libpgui', 'SRCDIR:panda/src/pgui']) - TargetAdd('libpgui_igate.obj', input='libpgui.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3pgui.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3pgui.in', opts=['IMOD:panda', 'ILIB:libp3pgui', 'SRCDIR:panda/src/pgui']) + TargetAdd('libp3pgui_igate.obj', input='libp3pgui.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/pnmimagetypes/ @@ -2797,7 +2827,8 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/pnmimagetypes', 'DIR:panda/src/pnmimage', 'BUILDING:PANDA', 'PNG', 'ZLIB', 'JPEG', 'ZLIB', 'JPEG', 'TIFF'] - TargetAdd('pnmimagetypes_composite.obj', opts=OPTS, input='pnmimagetypes_composite.cxx') + TargetAdd('p3pnmimagetypes_composite1.obj', opts=OPTS, input='p3pnmimagetypes_composite1.cxx') + TargetAdd('p3pnmimagetypes_composite2.obj', opts=OPTS, input='p3pnmimagetypes_composite2.cxx') # # DIRECTORY: panda/src/recorder/ @@ -2805,11 +2836,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/recorder', 'BUILDING:PANDA'] - TargetAdd('recorder_composite.obj', opts=OPTS, input='recorder_composite.cxx') + TargetAdd('p3recorder_composite1.obj', opts=OPTS, input='p3recorder_composite1.cxx') + TargetAdd('p3recorder_composite2.obj', opts=OPTS, input='p3recorder_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/recorder', ["*.h", "*_composite.cxx"]) - TargetAdd('librecorder.in', opts=OPTS, input=IGATEFILES) - TargetAdd('librecorder.in', opts=['IMOD:panda', 'ILIB:librecorder', 'SRCDIR:panda/src/recorder']) - TargetAdd('librecorder_igate.obj', input='librecorder.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3recorder.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3recorder.in', opts=['IMOD:panda', 'ILIB:libp3recorder', 'SRCDIR:panda/src/recorder']) + TargetAdd('libp3recorder_igate.obj', input='libp3recorder.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/vrpn/ @@ -2817,11 +2849,11 @@ if (not RUNTIME): if (PkgSkip("VRPN")==0 and not RUNTIME): OPTS=['DIR:panda/src/vrpn', 'BUILDING:PANDA', 'VRPN'] - TargetAdd('vrpn_composite.obj', opts=OPTS, input='vrpn_composite.cxx') + TargetAdd('p3vrpn_composite1.obj', opts=OPTS, input='p3vrpn_composite1.cxx') IGATEFILES=GetDirectoryContents('panda/src/vrpn', ["*.h", "*_composite.cxx"]) - TargetAdd('libvrpn.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libvrpn.in', opts=['IMOD:panda', 'ILIB:libvrpn', 'SRCDIR:panda/src/vrpn']) - TargetAdd('libvrpn_igate.obj', input='libvrpn.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3vrpn.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3vrpn.in', opts=['IMOD:panda', 'ILIB:libp3vrpn', 'SRCDIR:panda/src/vrpn']) + TargetAdd('libp3vrpn_igate.obj', input='libp3vrpn.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/dxml/ @@ -2836,11 +2868,11 @@ if (RUNTIME or RTDIST): if (not RUNTIME): OPTS=['DIR:panda/src/dxml', 'BUILDING:PANDA', 'TINYXML'] - TargetAdd('dxml_composite1.obj', opts=OPTS, input='dxml_composite1.cxx') - IGATEFILES=GetDirectoryContents('panda/src/dxml', ["*.h", "dxml_composite1.cxx"]) - TargetAdd('libdxml.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libdxml.in', opts=['IMOD:panda', 'ILIB:libdxml', 'SRCDIR:panda/src/dxml']) - TargetAdd('libdxml_igate.obj', input='libdxml.in', opts=["DEPENDENCYONLY"]) + TargetAdd('p3dxml_composite1.obj', opts=OPTS, input='p3dxml_composite1.cxx') + IGATEFILES=GetDirectoryContents('panda/src/dxml', ["*.h", "p3dxml_composite1.cxx"]) + TargetAdd('libp3dxml.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3dxml.in', opts=['IMOD:panda', 'ILIB:libp3dxml', 'SRCDIR:panda/src/dxml']) + TargetAdd('libp3dxml_igate.obj', input='libp3dxml.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/metalibs/panda/ @@ -2853,123 +2885,143 @@ if (not RUNTIME): TargetAdd('panda_panda.obj', opts=OPTS, input='panda.cxx') - TargetAdd('libpanda_module.obj', input='librecorder.in') - TargetAdd('libpanda_module.obj', input='libpgraphnodes.in') - TargetAdd('libpanda_module.obj', input='libpgraph.in') - TargetAdd('libpanda_module.obj', input='libcull.in') - TargetAdd('libpanda_module.obj', input='libgrutil.in') - TargetAdd('libpanda_module.obj', input='libchan.in') - TargetAdd('libpanda_module.obj', input='libpstatclient.in') - TargetAdd('libpanda_module.obj', input='libchar.in') - TargetAdd('libpanda_module.obj', input='libcollide.in') - TargetAdd('libpanda_module.obj', input='libdevice.in') - TargetAdd('libpanda_module.obj', input='libdgraph.in') - TargetAdd('libpanda_module.obj', input='libdisplay.in') - TargetAdd('libpanda_module.obj', input='libpipeline.in') - TargetAdd('libpanda_module.obj', input='libevent.in') - TargetAdd('libpanda_module.obj', input='libgobj.in') - TargetAdd('libpanda_module.obj', input='libgsgbase.in') - TargetAdd('libpanda_module.obj', input='liblinmath.in') - TargetAdd('libpanda_module.obj', input='libmathutil.in') - TargetAdd('libpanda_module.obj', input='libparametrics.in') - TargetAdd('libpanda_module.obj', input='libpnmimage.in') - TargetAdd('libpanda_module.obj', input='libtext.in') - TargetAdd('libpanda_module.obj', input='libtform.in') - TargetAdd('libpanda_module.obj', input='liblerp.in') - TargetAdd('libpanda_module.obj', input='libputil.in') - TargetAdd('libpanda_module.obj', input='libaudio.in') - TargetAdd('libpanda_module.obj', input='libnativenet.in') - TargetAdd('libpanda_module.obj', input='libnet.in') - TargetAdd('libpanda_module.obj', input='libpgui.in') - TargetAdd('libpanda_module.obj', input='libmovies.in') - TargetAdd('libpanda_module.obj', input='libdxml.in') + TargetAdd('libpanda_module.obj', input='libp3recorder.in') + TargetAdd('libpanda_module.obj', input='libp3pgraphnodes.in') + TargetAdd('libpanda_module.obj', input='libp3pgraph.in') + TargetAdd('libpanda_module.obj', input='libp3cull.in') + TargetAdd('libpanda_module.obj', input='libp3grutil.in') + TargetAdd('libpanda_module.obj', input='libp3chan.in') + TargetAdd('libpanda_module.obj', input='libp3pstatclient.in') + TargetAdd('libpanda_module.obj', input='libp3char.in') + TargetAdd('libpanda_module.obj', input='libp3collide.in') + TargetAdd('libpanda_module.obj', input='libp3device.in') + TargetAdd('libpanda_module.obj', input='libp3dgraph.in') + TargetAdd('libpanda_module.obj', input='libp3display.in') + TargetAdd('libpanda_module.obj', input='libp3pipeline.in') + TargetAdd('libpanda_module.obj', input='libp3event.in') + TargetAdd('libpanda_module.obj', input='libp3gobj.in') + TargetAdd('libpanda_module.obj', input='libp3gsgbase.in') + TargetAdd('libpanda_module.obj', input='libp3linmath.in') + TargetAdd('libpanda_module.obj', input='libp3mathutil.in') + TargetAdd('libpanda_module.obj', input='libp3parametrics.in') + TargetAdd('libpanda_module.obj', input='libp3pnmimage.in') + TargetAdd('libpanda_module.obj', input='libp3text.in') + TargetAdd('libpanda_module.obj', input='libp3tform.in') + TargetAdd('libpanda_module.obj', input='libp3lerp.in') + TargetAdd('libpanda_module.obj', input='libp3putil.in') + TargetAdd('libpanda_module.obj', input='libp3audio.in') + TargetAdd('libpanda_module.obj', input='libp3nativenet.in') + TargetAdd('libpanda_module.obj', input='libp3net.in') + TargetAdd('libpanda_module.obj', input='libp3pgui.in') + TargetAdd('libpanda_module.obj', input='libp3movies.in') + TargetAdd('libpanda_module.obj', input='libp3dxml.in') TargetAdd('libpanda.dll', input='panda_panda.obj') TargetAdd('libpanda.dll', input='libpanda_module.obj') - TargetAdd('libpanda.dll', input='recorder_composite.obj') - TargetAdd('libpanda.dll', input='librecorder_igate.obj') - TargetAdd('libpanda.dll', input='pgraphnodes_composite1.obj') - TargetAdd('libpanda.dll', input='pgraphnodes_composite2.obj') - TargetAdd('libpanda.dll', input='libpgraphnodes_igate.obj') - TargetAdd('libpanda.dll', input='pgraph_nodePath.obj') - TargetAdd('libpanda.dll', input='pgraph_composite1.obj') - TargetAdd('libpanda.dll', input='pgraph_composite2.obj') - TargetAdd('libpanda.dll', input='pgraph_composite3.obj') - TargetAdd('libpanda.dll', input='pgraph_composite4.obj') - TargetAdd('libpanda.dll', input='libpgraph_igate.obj') - TargetAdd('libpanda.dll', input='cull_composite.obj') - TargetAdd('libpanda.dll', input='movies_composite1.obj') - TargetAdd('libpanda.dll', input='libmovies_igate.obj') - TargetAdd('libpanda.dll', input='grutil_multitexReducer.obj') - TargetAdd('libpanda.dll', input='grutil_composite1.obj') - TargetAdd('libpanda.dll', input='grutil_composite2.obj') - TargetAdd('libpanda.dll', input='libgrutil_igate.obj') - TargetAdd('libpanda.dll', input='chan_composite.obj') - TargetAdd('libpanda.dll', input='libchan_igate.obj') - TargetAdd('libpanda.dll', input='pstatclient_composite.obj') - TargetAdd('libpanda.dll', input='libpstatclient_igate.obj') - TargetAdd('libpanda.dll', input='char_composite.obj') - TargetAdd('libpanda.dll', input='libchar_igate.obj') - TargetAdd('libpanda.dll', input='collide_composite.obj') - TargetAdd('libpanda.dll', input='libcollide_igate.obj') - TargetAdd('libpanda.dll', input='device_composite.obj') - TargetAdd('libpanda.dll', input='libdevice_igate.obj') - TargetAdd('libpanda.dll', input='dgraph_composite.obj') - TargetAdd('libpanda.dll', input='libdgraph_igate.obj') - TargetAdd('libpanda.dll', input='display_composite.obj') - TargetAdd('libpanda.dll', input='libdisplay_igate.obj') - TargetAdd('libpanda.dll', input='pipeline_composite.obj') - TargetAdd('libpanda.dll', input='pipeline_contextSwitch.obj') - TargetAdd('libpanda.dll', input='libpipeline_igate.obj') - TargetAdd('libpanda.dll', input='event_composite.obj') - TargetAdd('libpanda.dll', input='libevent_igate.obj') - TargetAdd('libpanda.dll', input='gobj_composite1.obj') - TargetAdd('libpanda.dll', input='gobj_composite2.obj') - TargetAdd('libpanda.dll', input='libgobj_igate.obj') - TargetAdd('libpanda.dll', input='gsgbase_composite.obj') - TargetAdd('libpanda.dll', input='libgsgbase_igate.obj') - TargetAdd('libpanda.dll', input='linmath_composite.obj') - TargetAdd('libpanda.dll', input='liblinmath_igate.obj') - TargetAdd('libpanda.dll', input='mathutil_composite.obj') - TargetAdd('libpanda.dll', input='libmathutil_igate.obj') - TargetAdd('libpanda.dll', input='parametrics_composite.obj') - TargetAdd('libpanda.dll', input='libparametrics_igate.obj') - TargetAdd('libpanda.dll', input='pnmimagetypes_composite.obj') - TargetAdd('libpanda.dll', input='pnmimage_composite.obj') - TargetAdd('libpanda.dll', input='libpnmimage_igate.obj') - TargetAdd('libpanda.dll', input='text_composite.obj') - TargetAdd('libpanda.dll', input='libtext_igate.obj') - TargetAdd('libpanda.dll', input='tform_composite.obj') - TargetAdd('libpanda.dll', input='libtform_igate.obj') - TargetAdd('libpanda.dll', input='lerp_composite.obj') - TargetAdd('libpanda.dll', input='liblerp_igate.obj') - TargetAdd('libpanda.dll', input='putil_composite1.obj') - TargetAdd('libpanda.dll', input='putil_composite2.obj') - TargetAdd('libpanda.dll', input='libputil_igate.obj') - TargetAdd('libpanda.dll', input='audio_composite.obj') - TargetAdd('libpanda.dll', input='libaudio_igate.obj') - TargetAdd('libpanda.dll', input='pgui_composite.obj') - TargetAdd('libpanda.dll', input='libpgui_igate.obj') - TargetAdd('libpanda.dll', input='net_composite.obj') - TargetAdd('libpanda.dll', input='libnet_igate.obj') - TargetAdd('libpanda.dll', input='nativenet_composite.obj') - TargetAdd('libpanda.dll', input='libnativenet_igate.obj') - TargetAdd('libpanda.dll', input='pandabase_pandabase.obj') + TargetAdd('libpanda.dll', input='p3recorder_composite1.obj') + TargetAdd('libpanda.dll', input='p3recorder_composite2.obj') + TargetAdd('libpanda.dll', input='libp3recorder_igate.obj') + TargetAdd('libpanda.dll', input='p3pgraphnodes_composite1.obj') + TargetAdd('libpanda.dll', input='p3pgraphnodes_composite2.obj') + TargetAdd('libpanda.dll', input='libp3pgraphnodes_igate.obj') + TargetAdd('libpanda.dll', input='p3pgraph_nodePath.obj') + TargetAdd('libpanda.dll', input='p3pgraph_composite1.obj') + TargetAdd('libpanda.dll', input='p3pgraph_composite2.obj') + TargetAdd('libpanda.dll', input='p3pgraph_composite3.obj') + TargetAdd('libpanda.dll', input='p3pgraph_composite4.obj') + TargetAdd('libpanda.dll', input='libp3pgraph_igate.obj') + TargetAdd('libpanda.dll', input='p3cull_composite1.obj') + TargetAdd('libpanda.dll', input='p3cull_composite2.obj') + TargetAdd('libpanda.dll', input='p3movies_composite1.obj') + TargetAdd('libpanda.dll', input='libp3movies_igate.obj') + TargetAdd('libpanda.dll', input='p3grutil_multitexReducer.obj') + TargetAdd('libpanda.dll', input='p3grutil_composite1.obj') + TargetAdd('libpanda.dll', input='p3grutil_composite2.obj') + TargetAdd('libpanda.dll', input='libp3grutil_igate.obj') + TargetAdd('libpanda.dll', input='p3chan_composite1.obj') + TargetAdd('libpanda.dll', input='p3chan_composite2.obj') + TargetAdd('libpanda.dll', input='libp3chan_igate.obj') + TargetAdd('libpanda.dll', input='p3pstatclient_composite1.obj') + TargetAdd('libpanda.dll', input='p3pstatclient_composite2.obj') + TargetAdd('libpanda.dll', input='libp3pstatclient_igate.obj') + TargetAdd('libpanda.dll', input='p3char_composite1.obj') + TargetAdd('libpanda.dll', input='p3char_composite2.obj') + TargetAdd('libpanda.dll', input='libp3char_igate.obj') + TargetAdd('libpanda.dll', input='p3collide_composite1.obj') + TargetAdd('libpanda.dll', input='p3collide_composite2.obj') + TargetAdd('libpanda.dll', input='libp3collide_igate.obj') + TargetAdd('libpanda.dll', input='p3device_composite1.obj') + TargetAdd('libpanda.dll', input='p3device_composite2.obj') + TargetAdd('libpanda.dll', input='libp3device_igate.obj') + TargetAdd('libpanda.dll', input='p3dgraph_composite1.obj') + TargetAdd('libpanda.dll', input='p3dgraph_composite2.obj') + TargetAdd('libpanda.dll', input='libp3dgraph_igate.obj') + TargetAdd('libpanda.dll', input='p3display_composite1.obj') + TargetAdd('libpanda.dll', input='p3display_composite2.obj') + TargetAdd('libpanda.dll', input='libp3display_igate.obj') + TargetAdd('libpanda.dll', input='p3pipeline_composite1.obj') + TargetAdd('libpanda.dll', input='p3pipeline_composite2.obj') + TargetAdd('libpanda.dll', input='p3pipeline_contextSwitch.obj') + TargetAdd('libpanda.dll', input='libp3pipeline_igate.obj') + TargetAdd('libpanda.dll', input='p3event_composite1.obj') + TargetAdd('libpanda.dll', input='p3event_composite2.obj') + TargetAdd('libpanda.dll', input='libp3event_igate.obj') + TargetAdd('libpanda.dll', input='p3gobj_composite1.obj') + TargetAdd('libpanda.dll', input='p3gobj_composite2.obj') + TargetAdd('libpanda.dll', input='libp3gobj_igate.obj') + TargetAdd('libpanda.dll', input='p3gsgbase_composite1.obj') + TargetAdd('libpanda.dll', input='libp3gsgbase_igate.obj') + TargetAdd('libpanda.dll', input='p3linmath_composite1.obj') + TargetAdd('libpanda.dll', input='p3linmath_composite2.obj') + TargetAdd('libpanda.dll', input='libp3linmath_igate.obj') + TargetAdd('libpanda.dll', input='p3mathutil_composite1.obj') + TargetAdd('libpanda.dll', input='p3mathutil_composite2.obj') + TargetAdd('libpanda.dll', input='libp3mathutil_igate.obj') + TargetAdd('libpanda.dll', input='p3parametrics_composite1.obj') + TargetAdd('libpanda.dll', input='p3parametrics_composite2.obj') + TargetAdd('libpanda.dll', input='libp3parametrics_igate.obj') + TargetAdd('libpanda.dll', input='p3pnmimagetypes_composite1.obj') + TargetAdd('libpanda.dll', input='p3pnmimagetypes_composite2.obj') + TargetAdd('libpanda.dll', input='p3pnmimage_composite1.obj') + TargetAdd('libpanda.dll', input='p3pnmimage_composite2.obj') + TargetAdd('libpanda.dll', input='libp3pnmimage_igate.obj') + TargetAdd('libpanda.dll', input='p3text_composite1.obj') + TargetAdd('libpanda.dll', input='p3text_composite2.obj') + TargetAdd('libpanda.dll', input='libp3text_igate.obj') + TargetAdd('libpanda.dll', input='p3tform_composite1.obj') + TargetAdd('libpanda.dll', input='p3tform_composite2.obj') + TargetAdd('libpanda.dll', input='libp3tform_igate.obj') + TargetAdd('libpanda.dll', input='p3lerp_composite1.obj') + TargetAdd('libpanda.dll', input='libp3lerp_igate.obj') + TargetAdd('libpanda.dll', input='p3putil_composite1.obj') + TargetAdd('libpanda.dll', input='p3putil_composite2.obj') + TargetAdd('libpanda.dll', input='libp3putil_igate.obj') + TargetAdd('libpanda.dll', input='p3audio_composite1.obj') + TargetAdd('libpanda.dll', input='libp3audio_igate.obj') + TargetAdd('libpanda.dll', input='p3pgui_composite1.obj') + TargetAdd('libpanda.dll', input='p3pgui_composite2.obj') + TargetAdd('libpanda.dll', input='libp3pgui_igate.obj') + TargetAdd('libpanda.dll', input='p3net_composite1.obj') + TargetAdd('libpanda.dll', input='p3net_composite2.obj') + TargetAdd('libpanda.dll', input='libp3net_igate.obj') + TargetAdd('libpanda.dll', input='p3nativenet_composite1.obj') + TargetAdd('libpanda.dll', input='libp3nativenet_igate.obj') + TargetAdd('libpanda.dll', input='p3pandabase_pandabase.obj') TargetAdd('libpanda.dll', input='libpandaexpress.dll') - TargetAdd('libpanda.dll', input='dxml_composite1.obj') - TargetAdd('libpanda.dll', input='libdxml_igate.obj') + TargetAdd('libpanda.dll', input='p3dxml_composite1.obj') + TargetAdd('libpanda.dll', input='libp3dxml_igate.obj') TargetAdd('libpanda.dll', input='libp3dtoolconfig.dll') TargetAdd('libpanda.dll', input='libp3dtool.dll') if PkgSkip("VRPN")==0: - TargetAdd('libpanda.dll', input="vrpn_composite.obj") - TargetAdd('libpanda.dll', input="libvrpn_igate.obj") - TargetAdd('libpanda_module.obj', input='libvrpn.in') + TargetAdd('libpanda.dll', input="p3vrpn_composite1.obj") + TargetAdd('libpanda.dll', input="libp3vrpn_igate.obj") + TargetAdd('libpanda_module.obj', input='libp3vrpn.in') if PkgSkip("FREETYPE")==0: - TargetAdd('libpanda.dll', input="pnmtext_composite.obj") - TargetAdd('libpanda.dll', input="libpnmtext_igate.obj") - TargetAdd('libpanda_module.obj', input='libpnmtext.in') + TargetAdd('libpanda.dll', input="p3pnmtext_composite1.obj") + TargetAdd('libpanda.dll', input="libp3pnmtext_igate.obj") + TargetAdd('libpanda_module.obj', input='libp3pnmtext.in') TargetAdd('libpanda_module.obj', opts=OPTS) TargetAdd('libpanda_module.obj', opts=['IMOD:panda', 'ILIB:libpanda']) @@ -2984,69 +3036,69 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/vision', 'BUILDING:VISION', 'ARTOOLKIT', 'OPENCV', 'DX9', 'DIRECTCAM', 'JPEG'] - TargetAdd('vision_composite1.obj', opts=OPTS, input='vision_composite1.cxx') + TargetAdd('p3vision_composite1.obj', opts=OPTS, input='p3vision_composite1.cxx') IGATEFILES=GetDirectoryContents('panda/src/vision', ["*.h", "*_composite.cxx"]) - TargetAdd('libvision.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libvision.in', opts=['IMOD:p3vision', 'ILIB:libvision', 'SRCDIR:panda/src/vision']) - TargetAdd('libvision_igate.obj', input='libvision.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3vision.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3vision.in', opts=['IMOD:p3vision', 'ILIB:libp3vision', 'SRCDIR:panda/src/vision']) + TargetAdd('libp3vision_igate.obj', input='libp3vision.in', opts=["DEPENDENCYONLY"]) - TargetAdd('libp3vision_module.obj', input='libvision.in') + TargetAdd('libp3vision_module.obj', input='libp3vision.in') TargetAdd('libp3vision_module.obj', opts=OPTS) TargetAdd('libp3vision_module.obj', opts=['IMOD:p3vision', 'ILIB:libp3vision']) - TargetAdd('libp3vision.dll', input='vision_composite1.obj') - TargetAdd('libp3vision.dll', input='libvision_igate.obj') + TargetAdd('libp3vision.dll', input='p3vision_composite1.obj') + TargetAdd('libp3vision.dll', input='libp3vision_igate.obj') TargetAdd('libp3vision.dll', input='libp3vision_module.obj') TargetAdd('libp3vision.dll', input=COMMON_PANDA_LIBS) TargetAdd('libp3vision.dll', opts=OPTS) # -# DIRECTORY: panda/src/awesomium +# DIRECTORY: panda/src/p3awesomium # if PkgSkip("AWESOMIUM") == 0 and not RUNTIME: OPTS=['DIR:panda/src/awesomium', 'BUILDING:PANDAAWESOMIUM', 'AWESOMIUM'] TargetAdd('pandaawesomium_composite1.obj', opts=OPTS, input='pandaawesomium_composite1.cxx') IGATEFILES=GetDirectoryContents('panda/src/awesomium', ["*.h", "*_composite1.cxx"]) - TargetAdd('libawesomium.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libawesomium.in', opts=['IMOD:p3awesomium', 'ILIB:libawesomium', 'SRCDIR:panda/src/awesomium']) - TargetAdd('libawesomium_igate.obj', input='libawesomium.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3awesomium.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3awesomium.in', opts=['IMOD:p3awesomium', 'ILIB:libp3awesomium', 'SRCDIR:panda/src/awesomium']) + TargetAdd('libp3awesomium_igate.obj', input='libp3awesomium.in', opts=["DEPENDENCYONLY"]) - TargetAdd('libp3awesomium_module.obj', input='libawesomium.in') + TargetAdd('libp3awesomium_module.obj', input='libp3awesomium.in') TargetAdd('libp3awesomium_module.obj', opts=OPTS) TargetAdd('libp3awesomium_module.obj', opts=['IMOD:p3awesomium', 'ILIB:libp3awesomium']) TargetAdd('libp3awesomium.dll', input='pandaawesomium_composite1.obj') - TargetAdd('libp3awesomium.dll', input='libawesomium_igate.obj') + TargetAdd('libp3awesomium.dll', input='libp3awesomium_igate.obj') TargetAdd('libp3awesomium.dll', input='libp3awesomium_module.obj') TargetAdd('libp3awesomium.dll', input=COMMON_PANDA_LIBS) TargetAdd('libp3awesomium.dll', opts=OPTS) # -# DIRECTORY: panda/src/skel +# DIRECTORY: panda/src/p3skel # if (not RUNTIME): OPTS=['DIR:panda/src/skel', 'BUILDING:PANDASKEL', 'ADVAPI'] - TargetAdd('skel_composite.obj', opts=OPTS, input='skel_composite.cxx') + TargetAdd('p3skel_composite1.obj', opts=OPTS, input='p3skel_composite1.cxx') IGATEFILES=GetDirectoryContents("panda/src/skel", ["*.h", "*_composite.cxx"]) - TargetAdd('libskel.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libskel.in', opts=['IMOD:pandaskel', 'ILIB:libskel', 'SRCDIR:panda/src/skel']) - TargetAdd('libskel_igate.obj', input='libskel.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3skel.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3skel.in', opts=['IMOD:pandaskel', 'ILIB:libp3skel', 'SRCDIR:panda/src/skel']) + TargetAdd('libp3skel_igate.obj', input='libp3skel.in', opts=["DEPENDENCYONLY"]) # -# DIRECTORY: panda/src/skel +# DIRECTORY: panda/src/p3skel # if (not RUNTIME): OPTS=['BUILDING:PANDASKEL', 'ADVAPI'] - TargetAdd('libpandaskel_module.obj', input='libskel.in') + TargetAdd('libpandaskel_module.obj', input='libp3skel.in') TargetAdd('libpandaskel_module.obj', opts=OPTS) TargetAdd('libpandaskel_module.obj', opts=['IMOD:pandaskel', 'ILIB:libpandaskel']) - TargetAdd('libpandaskel.dll', input='skel_composite.obj') - TargetAdd('libpandaskel.dll', input='libskel_igate.obj') + TargetAdd('libpandaskel.dll', input='p3skel_composite1.obj') + TargetAdd('libpandaskel.dll', input='libp3skel_igate.obj') TargetAdd('libpandaskel.dll', input='libpandaskel_module.obj') TargetAdd('libpandaskel.dll', input=COMMON_PANDA_LIBS) TargetAdd('libpandaskel.dll', opts=OPTS) @@ -3057,11 +3109,11 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/distort', 'BUILDING:PANDAFX'] - TargetAdd('distort_composite.obj', opts=OPTS, input='distort_composite.cxx') + TargetAdd('p3distort_composite1.obj', opts=OPTS, input='p3distort_composite1.cxx') IGATEFILES=GetDirectoryContents('panda/src/distort', ["*.h", "*_composite.cxx"]) - TargetAdd('libdistort.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libdistort.in', opts=['IMOD:pandafx', 'ILIB:libdistort', 'SRCDIR:panda/src/distort']) - TargetAdd('libdistort_igate.obj', input='libdistort.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3distort.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3distort.in', opts=['IMOD:pandafx', 'ILIB:libp3distort', 'SRCDIR:panda/src/distort']) + TargetAdd('libp3distort_igate.obj', input='libp3distort.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/metalibs/pandafx/ @@ -3071,14 +3123,14 @@ if (not RUNTIME): OPTS=['DIR:panda/metalibs/pandafx', 'DIR:panda/src/distort', 'BUILDING:PANDAFX', 'NVIDIACG'] TargetAdd('pandafx_pandafx.obj', opts=OPTS, input='pandafx.cxx') - TargetAdd('libpandafx_module.obj', input='libdistort.in') + TargetAdd('libpandafx_module.obj', input='libp3distort.in') TargetAdd('libpandafx_module.obj', opts=OPTS) TargetAdd('libpandafx_module.obj', opts=['IMOD:pandafx', 'ILIB:libpandafx']) TargetAdd('libpandafx.dll', input='pandafx_pandafx.obj') TargetAdd('libpandafx.dll', input='libpandafx_module.obj') - TargetAdd('libpandafx.dll', input='distort_composite.obj') - TargetAdd('libpandafx.dll', input='libdistort_igate.obj') + TargetAdd('libpandafx.dll', input='p3distort_composite1.obj') + TargetAdd('libpandafx.dll', input='libp3distort_igate.obj') TargetAdd('libpandafx.dll', input=COMMON_PANDA_LIBS) TargetAdd('libpandafx.dll', opts=['ADVAPI', 'NVIDIACG']) @@ -3088,15 +3140,15 @@ if (not RUNTIME): if PkgSkip("FMODEX") == 0 and not RUNTIME: OPTS=['DIR:panda/src/audiotraits', 'BUILDING:FMOD_AUDIO', 'FMODEX'] - TargetAdd('fmod_audio_fmod_audio_composite.obj', opts=OPTS, input='fmod_audio_composite.cxx') - TargetAdd('libp3fmod_audio.dll', input='fmod_audio_fmod_audio_composite.obj') + TargetAdd('fmod_audio_fmod_audio_composite1.obj', opts=OPTS, input='fmod_audio_composite1.cxx') + TargetAdd('libp3fmod_audio.dll', input='fmod_audio_fmod_audio_composite1.obj') TargetAdd('libp3fmod_audio.dll', input=COMMON_PANDA_LIBS) TargetAdd('libp3fmod_audio.dll', opts=['MODULE', 'ADVAPI', 'WINUSER', 'WINMM', 'FMODEX']) if PkgSkip("OPENAL") == 0 and not RUNTIME: OPTS=['DIR:panda/src/audiotraits', 'BUILDING:OPENAL_AUDIO', 'OPENAL'] - TargetAdd('openal_audio_openal_audio_composite.obj', opts=OPTS, input='openal_audio_composite.cxx') - TargetAdd('libp3openal_audio.dll', input='openal_audio_openal_audio_composite.obj') + TargetAdd('openal_audio_openal_audio_composite1.obj', opts=OPTS, input='openal_audio_composite1.cxx') + TargetAdd('libp3openal_audio.dll', input='openal_audio_openal_audio_composite1.obj') TargetAdd('libp3openal_audio.dll', input=COMMON_PANDA_LIBS) TargetAdd('libp3openal_audio.dll', opts=['MODULE', 'ADVAPI', 'WINUSER', 'WINMM', 'OPENAL']) @@ -3175,12 +3227,12 @@ if (PkgSkip("ZLIB")==0 and not RTDIST and not RUNTIME and PkgSkip("DEPLOYTOOLS") if (sys.platform.startswith("win") and not RUNTIME): OPTS=['DIR:panda/src/windisplay', 'BUILDING:PANDAWIN'] - TargetAdd('windisplay_composite.obj', opts=OPTS+["BIGOBJ"], input='windisplay_composite.cxx') - TargetAdd('windisplay_windetectdx8.obj', opts=OPTS + ["DX8"], input='winDetectDx8.cxx') - TargetAdd('windisplay_windetectdx9.obj', opts=OPTS + ["DX9"], input='winDetectDx9.cxx') - TargetAdd('libp3windisplay.dll', input='windisplay_composite.obj') - TargetAdd('libp3windisplay.dll', input='windisplay_windetectdx8.obj') - TargetAdd('libp3windisplay.dll', input='windisplay_windetectdx9.obj') + TargetAdd('p3windisplay_composite1.obj', opts=OPTS+["BIGOBJ"], input='p3windisplay_composite1.cxx') + TargetAdd('p3windisplay_windetectdx8.obj', opts=OPTS + ["DX8"], input='winDetectDx8.cxx') + TargetAdd('p3windisplay_windetectdx9.obj', opts=OPTS + ["DX9"], input='winDetectDx9.cxx') + TargetAdd('libp3windisplay.dll', input='p3windisplay_composite1.obj') + TargetAdd('libp3windisplay.dll', input='p3windisplay_windetectdx8.obj') + TargetAdd('libp3windisplay.dll', input='p3windisplay_windetectdx9.obj') TargetAdd('libp3windisplay.dll', input=COMMON_PANDA_LIBS) TargetAdd('libp3windisplay.dll', opts=['WINIMM', 'WINGDI', 'WINKERNEL', 'WINOLDNAMES', 'WINUSER', 'WINMM',"BIGOBJ"]) @@ -3190,12 +3242,12 @@ if (sys.platform.startswith("win") and not RUNTIME): if PkgSkip("DX8")==0 and not RUNTIME: OPTS=['DIR:panda/src/dxgsg8', 'DIR:panda/metalibs/pandadx8', 'BUILDING:PANDADX', 'DX8'] - TargetAdd('dxgsg8_dxGraphicsStateGuardian8.obj', opts=OPTS, input='dxGraphicsStateGuardian8.cxx') - TargetAdd('dxgsg8_composite.obj', opts=OPTS, input='dxgsg8_composite.cxx') + TargetAdd('p3dxgsg8_dxGraphicsStateGuardian8.obj', opts=OPTS, input='dxGraphicsStateGuardian8.cxx') + TargetAdd('p3dxgsg8_composite1.obj', opts=OPTS, input='p3dxgsg8_composite1.cxx') TargetAdd('pandadx8_pandadx8.obj', opts=OPTS, input='pandadx8.cxx') TargetAdd('libpandadx8.dll', input='pandadx8_pandadx8.obj') - TargetAdd('libpandadx8.dll', input='dxgsg8_dxGraphicsStateGuardian8.obj') - TargetAdd('libpandadx8.dll', input='dxgsg8_composite.obj') + TargetAdd('libpandadx8.dll', input='p3dxgsg8_dxGraphicsStateGuardian8.obj') + TargetAdd('libpandadx8.dll', input='p3dxgsg8_composite1.obj') TargetAdd('libpandadx8.dll', input='libp3windisplay.dll') TargetAdd('libpandadx8.dll', input=COMMON_PANDA_LIBS) TargetAdd('libpandadx8.dll', opts=['MODULE', 'ADVAPI', 'WINGDI', 'WINKERNEL', 'WINUSER', 'WINMM', 'DX8']) @@ -3206,13 +3258,13 @@ if PkgSkip("DX8")==0 and not RUNTIME: if PkgSkip("DX9")==0 and not RUNTIME: OPTS=['DIR:panda/src/dxgsg9', 'BUILDING:PANDADX', 'DX9', 'NVIDIACG', 'CGDX9'] - TargetAdd('dxgsg9_dxGraphicsStateGuardian9.obj', opts=OPTS, input='dxGraphicsStateGuardian9.cxx') - TargetAdd('dxgsg9_composite.obj', opts=OPTS, input='dxgsg9_composite.cxx') + TargetAdd('p3dxgsg9_dxGraphicsStateGuardian9.obj', opts=OPTS, input='dxGraphicsStateGuardian9.cxx') + TargetAdd('p3dxgsg9_composite1.obj', opts=OPTS, input='p3dxgsg9_composite1.cxx') OPTS=['DIR:panda/metalibs/pandadx9', 'BUILDING:PANDADX', 'DX9', 'NVIDIACG', 'CGDX9'] TargetAdd('pandadx9_pandadx9.obj', opts=OPTS, input='pandadx9.cxx') TargetAdd('libpandadx9.dll', input='pandadx9_pandadx9.obj') - TargetAdd('libpandadx9.dll', input='dxgsg9_dxGraphicsStateGuardian9.obj') - TargetAdd('libpandadx9.dll', input='dxgsg9_composite.obj') + TargetAdd('libpandadx9.dll', input='p3dxgsg9_dxGraphicsStateGuardian9.obj') + TargetAdd('libpandadx9.dll', input='p3dxgsg9_composite1.obj') TargetAdd('libpandadx9.dll', input='libp3windisplay.dll') TargetAdd('libpandadx9.dll', input=COMMON_PANDA_LIBS) TargetAdd('libpandadx9.dll', opts=['MODULE', 'ADVAPI', 'WINGDI', 'WINKERNEL', 'WINUSER', 'WINMM', 'DX9', 'NVIDIACG', 'CGDX9']) @@ -3224,16 +3276,16 @@ if PkgSkip("DX9")==0 and not RUNTIME: if (not RUNTIME): OPTS=['DIR:panda/src/egg', 'BUILDING:PANDAEGG', 'ZLIB', 'BISONPREFIX_eggyy', 'FLEXDASHI'] CreateFile(GetOutputDir()+"/include/parser.h") - TargetAdd('egg_parser.obj', opts=OPTS, input='parser.yxx') - TargetAdd('parser.h', input='egg_parser.obj', opts=['DEPENDENCYONLY']) - TargetAdd('egg_lexer.obj', opts=OPTS, input='lexer.lxx') - TargetAdd('egg_composite1.obj', opts=OPTS, input='egg_composite1.cxx') - TargetAdd('egg_composite2.obj', opts=OPTS, input='egg_composite2.cxx') + TargetAdd('p3egg_parser.obj', opts=OPTS, input='parser.yxx') + TargetAdd('parser.h', input='p3egg_parser.obj', opts=['DEPENDENCYONLY']) + TargetAdd('p3egg_lexer.obj', opts=OPTS, input='lexer.lxx') + TargetAdd('p3egg_composite1.obj', opts=OPTS, input='p3egg_composite1.cxx') + TargetAdd('p3egg_composite2.obj', opts=OPTS, input='p3egg_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/egg', ["*.h", "*_composite.cxx"]) if "parser.h" in IGATEFILES: IGATEFILES.remove("parser.h") - TargetAdd('libegg.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libegg.in', opts=['IMOD:pandaegg', 'ILIB:libegg', 'SRCDIR:panda/src/egg']) - TargetAdd('libegg_igate.obj', input='libegg.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3egg.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3egg.in', opts=['IMOD:pandaegg', 'ILIB:libp3egg', 'SRCDIR:panda/src/egg']) + TargetAdd('libp3egg_igate.obj', input='libp3egg.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/egg2pg/ @@ -3241,11 +3293,12 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/egg2pg', 'BUILDING:PANDAEGG'] - TargetAdd('egg2pg_composite.obj', opts=OPTS, input='egg2pg_composite.cxx') + TargetAdd('p3egg2pg_composite1.obj', opts=OPTS, input='p3egg2pg_composite1.cxx') + TargetAdd('p3egg2pg_composite2.obj', opts=OPTS, input='p3egg2pg_composite2.cxx') IGATEFILES=['load_egg_file.h'] - TargetAdd('libegg2pg.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libegg2pg.in', opts=['IMOD:pandaegg', 'ILIB:libegg2pg', 'SRCDIR:panda/src/egg2pg']) - TargetAdd('libegg2pg_igate.obj', input='libegg2pg.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3egg2pg.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3egg2pg.in', opts=['IMOD:pandaegg', 'ILIB:libp3egg2pg', 'SRCDIR:panda/src/egg2pg']) + TargetAdd('libp3egg2pg_igate.obj', input='libp3egg2pg.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/framework/ @@ -3253,8 +3306,8 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/framework', 'BUILDING:FRAMEWORK'] - TargetAdd('framework_composite.obj', opts=OPTS, input='framework_composite.cxx') - TargetAdd('libp3framework.dll', input='framework_composite.obj') + TargetAdd('p3framework_composite1.obj', opts=OPTS, input='p3framework_composite1.cxx') + TargetAdd('libp3framework.dll', input='p3framework_composite1.obj') TargetAdd('libp3framework.dll', input=COMMON_PANDA_LIBS) TargetAdd('libp3framework.dll', opts=['ADVAPI']) @@ -3264,8 +3317,8 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/glstuff', 'NVIDIACG', 'CGGL'] - TargetAdd('glstuff_glpure.obj', opts=OPTS, input='glpure.cxx') - TargetAdd('libp3glstuff.dll', input='glstuff_glpure.obj') + TargetAdd('p3glstuff_glpure.obj', opts=OPTS, input='glpure.cxx') + TargetAdd('libp3glstuff.dll', input='p3glstuff_glpure.obj') TargetAdd('libp3glstuff.dll', input=COMMON_PANDA_LIBS) TargetAdd('libp3glstuff.dll', opts=['ADVAPI', 'GL', 'NVIDIACG', 'CGGL']) @@ -3275,8 +3328,8 @@ if (not RUNTIME): if (not RUNTIME and PkgSkip("GL")==0): OPTS=['DIR:panda/src/glgsg', 'DIR:panda/src/glstuff', 'BUILDING:PANDAGL', 'NVIDIACG'] - TargetAdd('glgsg_config_glgsg.obj', opts=OPTS, input='config_glgsg.cxx') - TargetAdd('glgsg_glgsg.obj', opts=OPTS, input='glgsg.cxx') + TargetAdd('p3glgsg_config_glgsg.obj', opts=OPTS, input='config_glgsg.cxx') + TargetAdd('p3glgsg_glgsg.obj', opts=OPTS, input='glgsg.cxx') # # DIRECTORY: panda/src/glesgsg/ @@ -3284,8 +3337,8 @@ if (not RUNTIME and PkgSkip("GL")==0): if (not RUNTIME and PkgSkip("GLES")==0): OPTS=['DIR:panda/src/glesgsg', 'DIR:panda/src/glstuff', 'BUILDING:PANDAGLES'] - TargetAdd('glesgsg_config_glesgsg.obj', opts=OPTS, input='config_glesgsg.cxx') - TargetAdd('glesgsg_glesgsg.obj', opts=OPTS, input='glesgsg.cxx') + TargetAdd('p3glesgsg_config_glesgsg.obj', opts=OPTS, input='config_glesgsg.cxx') + TargetAdd('p3glesgsg_glesgsg.obj', opts=OPTS, input='glesgsg.cxx') # # DIRECTORY: panda/src/gles2gsg/ @@ -3293,8 +3346,8 @@ if (not RUNTIME and PkgSkip("GLES")==0): if (not RUNTIME and PkgSkip("GLES2")==0): OPTS=['DIR:panda/src/gles2gsg', 'DIR:panda/src/glstuff', 'BUILDING:PANDAGLES2'] - TargetAdd('gles2gsg_config_gles2gsg.obj', opts=OPTS, input='config_gles2gsg.cxx') - TargetAdd('gles2gsg_gles2gsg.obj', opts=OPTS, input='gles2gsg.cxx') + TargetAdd('p3gles2gsg_config_gles2gsg.obj', opts=OPTS, input='config_gles2gsg.cxx') + TargetAdd('p3gles2gsg_gles2gsg.obj', opts=OPTS, input='gles2gsg.cxx') # # DIRECTORY: panda/metalibs/pandaegg/ @@ -3304,20 +3357,21 @@ if (not RUNTIME): OPTS=['DIR:panda/metalibs/pandaegg', 'DIR:panda/src/egg', 'BUILDING:PANDAEGG'] TargetAdd('pandaegg_pandaegg.obj', opts=OPTS, input='pandaegg.cxx') - TargetAdd('libpandaegg_module.obj', input='libegg2pg.in') - TargetAdd('libpandaegg_module.obj', input='libegg.in') + TargetAdd('libpandaegg_module.obj', input='libp3egg2pg.in') + TargetAdd('libpandaegg_module.obj', input='libp3egg.in') TargetAdd('libpandaegg_module.obj', opts=OPTS) TargetAdd('libpandaegg_module.obj', opts=['IMOD:pandaegg', 'ILIB:libpandaegg']) TargetAdd('libpandaegg.dll', input='pandaegg_pandaegg.obj') TargetAdd('libpandaegg.dll', input='libpandaegg_module.obj') - TargetAdd('libpandaegg.dll', input='egg2pg_composite.obj') - TargetAdd('libpandaegg.dll', input='libegg2pg_igate.obj') - TargetAdd('libpandaegg.dll', input='egg_composite1.obj') - TargetAdd('libpandaegg.dll', input='egg_composite2.obj') - TargetAdd('libpandaegg.dll', input='egg_parser.obj') - TargetAdd('libpandaegg.dll', input='egg_lexer.obj') - TargetAdd('libpandaegg.dll', input='libegg_igate.obj') + TargetAdd('libpandaegg.dll', input='p3egg2pg_composite1.obj') + TargetAdd('libpandaegg.dll', input='p3egg2pg_composite2.obj') + TargetAdd('libpandaegg.dll', input='libp3egg2pg_igate.obj') + TargetAdd('libpandaegg.dll', input='p3egg_composite1.obj') + TargetAdd('libpandaegg.dll', input='p3egg_composite2.obj') + TargetAdd('libpandaegg.dll', input='p3egg_parser.obj') + TargetAdd('libpandaegg.dll', input='p3egg_lexer.obj') + TargetAdd('libpandaegg.dll', input='libp3egg_igate.obj') TargetAdd('libpandaegg.dll', input=COMMON_PANDA_LIBS) TargetAdd('libpandaegg.dll', opts=['ADVAPI']) @@ -3327,9 +3381,9 @@ if (not RUNTIME): if (not sys.platform.startswith("win") and PkgSkip("GL")==0 and PkgSkip("OSMESA")==0 and not RUNTIME): OPTS=['DIR:panda/src/mesadisplay', 'DIR:panda/src/glstuff', 'BUILDING:PANDAMESA', 'NVIDIACG', 'GL', 'OSMESA'] - TargetAdd('mesadisplay_composite.obj', opts=OPTS, input='mesadisplay_composite.cxx') + TargetAdd('p3mesadisplay_composite1.obj', opts=OPTS, input='p3mesadisplay_composite1.cxx') OPTS=['DIR:panda/metalibs/pandagl', 'BUILDING:PANDAMESA', 'NVIDIACG', 'GL'] - TargetAdd('libpandamesa.dll', input='mesadisplay_composite.obj') + TargetAdd('libpandamesa.dll', input='p3mesadisplay_composite1.obj') TargetAdd('libpandamesa.dll', input='libp3glstuff.dll') TargetAdd('libpandamesa.dll', input='libpandafx.dll') TargetAdd('libpandamesa.dll', input=COMMON_PANDA_LIBS) @@ -3341,7 +3395,7 @@ if (not sys.platform.startswith("win") and PkgSkip("GL")==0 and PkgSkip("OSMESA" if (sys.platform != "win32" and sys.platform != "darwin" and PkgSkip("X11")==0 and not RUNTIME): OPTS=['DIR:panda/src/x11display', 'BUILDING:PANDAX11', 'X11'] - TargetAdd('x11display_composite.obj', opts=OPTS, input='x11display_composite.cxx') + TargetAdd('p3x11display_composite1.obj', opts=OPTS, input='p3x11display_composite1.cxx') # # DIRECTORY: panda/src/glxdisplay/ @@ -3349,14 +3403,14 @@ if (sys.platform != "win32" and sys.platform != "darwin" and PkgSkip("X11")==0 a if (sys.platform != "win32" and sys.platform != "darwin" and PkgSkip("GL")==0 and PkgSkip("X11")==0 and not RUNTIME): OPTS=['DIR:panda/src/glxdisplay', 'BUILDING:PANDAGL', 'GL', 'NVIDIACG', 'CGGL'] - TargetAdd('glxdisplay_composite.obj', opts=OPTS, input='glxdisplay_composite.cxx') + TargetAdd('p3glxdisplay_composite1.obj', opts=OPTS, input='p3glxdisplay_composite1.cxx') OPTS=['DIR:panda/metalibs/pandagl', 'BUILDING:PANDAGL', 'GL', 'NVIDIACG', 'CGGL'] TargetAdd('pandagl_pandagl.obj', opts=OPTS, input='pandagl.cxx') - TargetAdd('libpandagl.dll', input='x11display_composite.obj') + TargetAdd('libpandagl.dll', input='p3x11display_composite1.obj') TargetAdd('libpandagl.dll', input='pandagl_pandagl.obj') - TargetAdd('libpandagl.dll', input='glgsg_config_glgsg.obj') - TargetAdd('libpandagl.dll', input='glgsg_glgsg.obj') - TargetAdd('libpandagl.dll', input='glxdisplay_composite.obj') + TargetAdd('libpandagl.dll', input='p3glgsg_config_glgsg.obj') + TargetAdd('libpandagl.dll', input='p3glgsg_glgsg.obj') + TargetAdd('libpandagl.dll', input='p3glxdisplay_composite1.obj') TargetAdd('libpandagl.dll', input='libp3glstuff.dll') TargetAdd('libpandagl.dll', input=COMMON_PANDA_LIBS) TargetAdd('libpandagl.dll', opts=['MODULE', 'GL', 'NVIDIACG', 'CGGL', 'X11', 'XRANDR', 'XF86DGA', 'XCURSOR']) @@ -3367,15 +3421,15 @@ if (sys.platform != "win32" and sys.platform != "darwin" and PkgSkip("GL")==0 an if (sys.platform == 'darwin' and PkgSkip("GL")==0 and not RUNTIME): OPTS=['DIR:panda/src/osxdisplay', 'BUILDING:PANDAGL', 'GL', 'NVIDIACG', 'CGGL'] - TargetAdd('osxdisplay_composite1.obj', opts=OPTS, input='osxdisplay_composite1.cxx') - TargetAdd('osxdisplay_osxGraphicsWindow.obj', opts=OPTS, input='osxGraphicsWindow.mm') + TargetAdd('p3osxdisplay_composite1.obj', opts=OPTS, input='p3osxdisplay_composite1.cxx') + TargetAdd('p3osxdisplay_osxGraphicsWindow.obj', opts=OPTS, input='osxGraphicsWindow.mm') OPTS=['DIR:panda/metalibs/pandagl', 'BUILDING:PANDAGL', 'GL', 'NVIDIACG', 'CGGL'] TargetAdd('pandagl_pandagl.obj', opts=OPTS, input='pandagl.cxx') TargetAdd('libpandagl.dll', input='pandagl_pandagl.obj') - TargetAdd('libpandagl.dll', input='glgsg_config_glgsg.obj') - TargetAdd('libpandagl.dll', input='glgsg_glgsg.obj') - TargetAdd('libpandagl.dll', input='osxdisplay_composite1.obj') - TargetAdd('libpandagl.dll', input='osxdisplay_osxGraphicsWindow.obj') + TargetAdd('libpandagl.dll', input='p3glgsg_config_glgsg.obj') + TargetAdd('libpandagl.dll', input='p3glgsg_glgsg.obj') + TargetAdd('libpandagl.dll', input='p3osxdisplay_composite1.obj') + TargetAdd('libpandagl.dll', input='p3osxdisplay_osxGraphicsWindow.obj') TargetAdd('libpandagl.dll', input='libp3glstuff.dll') TargetAdd('libpandagl.dll', input='libpandafx.dll') TargetAdd('libpandagl.dll', input=COMMON_PANDA_LIBS) @@ -3387,13 +3441,13 @@ if (sys.platform == 'darwin' and PkgSkip("GL")==0 and not RUNTIME): if (sys.platform == "win32" and PkgSkip("GL")==0 and not RUNTIME): OPTS=['DIR:panda/src/wgldisplay', 'DIR:panda/src/glstuff', 'BUILDING:PANDAGL', 'NVIDIACG', 'CGGL'] - TargetAdd('wgldisplay_composite.obj', opts=OPTS, input='wgldisplay_composite.cxx') + TargetAdd('p3wgldisplay_composite1.obj', opts=OPTS, input='p3wgldisplay_composite1.cxx') OPTS=['DIR:panda/metalibs/pandagl', 'BUILDING:PANDAGL', 'NVIDIACG', 'CGGL'] TargetAdd('pandagl_pandagl.obj', opts=OPTS, input='pandagl.cxx') TargetAdd('libpandagl.dll', input='pandagl_pandagl.obj') - TargetAdd('libpandagl.dll', input='glgsg_config_glgsg.obj') - TargetAdd('libpandagl.dll', input='glgsg_glgsg.obj') - TargetAdd('libpandagl.dll', input='wgldisplay_composite.obj') + TargetAdd('libpandagl.dll', input='p3glgsg_config_glgsg.obj') + TargetAdd('libpandagl.dll', input='p3glgsg_glgsg.obj') + TargetAdd('libpandagl.dll', input='p3wgldisplay_composite1.obj') TargetAdd('libpandagl.dll', input='libp3windisplay.dll') TargetAdd('libpandagl.dll', input='libp3glstuff.dll') TargetAdd('libpandagl.dll', input='libpandafx.dll') @@ -3407,14 +3461,14 @@ if (sys.platform == "win32" and PkgSkip("GL")==0 and not RUNTIME): if (PkgSkip("EGL")==0 and PkgSkip("GLES")==0 and PkgSkip("X11")==0 and not RUNTIME): DefSymbol('GLES', 'OPENGLES_1', '') OPTS=['DIR:panda/src/egldisplay', 'DIR:panda/src/glstuff', 'BUILDING:PANDAGLES', 'GLES', 'EGL'] - TargetAdd('pandagles_egldisplay_composite1.obj', opts=OPTS, input='egldisplay_composite1.cxx') + TargetAdd('pandagles_egldisplay_composite1.obj', opts=OPTS, input='p3egldisplay_composite1.cxx') OPTS=['DIR:panda/metalibs/pandagles', 'BUILDING:PANDAGLES', 'GLES', 'EGL'] TargetAdd('pandagles_pandagles.obj', opts=OPTS, input='pandagles.cxx') - # Uncomment this as soon as x11-specific stuff is removed from egldisplay - #TargetAdd('libpandagles.dll', input='x11display_composite.obj') + # Uncomment this as soon as x11-specific stuff is removed from p3egldisplay + #TargetAdd('libpandagles.dll', input='p3x11display_composite1.obj') TargetAdd('libpandagles.dll', input='pandagles_pandagles.obj') - TargetAdd('libpandagles.dll', input='glesgsg_config_glesgsg.obj') - TargetAdd('libpandagles.dll', input='glesgsg_glesgsg.obj') + TargetAdd('libpandagles.dll', input='p3glesgsg_config_glesgsg.obj') + TargetAdd('libpandagles.dll', input='p3glesgsg_glesgsg.obj') TargetAdd('libpandagles.dll', input='pandagles_egldisplay_composite1.obj') TargetAdd('libpandagles.dll', input='libp3glstuff.dll') TargetAdd('libpandagles.dll', input=COMMON_PANDA_LIBS) @@ -3427,14 +3481,14 @@ if (PkgSkip("EGL")==0 and PkgSkip("GLES")==0 and PkgSkip("X11")==0 and not RUNTI if (PkgSkip("EGL")==0 and PkgSkip("GLES2")==0 and PkgSkip("X11")==0 and not RUNTIME): DefSymbol('GLES2', 'OPENGLES_2', '') OPTS=['DIR:panda/src/egldisplay', 'DIR:panda/src/glstuff', 'BUILDING:PANDAGLES2', 'GLES2', 'EGL'] - TargetAdd('pandagles2_egldisplay_composite1.obj', opts=OPTS, input='egldisplay_composite1.cxx') + TargetAdd('pandagles2_egldisplay_composite1.obj', opts=OPTS, input='p3egldisplay_composite1.cxx') OPTS=['DIR:panda/metalibs/pandagles2', 'BUILDING:PANDAGLES2', 'GLES2', 'EGL'] TargetAdd('pandagles2_pandagles2.obj', opts=OPTS, input='pandagles2.cxx') - # Uncomment this as soon as x11-specific stuff is removed from egldisplay - #TargetAdd('libpandagles2.dll', input='x11display_composite.obj') + # Uncomment this as soon as x11-specific stuff is removed from p3egldisplay + #TargetAdd('libpandagles2.dll', input='p3x11display_composite1.obj') TargetAdd('libpandagles2.dll', input='pandagles2_pandagles2.obj') - TargetAdd('libpandagles2.dll', input='gles2gsg_config_gles2gsg.obj') - TargetAdd('libpandagles2.dll', input='gles2gsg_gles2gsg.obj') + TargetAdd('libpandagles2.dll', input='p3gles2gsg_config_gles2gsg.obj') + TargetAdd('libpandagles2.dll', input='p3gles2gsg_gles2gsg.obj') TargetAdd('libpandagles2.dll', input='pandagles2_egldisplay_composite1.obj') TargetAdd('libpandagles2.dll', input='libp3glstuff.dll') TargetAdd('libpandagles2.dll', input=COMMON_PANDA_LIBS) @@ -3445,9 +3499,9 @@ if (PkgSkip("EGL")==0 and PkgSkip("GLES2")==0 and PkgSkip("X11")==0 and not RUNT # if (PkgSkip("ODE")==0 and not RUNTIME): OPTS=['DIR:panda/src/ode', 'BUILDING:PANDAODE', 'ODE'] - TargetAdd('pode_composite1.obj', opts=OPTS, input='pode_composite1.cxx') - TargetAdd('pode_composite2.obj', opts=OPTS, input='pode_composite2.cxx') - TargetAdd('pode_composite3.obj', opts=OPTS, input='pode_composite3.cxx') + TargetAdd('p3ode_composite1.obj', opts=OPTS, input='p3ode_composite1.cxx') + TargetAdd('p3ode_composite2.obj', opts=OPTS, input='p3ode_composite2.cxx') + TargetAdd('p3ode_composite3.obj', opts=OPTS, input='p3ode_composite3.cxx') IGATEFILES=GetDirectoryContents('panda/src/ode', ["*.h", "*_composite.cxx"]) IGATEFILES.remove("odeConvexGeom.h") IGATEFILES.remove("odeHeightFieldGeom.h") @@ -3469,9 +3523,9 @@ if (PkgSkip("ODE")==0 and not RUNTIME): TargetAdd('libpandaode.dll', input='pandaode_pandaode.obj') TargetAdd('libpandaode.dll', input='libpandaode_module.obj') - TargetAdd('libpandaode.dll', input='pode_composite1.obj') - TargetAdd('libpandaode.dll', input='pode_composite2.obj') - TargetAdd('libpandaode.dll', input='pode_composite3.obj') + TargetAdd('libpandaode.dll', input='p3ode_composite1.obj') + TargetAdd('libpandaode.dll', input='p3ode_composite2.obj') + TargetAdd('libpandaode.dll', input='p3ode_composite3.obj') TargetAdd('libpandaode.dll', input='libpandaode_igate.obj') TargetAdd('libpandaode.dll', input=COMMON_PANDA_LIBS) TargetAdd('libpandaode.dll', opts=['WINUSER', 'ODE']) @@ -3481,7 +3535,7 @@ if (PkgSkip("ODE")==0 and not RUNTIME): # if (PkgSkip("BULLET")==0 and not RUNTIME): OPTS=['DIR:panda/src/bullet', 'BUILDING:PANDABULLET', 'BULLET'] - TargetAdd('bullet_composite.obj', opts=OPTS, input='bullet_composite.cxx') + TargetAdd('p3bullet_composite.obj', opts=OPTS, input='p3bullet_composite.cxx') IGATEFILES=GetDirectoryContents('panda/src/bullet', ["*.h", "*_composite.cxx"]) TargetAdd('libpandabullet.in', opts=OPTS, input=IGATEFILES) TargetAdd('libpandabullet.in', opts=['IMOD:pandabullet', 'ILIB:libpandabullet', 'SRCDIR:panda/src/bullet']) @@ -3500,7 +3554,7 @@ if (PkgSkip("BULLET")==0 and not RUNTIME): TargetAdd('libpandabullet.dll', input='pandabullet_pandabullet.obj') TargetAdd('libpandabullet.dll', input='libpandabullet_module.obj') - TargetAdd('libpandabullet.dll', input='bullet_composite.obj') + TargetAdd('libpandabullet.dll', input='p3bullet_composite.obj') TargetAdd('libpandabullet.dll', input='libpandabullet_igate.obj') TargetAdd('libpandabullet.dll', input=COMMON_PANDA_LIBS) TargetAdd('libpandabullet.dll', opts=['WINUSER', 'BULLET']) @@ -3511,7 +3565,7 @@ if (PkgSkip("BULLET")==0 and not RUNTIME): if (PkgSkip("PHYSX")==0): OPTS=['DIR:panda/src/physx', 'BUILDING:PANDAPHYSX', 'PHYSX', 'NOPPC'] - TargetAdd('physx_composite.obj', opts=OPTS, input='physx_composite.cxx') + TargetAdd('p3physx_composite.obj', opts=OPTS, input='p3physx_composite.cxx') IGATEFILES=GetDirectoryContents('panda/src/physx', ["*.h", "*_composite.cxx"]) TargetAdd('libpandaphysx.in', opts=OPTS, input=IGATEFILES) TargetAdd('libpandaphysx.in', opts=['IMOD:pandaphysx', 'ILIB:libpandaphysx', 'SRCDIR:panda/src/physx']) @@ -3531,7 +3585,7 @@ if (PkgSkip("PHYSX")==0): TargetAdd('libpandaphysx.dll', input='pandaphysx_pandaphysx.obj') TargetAdd('libpandaphysx.dll', input='libpandaphysx_module.obj') - TargetAdd('libpandaphysx.dll', input='physx_composite.obj') + TargetAdd('libpandaphysx.dll', input='p3physx_composite.obj') TargetAdd('libpandaphysx.dll', input='libpandaphysx_igate.obj') TargetAdd('libpandaphysx.dll', input=COMMON_PANDA_LIBS) TargetAdd('libpandaphysx.dll', opts=['WINUSER', 'PHYSX', 'NOPPC']) @@ -3542,12 +3596,13 @@ if (PkgSkip("PHYSX")==0): if (not RUNTIME): OPTS=['DIR:panda/src/physics', 'BUILDING:PANDAPHYSICS'] - TargetAdd('physics_composite.obj', opts=OPTS, input='physics_composite.cxx') + TargetAdd('p3physics_composite1.obj', opts=OPTS, input='p3physics_composite1.cxx') + TargetAdd('p3physics_composite2.obj', opts=OPTS, input='p3physics_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/physics', ["*.h", "*_composite.cxx"]) IGATEFILES.remove("forces.h") - TargetAdd('libphysics.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libphysics.in', opts=['IMOD:pandaphysics', 'ILIB:libphysics', 'SRCDIR:panda/src/physics']) - TargetAdd('libphysics_igate.obj', input='libphysics.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3physics.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3physics.in', opts=['IMOD:pandaphysics', 'ILIB:libp3physics', 'SRCDIR:panda/src/physics']) + TargetAdd('libp3physics_igate.obj', input='libp3physics.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: panda/src/particlesystem/ @@ -3555,15 +3610,16 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/particlesystem', 'BUILDING:PANDAPHYSICS'] - TargetAdd('particlesystem_composite.obj', opts=OPTS, input='particlesystem_composite.cxx') + TargetAdd('p3particlesystem_composite1.obj', opts=OPTS, input='p3particlesystem_composite1.cxx') + TargetAdd('p3particlesystem_composite2.obj', opts=OPTS, input='p3particlesystem_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/particlesystem', ["*.h", "*_composite.cxx"]) IGATEFILES.remove('orientedParticle.h') IGATEFILES.remove('orientedParticleFactory.h') IGATEFILES.remove('particlefactories.h') IGATEFILES.remove('emitters.h') IGATEFILES.remove('particles.h') - TargetAdd('libparticlesystem.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libparticlesystem.in', opts=['IMOD:pandaphysics', 'ILIB:libparticlesystem', 'SRCDIR:panda/src/particlesystem']) + TargetAdd('libp3particlesystem.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3particlesystem.in', opts=['IMOD:pandaphysics', 'ILIB:libp3particlesystem', 'SRCDIR:panda/src/particlesystem']) # # DIRECTORY: panda/metalibs/pandaphysics/ @@ -3573,17 +3629,19 @@ if (not RUNTIME): OPTS=['DIR:panda/metalibs/pandaphysics', 'BUILDING:PANDAPHYSICS'] TargetAdd('pandaphysics_pandaphysics.obj', opts=OPTS, input='pandaphysics.cxx') - TargetAdd('libpandaphysics_module.obj', input='libphysics.in') - TargetAdd('libpandaphysics_module.obj', input='libparticlesystem.in') + TargetAdd('libpandaphysics_module.obj', input='libp3physics.in') + TargetAdd('libpandaphysics_module.obj', input='libp3particlesystem.in') TargetAdd('libpandaphysics_module.obj', opts=OPTS) TargetAdd('libpandaphysics_module.obj', opts=['IMOD:pandaphysics', 'ILIB:libpandaphysics']) TargetAdd('libpandaphysics.dll', input='pandaphysics_pandaphysics.obj') TargetAdd('libpandaphysics.dll', input='libpandaphysics_module.obj') - TargetAdd('libpandaphysics.dll', input='physics_composite.obj') - TargetAdd('libpandaphysics.dll', input='libphysics_igate.obj') - TargetAdd('libpandaphysics.dll', input='particlesystem_composite.obj') - TargetAdd('libpandaphysics.dll', input='libparticlesystem_igate.obj') + TargetAdd('libpandaphysics.dll', input='p3physics_composite1.obj') + TargetAdd('libpandaphysics.dll', input='p3physics_composite2.obj') + TargetAdd('libpandaphysics.dll', input='libp3physics_igate.obj') + TargetAdd('libpandaphysics.dll', input='p3particlesystem_composite1.obj') + TargetAdd('libpandaphysics.dll', input='p3particlesystem_composite2.obj') + TargetAdd('libpandaphysics.dll', input='libp3particlesystem_igate.obj') TargetAdd('libpandaphysics.dll', input=COMMON_PANDA_LIBS) TargetAdd('libpandaphysics.dll', opts=['ADVAPI']) @@ -3630,31 +3688,31 @@ if (not RTDIST and not RUNTIME and PkgSkip("PVIEW")==0): if (not RUNTIME and (sys.platform == "win32" or sys.platform == "darwin" or PkgSkip("X11")==0) and PkgSkip("TINYDISPLAY")==0): OPTS=['DIR:panda/src/tinydisplay', 'BUILDING:TINYDISPLAY'] - TargetAdd('tinydisplay_composite1.obj', opts=OPTS, input='tinydisplay_composite1.cxx') - TargetAdd('tinydisplay_composite2.obj', opts=OPTS, input='tinydisplay_composite2.cxx') - TargetAdd('tinydisplay_ztriangle_1.obj', opts=OPTS, input='ztriangle_1.cxx') - TargetAdd('tinydisplay_ztriangle_2.obj', opts=OPTS, input='ztriangle_2.cxx') - TargetAdd('tinydisplay_ztriangle_3.obj', opts=OPTS, input='ztriangle_3.cxx') - TargetAdd('tinydisplay_ztriangle_4.obj', opts=OPTS, input='ztriangle_4.cxx') - TargetAdd('tinydisplay_ztriangle_table.obj', opts=OPTS, input='ztriangle_table.cxx') + TargetAdd('p3tinydisplay_composite1.obj', opts=OPTS, input='p3tinydisplay_composite1.cxx') + TargetAdd('p3tinydisplay_composite2.obj', opts=OPTS, input='p3tinydisplay_composite2.cxx') + TargetAdd('p3tinydisplay_ztriangle_1.obj', opts=OPTS, input='ztriangle_1.cxx') + TargetAdd('p3tinydisplay_ztriangle_2.obj', opts=OPTS, input='ztriangle_2.cxx') + TargetAdd('p3tinydisplay_ztriangle_3.obj', opts=OPTS, input='ztriangle_3.cxx') + TargetAdd('p3tinydisplay_ztriangle_4.obj', opts=OPTS, input='ztriangle_4.cxx') + TargetAdd('p3tinydisplay_ztriangle_table.obj', opts=OPTS, input='ztriangle_table.cxx') if (sys.platform == "darwin"): - TargetAdd('tinydisplay_tinyOsxGraphicsWindow.obj', opts=OPTS, input='tinyOsxGraphicsWindow.mm') - TargetAdd('libtinydisplay.dll', input='tinydisplay_tinyOsxGraphicsWindow.obj') - TargetAdd('libtinydisplay.dll', opts=['CARBON', 'AGL', 'COCOA']) + TargetAdd('p3tinydisplay_tinyOsxGraphicsWindow.obj', opts=OPTS, input='tinyOsxGraphicsWindow.mm') + TargetAdd('libp3tinydisplay.dll', input='p3tinydisplay_tinyOsxGraphicsWindow.obj') + TargetAdd('libp3tinydisplay.dll', opts=['CARBON', 'AGL', 'COCOA']) elif (sys.platform == "win32"): - TargetAdd('libtinydisplay.dll', input='libp3windisplay.dll') - TargetAdd('libtinydisplay.dll', opts=['WINIMM', 'WINGDI', 'WINKERNEL', 'WINOLDNAMES', 'WINUSER', 'WINMM']) + TargetAdd('libp3tinydisplay.dll', input='libp3windisplay.dll') + TargetAdd('libp3tinydisplay.dll', opts=['WINIMM', 'WINGDI', 'WINKERNEL', 'WINOLDNAMES', 'WINUSER', 'WINMM']) else: - TargetAdd('libtinydisplay.dll', input='x11display_composite.obj') - TargetAdd('libtinydisplay.dll', opts=['X11', 'XRANDR', 'XF86DGA', 'XCURSOR']) - TargetAdd('libtinydisplay.dll', input='tinydisplay_composite1.obj') - TargetAdd('libtinydisplay.dll', input='tinydisplay_composite2.obj') - TargetAdd('libtinydisplay.dll', input='tinydisplay_ztriangle_1.obj') - TargetAdd('libtinydisplay.dll', input='tinydisplay_ztriangle_2.obj') - TargetAdd('libtinydisplay.dll', input='tinydisplay_ztriangle_3.obj') - TargetAdd('libtinydisplay.dll', input='tinydisplay_ztriangle_4.obj') - TargetAdd('libtinydisplay.dll', input='tinydisplay_ztriangle_table.obj') - TargetAdd('libtinydisplay.dll', input=COMMON_PANDA_LIBS) + TargetAdd('libp3tinydisplay.dll', input='p3x11display_composite1.obj') + TargetAdd('libp3tinydisplay.dll', opts=['X11', 'XRANDR', 'XF86DGA', 'XCURSOR']) + TargetAdd('libp3tinydisplay.dll', input='p3tinydisplay_composite1.obj') + TargetAdd('libp3tinydisplay.dll', input='p3tinydisplay_composite2.obj') + TargetAdd('libp3tinydisplay.dll', input='p3tinydisplay_ztriangle_1.obj') + TargetAdd('libp3tinydisplay.dll', input='p3tinydisplay_ztriangle_2.obj') + TargetAdd('libp3tinydisplay.dll', input='p3tinydisplay_ztriangle_3.obj') + TargetAdd('libp3tinydisplay.dll', input='p3tinydisplay_ztriangle_4.obj') + TargetAdd('libp3tinydisplay.dll', input='p3tinydisplay_ztriangle_table.obj') + TargetAdd('libp3tinydisplay.dll', input=COMMON_PANDA_LIBS) # # DIRECTORY: direct/src/directbase/ @@ -3662,7 +3720,7 @@ if (not RUNTIME and (sys.platform == "win32" or sys.platform == "darwin" or PkgS if (PkgSkip("DIRECT")==0): OPTS=['DIR:direct/src/directbase', 'PYTHON'] - TargetAdd('directbase_directbase.obj', opts=OPTS+['BUILDING:DIRECT'], input='directbase.cxx') + TargetAdd('p3directbase_directbase.obj', opts=OPTS+['BUILDING:DIRECT'], input='directbase.cxx') if (PkgSkip("PYTHON")==0 and not RTDIST and not RUNTIME): DefSymbol("BUILDING:PACKPANDA", "IMPORT_MODULE", "direct.directscripts.packpanda") @@ -3682,16 +3740,17 @@ if (PkgSkip("DIRECT")==0): if (PkgSkip("DIRECT")==0): OPTS=['DIR:direct/src/dcparser', 'WITHINPANDA', 'BUILDING:DIRECT', 'BISONPREFIX_dcyy'] CreateFile(GetOutputDir()+"/include/dcParser.h") - TargetAdd('dcparser_dcParser.obj', opts=OPTS, input='dcParser.yxx') - TargetAdd('dcParser.h', input='egg_parser.obj', opts=['DEPENDENCYONLY']) - TargetAdd('dcparser_dcLexer.obj', opts=OPTS, input='dcLexer.lxx') - TargetAdd('dcparser_composite.obj', opts=OPTS, input='dcparser_composite.cxx') + TargetAdd('p3dcparser_dcParser.obj', opts=OPTS, input='dcParser.yxx') + TargetAdd('dcParser.h', input='p3egg_parser.obj', opts=['DEPENDENCYONLY']) + TargetAdd('p3dcparser_dcLexer.obj', opts=OPTS, input='dcLexer.lxx') + TargetAdd('p3dcparser_composite1.obj', opts=OPTS, input='p3dcparser_composite1.cxx') + TargetAdd('p3dcparser_composite2.obj', opts=OPTS, input='p3dcparser_composite2.cxx') IGATEFILES=GetDirectoryContents('direct/src/dcparser', ["*.h", "*_composite.cxx"]) if "dcParser.h" in IGATEFILES: IGATEFILES.remove("dcParser.h") if "dcmsgtypes.h" in IGATEFILES: IGATEFILES.remove('dcmsgtypes.h') - TargetAdd('libdcparser.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libdcparser.in', opts=['IMOD:p3direct', 'ILIB:libdcparser', 'SRCDIR:direct/src/dcparser']) - TargetAdd('libdcparser_igate.obj', input='libdcparser.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3dcparser.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3dcparser.in', opts=['IMOD:p3direct', 'ILIB:libp3dcparser', 'SRCDIR:direct/src/dcparser']) + TargetAdd('libp3dcparser_igate.obj', input='libp3dcparser.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: direct/src/deadrec/ @@ -3699,11 +3758,11 @@ if (PkgSkip("DIRECT")==0): if (PkgSkip("DIRECT")==0): OPTS=['DIR:direct/src/deadrec', 'BUILDING:DIRECT'] - TargetAdd('deadrec_composite.obj', opts=OPTS, input='deadrec_composite.cxx') + TargetAdd('p3deadrec_composite1.obj', opts=OPTS, input='p3deadrec_composite1.cxx') IGATEFILES=GetDirectoryContents('direct/src/deadrec', ["*.h", "*_composite.cxx"]) - TargetAdd('libdeadrec.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libdeadrec.in', opts=['IMOD:p3direct', 'ILIB:libdeadrec', 'SRCDIR:direct/src/deadrec']) - TargetAdd('libdeadrec_igate.obj', input='libdeadrec.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3deadrec.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3deadrec.in', opts=['IMOD:p3direct', 'ILIB:libp3deadrec', 'SRCDIR:direct/src/deadrec']) + TargetAdd('libp3deadrec_igate.obj', input='libp3deadrec.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: direct/src/distributed/ @@ -3711,13 +3770,13 @@ if (PkgSkip("DIRECT")==0): if (PkgSkip("DIRECT")==0): OPTS=['DIR:direct/src/distributed', 'DIR:direct/src/dcparser', 'WITHINPANDA', 'BUILDING:DIRECT', 'OPENSSL'] - TargetAdd('distributed_config_distributed.obj', opts=OPTS, input='config_distributed.cxx') - TargetAdd('distributed_cConnectionRepository.obj', opts=OPTS, input='cConnectionRepository.cxx') - TargetAdd('distributed_cDistributedSmoothNodeBase.obj', opts=OPTS, input='cDistributedSmoothNodeBase.cxx') + TargetAdd('p3distributed_config_distributed.obj', opts=OPTS, input='config_distributed.cxx') + TargetAdd('p3distributed_cConnectionRepository.obj', opts=OPTS, input='cConnectionRepository.cxx') + TargetAdd('p3distributed_cDistributedSmoothNodeBase.obj', opts=OPTS, input='cDistributedSmoothNodeBase.cxx') IGATEFILES=GetDirectoryContents('direct/src/distributed', ["*.h", "*.cxx"]) - TargetAdd('libdistributed.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libdistributed.in', opts=['IMOD:p3direct', 'ILIB:libdistributed', 'SRCDIR:direct/src/distributed']) - TargetAdd('libdistributed_igate.obj', input='libdistributed.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3distributed.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3distributed.in', opts=['IMOD:p3direct', 'ILIB:libp3distributed', 'SRCDIR:direct/src/distributed']) + TargetAdd('libp3distributed_igate.obj', input='libp3distributed.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: direct/src/interval/ @@ -3725,11 +3784,11 @@ if (PkgSkip("DIRECT")==0): if (PkgSkip("DIRECT")==0): OPTS=['DIR:direct/src/interval', 'BUILDING:DIRECT'] - TargetAdd('interval_composite.obj', opts=OPTS, input='interval_composite.cxx') + TargetAdd('p3interval_composite1.obj', opts=OPTS, input='p3interval_composite1.cxx') IGATEFILES=GetDirectoryContents('direct/src/interval', ["*.h", "*_composite.cxx"]) - TargetAdd('libinterval.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libinterval.in', opts=['IMOD:p3direct', 'ILIB:libinterval', 'SRCDIR:direct/src/interval']) - TargetAdd('libinterval_igate.obj', input='libinterval.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3interval.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3interval.in', opts=['IMOD:p3direct', 'ILIB:libp3interval', 'SRCDIR:direct/src/interval']) + TargetAdd('libp3interval_igate.obj', input='libp3interval.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: direct/src/showbase/ @@ -3737,13 +3796,13 @@ if (PkgSkip("DIRECT")==0): if (PkgSkip("DIRECT")==0): OPTS=['DIR:direct/src/showbase', 'BUILDING:DIRECT'] - TargetAdd('showbase_showBase.obj', opts=OPTS, input='showBase.cxx') + TargetAdd('p3showbase_showBase.obj', opts=OPTS, input='showBase.cxx') if (sys.platform == "darwin"): - TargetAdd('showbase_showBase_assist.obj', opts=OPTS, input='showBase_assist.mm') + TargetAdd('p3showbase_showBase_assist.obj', opts=OPTS, input='showBase_assist.mm') IGATEFILES=GetDirectoryContents('direct/src/showbase', ["*.h", "showBase.cxx"]) - TargetAdd('libshowbase.in', opts=OPTS, input=IGATEFILES) - TargetAdd('libshowbase.in', opts=['IMOD:p3direct', 'ILIB:libshowbase', 'SRCDIR:direct/src/showbase']) - TargetAdd('libshowbase_igate.obj', input='libshowbase.in', opts=["DEPENDENCYONLY"]) + TargetAdd('libp3showbase.in', opts=OPTS, input=IGATEFILES) + TargetAdd('libp3showbase.in', opts=['IMOD:p3direct', 'ILIB:libp3showbase', 'SRCDIR:direct/src/showbase']) + TargetAdd('libp3showbase_igate.obj', input='libp3showbase.in', opts=["DEPENDENCYONLY"]) # # DIRECTORY: direct/metalibs/direct/ @@ -3751,35 +3810,36 @@ if (PkgSkip("DIRECT")==0): if (PkgSkip("DIRECT")==0): OPTS=['DIR:direct/metalibs/direct', 'BUILDING:DIRECT'] - TargetAdd('direct_direct.obj', opts=OPTS, input='direct.cxx') + TargetAdd('p3direct_direct.obj', opts=OPTS, input='direct.cxx') - TargetAdd('libp3direct_module.obj', input='libdcparser.in') - TargetAdd('libp3direct_module.obj', input='libshowbase.in') - TargetAdd('libp3direct_module.obj', input='libdeadrec.in') - TargetAdd('libp3direct_module.obj', input='libinterval.in') - TargetAdd('libp3direct_module.obj', input='libdistributed.in') + TargetAdd('libp3direct_module.obj', input='libp3dcparser.in') + TargetAdd('libp3direct_module.obj', input='libp3showbase.in') + TargetAdd('libp3direct_module.obj', input='libp3deadrec.in') + TargetAdd('libp3direct_module.obj', input='libp3interval.in') + TargetAdd('libp3direct_module.obj', input='libp3distributed.in') TargetAdd('libp3direct_module.obj', opts=OPTS) TargetAdd('libp3direct_module.obj', opts=['IMOD:p3direct', 'ILIB:libp3direct']) - TargetAdd('libp3direct.dll', input='direct_direct.obj') + TargetAdd('libp3direct.dll', input='p3direct_direct.obj') TargetAdd('libp3direct.dll', input='libp3direct_module.obj') - TargetAdd('libp3direct.dll', input='directbase_directbase.obj') - TargetAdd('libp3direct.dll', input='dcparser_composite.obj') - TargetAdd('libp3direct.dll', input='dcparser_dcParser.obj') - TargetAdd('libp3direct.dll', input='dcparser_dcLexer.obj') - TargetAdd('libp3direct.dll', input='libdcparser_igate.obj') - TargetAdd('libp3direct.dll', input='showbase_showBase.obj') + TargetAdd('libp3direct.dll', input='p3directbase_directbase.obj') + TargetAdd('libp3direct.dll', input='p3dcparser_composite1.obj') + TargetAdd('libp3direct.dll', input='p3dcparser_composite2.obj') + TargetAdd('libp3direct.dll', input='p3dcparser_dcParser.obj') + TargetAdd('libp3direct.dll', input='p3dcparser_dcLexer.obj') + TargetAdd('libp3direct.dll', input='libp3dcparser_igate.obj') + TargetAdd('libp3direct.dll', input='p3showbase_showBase.obj') if (sys.platform == "darwin"): - TargetAdd('libp3direct.dll', input='showbase_showBase_assist.obj') - TargetAdd('libp3direct.dll', input='libshowbase_igate.obj') - TargetAdd('libp3direct.dll', input='deadrec_composite.obj') - TargetAdd('libp3direct.dll', input='libdeadrec_igate.obj') - TargetAdd('libp3direct.dll', input='interval_composite.obj') - TargetAdd('libp3direct.dll', input='libinterval_igate.obj') - TargetAdd('libp3direct.dll', input='distributed_config_distributed.obj') - TargetAdd('libp3direct.dll', input='distributed_cConnectionRepository.obj') - TargetAdd('libp3direct.dll', input='distributed_cDistributedSmoothNodeBase.obj') - TargetAdd('libp3direct.dll', input='libdistributed_igate.obj') + TargetAdd('libp3direct.dll', input='p3showbase_showBase_assist.obj') + TargetAdd('libp3direct.dll', input='libp3showbase_igate.obj') + TargetAdd('libp3direct.dll', input='p3deadrec_composite1.obj') + TargetAdd('libp3direct.dll', input='libp3deadrec_igate.obj') + TargetAdd('libp3direct.dll', input='p3interval_composite1.obj') + TargetAdd('libp3direct.dll', input='libp3interval_igate.obj') + TargetAdd('libp3direct.dll', input='p3distributed_config_distributed.obj') + TargetAdd('libp3direct.dll', input='p3distributed_cConnectionRepository.obj') + TargetAdd('libp3direct.dll', input='p3distributed_cDistributedSmoothNodeBase.obj') + TargetAdd('libp3direct.dll', input='libp3distributed_igate.obj') TargetAdd('libp3direct.dll', input=COMMON_PANDA_LIBS) TargetAdd('libp3direct.dll', opts=['ADVAPI', 'OPENSSL', 'WINUSER']) @@ -3835,7 +3895,7 @@ if (RTDIST or RUNTIME): TargetAdd(fname, input='plugin_handleStreamBuf.obj') TargetAdd(fname, input='libp3tinyxml.ilb') if (sys.platform == "darwin"): - TargetAdd(fname, input='libsubprocbuffer.ilb') + TargetAdd(fname, input='libp3subprocbuffer.ilb') TargetAdd(fname, opts=['OPENSSL', 'ZLIB', 'JPEG', 'PNG', 'X11', 'ADVAPI', 'WINUSER', 'WINGDI', 'WINSHELL', 'WINCOMCTL', 'WINOLE', 'MSIMG']) TargetAdd("libp3d_plugin_static.ilb", input='plugin_get_twirl_data.obj') @@ -4021,17 +4081,21 @@ if (RTDIST): TargetAdd('plugin_standalone_p3dEmbedMain.obj', opts=OPTS, input='p3dEmbedMain.cxx') TargetAdd('plugin_standalone_p3dEmbed.obj', opts=OPTS, input='p3dEmbed.cxx') TargetAdd('plugin_standalone_pystub.obj', opts=OPTS, input='pystub.cxx') - TargetAdd('plugin_standalone_dtoolbase_composite1.obj', opts=OPTS, input='dtoolbase_composite1.cxx') - TargetAdd('plugin_standalone_dtoolbase_composite2.obj', opts=OPTS, input='dtoolbase_composite2.cxx') + TargetAdd('plugin_standalone_dtoolbase_composite1.obj', opts=OPTS, input='p3dtoolbase_composite1.cxx') + TargetAdd('plugin_standalone_dtoolbase_composite2.obj', opts=OPTS, input='p3dtoolbase_composite2.cxx') TargetAdd('plugin_standalone_lookup3.obj', opts=OPTS, input='lookup3.c') TargetAdd('plugin_standalone_indent.obj', opts=OPTS, input='indent.cxx') - TargetAdd('plugin_standalone_dtoolutil_composite.obj', opts=OPTS, input='dtoolutil_composite.cxx') + TargetAdd('plugin_standalone_dtoolutil_composite1.obj', opts=OPTS, input='p3dtoolutil_composite1.cxx') + TargetAdd('plugin_standalone_dtoolutil_composite2.obj', opts=OPTS, input='p3dtoolutil_composite2.cxx') if (sys.platform == 'darwin'): TargetAdd('plugin_standalone_dtoolutil_filename_assist.obj', opts=OPTS, input='filename_assist.mm') - TargetAdd('plugin_standalone_prc_composite.obj', opts=OPTS, input='prc_composite.cxx') - TargetAdd('plugin_standalone_dconfig_composite.obj', opts=OPTS, input='dconfig_composite.cxx') - TargetAdd('plugin_standalone_express_composite.obj', opts=OPTS, input='express_composite.cxx') - TargetAdd('plugin_standalone_downloader_composite.obj', opts=OPTS, input='downloader_composite.cxx') + TargetAdd('plugin_standalone_prc_composite1.obj', opts=OPTS, input='p3prc_composite1.cxx') + TargetAdd('plugin_standalone_prc_composite2.obj', opts=OPTS, input='p3prc_composite2.cxx') + TargetAdd('plugin_standalone_dconfig_composite1.obj', opts=OPTS, input='p3dconfig_composite1.cxx') + TargetAdd('plugin_standalone_express_composite1.obj', opts=OPTS, input='p3express_composite1.cxx') + TargetAdd('plugin_standalone_express_composite2.obj', opts=OPTS, input='p3express_composite2.cxx') + TargetAdd('plugin_standalone_downloader_composite1.obj', opts=OPTS, input='p3downloader_composite1.cxx') + TargetAdd('plugin_standalone_downloader_composite2.obj', opts=OPTS, input='p3downloader_composite2.cxx') TargetAdd('p3dembed.exe', input='plugin_standalone_panda3dBase.obj') TargetAdd('p3dembed.exe', input='plugin_standalone_p3dEmbedMain.obj') TargetAdd('p3dembed.exe', input='plugin_standalone_p3dEmbed.obj') @@ -4040,18 +4104,22 @@ if (RTDIST): TargetAdd('p3dembed.exe', input='plugin_standalone_dtoolbase_composite2.obj') TargetAdd('p3dembed.exe', input='plugin_standalone_lookup3.obj') TargetAdd('p3dembed.exe', input='plugin_standalone_indent.obj') - TargetAdd('p3dembed.exe', input='plugin_standalone_dtoolutil_composite.obj') + TargetAdd('p3dembed.exe', input='plugin_standalone_dtoolutil_composite1.obj') + TargetAdd('p3dembed.exe', input='plugin_standalone_dtoolutil_composite2.obj') if (sys.platform == 'darwin'): TargetAdd('p3dembed.exe', input='plugin_standalone_dtoolutil_filename_assist.obj') - TargetAdd('p3dembed.exe', input='plugin_standalone_prc_composite.obj') - TargetAdd('p3dembed.exe', input='plugin_standalone_dconfig_composite.obj') - TargetAdd('p3dembed.exe', input='plugin_standalone_express_composite.obj') - TargetAdd('p3dembed.exe', input='plugin_standalone_downloader_composite.obj') + TargetAdd('p3dembed.exe', input='plugin_standalone_prc_composite1.obj') + TargetAdd('p3dembed.exe', input='plugin_standalone_prc_composite2.obj') + TargetAdd('p3dembed.exe', input='plugin_standalone_dconfig_composite1.obj') + TargetAdd('p3dembed.exe', input='plugin_standalone_express_composite1.obj') + TargetAdd('p3dembed.exe', input='plugin_standalone_express_composite2.obj') + TargetAdd('p3dembed.exe', input='plugin_standalone_downloader_composite1.obj') + TargetAdd('p3dembed.exe', input='plugin_standalone_downloader_composite2.obj') TargetAdd('p3dembed.exe', input='plugin_common.obj') if (sys.platform == "darwin"): TargetAdd('p3dembed.exe', input='plugin_find_root_dir_assist.obj') if (sys.platform == "darwin"): - TargetAdd('p3dembed.exe', input='libsubprocbuffer.ilb') + TargetAdd('p3dembed.exe', input='libp3subprocbuffer.ilb') TargetAdd('p3dembed.exe', input='libp3tinyxml.ilb') TargetAdd('p3dembed.exe', input='libp3d_plugin_static.ilb') TargetAdd('p3dembed.exe', opts=['NOICON', 'NOSTRIP', 'WINGDI', 'WINSOCK2', 'ZLIB', 'WINUSER', 'OPENSSL', 'JPEG', 'WINOLE', 'CARBON', 'MSIMG', 'WINCOMCTL', 'ADVAPI', 'WINSHELL', 'X11', 'PNG']) @@ -4068,11 +4136,15 @@ if (RTDIST): TargetAdd('p3dembedw.exe', input='plugin_standalone_dtoolbase_composite2.obj') TargetAdd('p3dembedw.exe', input='plugin_standalone_lookup3.obj') TargetAdd('p3dembedw.exe', input='plugin_standalone_indent.obj') - TargetAdd('p3dembedw.exe', input='plugin_standalone_dtoolutil_composite.obj') - TargetAdd('p3dembedw.exe', input='plugin_standalone_prc_composite.obj') - TargetAdd('p3dembedw.exe', input='plugin_standalone_dconfig_composite.obj') - TargetAdd('p3dembedw.exe', input='plugin_standalone_express_composite.obj') - TargetAdd('p3dembedw.exe', input='plugin_standalone_downloader_composite.obj') + TargetAdd('p3dembedw.exe', input='plugin_standalone_dtoolutil_composite1.obj') + TargetAdd('p3dembedw.exe', input='plugin_standalone_dtoolutil_composite2.obj') + TargetAdd('p3dembedw.exe', input='plugin_standalone_prc_composite1.obj') + TargetAdd('p3dembedw.exe', input='plugin_standalone_prc_composite2.obj') + TargetAdd('p3dembedw.exe', input='plugin_standalone_dconfig_composite1.obj') + TargetAdd('p3dembedw.exe', input='plugin_standalone_express_composite1.obj') + TargetAdd('p3dembedw.exe', input='plugin_standalone_express_composite2.obj') + TargetAdd('p3dembedw.exe', input='plugin_standalone_downloader_composite1.obj') + TargetAdd('p3dembedw.exe', input='plugin_standalone_downloader_composite2.obj') TargetAdd('p3dembedw.exe', input='plugin_common.obj') TargetAdd('p3dembedw.exe', input='libp3tinyxml.ilb') TargetAdd('p3dembedw.exe', input='libp3d_plugin_static.ilb') @@ -4084,8 +4156,8 @@ if (RTDIST): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/pandatoolbase'] - TargetAdd('pandatoolbase_composite1.obj', opts=OPTS, input='pandatoolbase_composite1.cxx') - TargetAdd('libpandatoolbase.lib', input='pandatoolbase_composite1.obj') + TargetAdd('p3pandatoolbase_composite1.obj', opts=OPTS, input='p3pandatoolbase_composite1.cxx') + TargetAdd('libp3pandatoolbase.lib', input='p3pandatoolbase_composite1.obj') # # DIRECTORY: pandatool/src/converter/ @@ -4093,8 +4165,8 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/converter'] - TargetAdd('converter_somethingToEggConverter.obj', opts=OPTS, input='somethingToEggConverter.cxx') - TargetAdd('libconverter.lib', input='converter_somethingToEggConverter.obj') + TargetAdd('p3converter_somethingToEggConverter.obj', opts=OPTS, input='somethingToEggConverter.cxx') + TargetAdd('libp3converter.lib', input='p3converter_somethingToEggConverter.obj') # # DIRECTORY: pandatool/src/progbase/ @@ -4102,8 +4174,8 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/progbase', 'ZLIB'] - TargetAdd('progbase_composite1.obj', opts=OPTS, input='progbase_composite1.cxx') - TargetAdd('libprogbase.lib', input='progbase_composite1.obj') + TargetAdd('p3progbase_composite1.obj', opts=OPTS, input='p3progbase_composite1.cxx') + TargetAdd('libp3progbase.lib', input='p3progbase_composite1.obj') # # DIRECTORY: pandatool/src/eggbase/ @@ -4111,8 +4183,8 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/eggbase'] - TargetAdd('eggbase_composite1.obj', opts=OPTS, input='eggbase_composite1.cxx') - TargetAdd('libeggbase.lib', input='eggbase_composite1.obj') + TargetAdd('p3eggbase_composite1.obj', opts=OPTS, input='p3eggbase_composite1.cxx') + TargetAdd('libp3eggbase.lib', input='p3eggbase_composite1.obj') # # DIRECTORY: pandatool/src/bam/ @@ -4122,8 +4194,8 @@ if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/bam'] TargetAdd('bam-info_bamInfo.obj', opts=OPTS, input='bamInfo.cxx') TargetAdd('bam-info.exe', input='bam-info_bamInfo.obj') - TargetAdd('bam-info.exe', input='libprogbase.lib') - TargetAdd('bam-info.exe', input='libpandatoolbase.lib') + TargetAdd('bam-info.exe', input='libp3progbase.lib') + TargetAdd('bam-info.exe', input='libp3pandatoolbase.lib') TargetAdd('bam-info.exe', input='libpandaegg.dll') TargetAdd('bam-info.exe', input=COMMON_PANDA_LIBS_PYSTUB) TargetAdd('bam-info.exe', opts=['ADVAPI', 'FFTW']) @@ -4144,17 +4216,17 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/cvscopy'] - TargetAdd('cvscopy_composite1.obj', opts=OPTS, input='cvscopy_composite1.cxx') - TargetAdd('libcvscopy.lib', input='cvscopy_composite1.obj') + TargetAdd('p3cvscopy_composite1.obj', opts=OPTS, input='p3cvscopy_composite1.cxx') + TargetAdd('libp3cvscopy.lib', input='p3cvscopy_composite1.obj') # # DIRECTORY: pandatool/src/daeegg/ # if (PkgSkip("PANDATOOL")==0 and PkgSkip("FCOLLADA")==0): OPTS=['DIR:pandatool/src/daeegg', 'FCOLLADA'] - TargetAdd('daeegg_composite1.obj', opts=OPTS, input='daeegg_composite1.cxx') - TargetAdd('libdaeegg.lib', input='daeegg_composite1.obj') - TargetAdd('libdaeegg.lib', opts=['FCOLLADA', 'CARBON']) + TargetAdd('p3daeegg_composite1.obj', opts=OPTS, input='p3daeegg_composite1.cxx') + TargetAdd('libp3daeegg.lib', input='p3daeegg_composite1.obj') + TargetAdd('libp3daeegg.lib', opts=['FCOLLADA', 'CARBON']) # # DIRECTORY: pandatool/src/daeprogs/ @@ -4163,7 +4235,7 @@ if (PkgSkip("PANDATOOL")==0 and PkgSkip("FCOLLADA")==0): OPTS=['DIR:pandatool/src/daeprogs', 'FCOLLADA'] TargetAdd('dae2egg_daeToEgg.obj', opts=OPTS, input='daeToEgg.cxx') TargetAdd('dae2egg.exe', input='dae2egg_daeToEgg.obj') - TargetAdd('dae2egg.exe', input='libdaeegg.lib') + TargetAdd('dae2egg.exe', input='libp3daeegg.lib') TargetAdd('dae2egg.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('dae2egg.exe', opts=['WINUSER', 'FCOLLADA', 'CARBON']) @@ -4173,8 +4245,8 @@ if (PkgSkip("PANDATOOL")==0 and PkgSkip("FCOLLADA")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/dxf'] - TargetAdd('dxf_composite1.obj', opts=OPTS, input='dxf_composite1.cxx') - TargetAdd('libdxf.lib', input='dxf_composite1.obj') + TargetAdd('p3dxf_composite1.obj', opts=OPTS, input='p3dxf_composite1.cxx') + TargetAdd('libp3dxf.lib', input='p3dxf_composite1.obj') # # DIRECTORY: pandatool/src/dxfegg/ @@ -4182,10 +4254,10 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/dxfegg'] - TargetAdd('dxfegg_dxfToEggConverter.obj', opts=OPTS, input='dxfToEggConverter.cxx') - TargetAdd('dxfegg_dxfToEggLayer.obj', opts=OPTS, input='dxfToEggLayer.cxx') - TargetAdd('libdxfegg.lib', input='dxfegg_dxfToEggConverter.obj') - TargetAdd('libdxfegg.lib', input='dxfegg_dxfToEggLayer.obj') + TargetAdd('p3dxfegg_dxfToEggConverter.obj', opts=OPTS, input='dxfToEggConverter.cxx') + TargetAdd('p3dxfegg_dxfToEggLayer.obj', opts=OPTS, input='dxfToEggLayer.cxx') + TargetAdd('libp3dxfegg.lib', input='p3dxfegg_dxfToEggConverter.obj') + TargetAdd('libp3dxfegg.lib', input='p3dxfegg_dxfToEggLayer.obj') # # DIRECTORY: pandatool/src/dxfprogs/ @@ -4195,16 +4267,16 @@ if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/dxfprogs'] TargetAdd('dxf-points_dxfPoints.obj', opts=OPTS, input='dxfPoints.cxx') TargetAdd('dxf-points.exe', input='dxf-points_dxfPoints.obj') - TargetAdd('dxf-points.exe', input='libprogbase.lib') - TargetAdd('dxf-points.exe', input='libdxf.lib') - TargetAdd('dxf-points.exe', input='libpandatoolbase.lib') + TargetAdd('dxf-points.exe', input='libp3progbase.lib') + TargetAdd('dxf-points.exe', input='libp3dxf.lib') + TargetAdd('dxf-points.exe', input='libp3pandatoolbase.lib') TargetAdd('dxf-points.exe', input=COMMON_PANDA_LIBS_PYSTUB) TargetAdd('dxf-points.exe', opts=['ADVAPI', 'FFTW']) TargetAdd('dxf2egg_dxfToEgg.obj', opts=OPTS, input='dxfToEgg.cxx') TargetAdd('dxf2egg.exe', input='dxf2egg_dxfToEgg.obj') - TargetAdd('dxf2egg.exe', input='libdxfegg.lib') - TargetAdd('dxf2egg.exe', input='libdxf.lib') + TargetAdd('dxf2egg.exe', input='libp3dxfegg.lib') + TargetAdd('dxf2egg.exe', input='libp3dxf.lib') TargetAdd('dxf2egg.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('dxf2egg.exe', opts=['ADVAPI', 'FFTW']) @@ -4212,7 +4284,7 @@ if (PkgSkip("PANDATOOL")==0): TargetAdd('egg2dxf_eggToDXFLayer.obj', opts=OPTS, input='eggToDXFLayer.cxx') TargetAdd('egg2dxf.exe', input='egg2dxf_eggToDXF.obj') TargetAdd('egg2dxf.exe', input='egg2dxf_eggToDXFLayer.obj') - TargetAdd('egg2dxf.exe', input='libdxf.lib') + TargetAdd('egg2dxf.exe', input='libp3dxf.lib') TargetAdd('egg2dxf.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('egg2dxf.exe', opts=['ADVAPI', 'FFTW']) @@ -4222,10 +4294,10 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/objegg'] - TargetAdd('objegg_objToEggConverter.obj', opts=OPTS, input='objToEggConverter.cxx') - TargetAdd('objegg_config_objegg.obj', opts=OPTS, input='config_objegg.cxx') - TargetAdd('libobjegg.lib', input='objegg_objToEggConverter.obj') - TargetAdd('libobjegg.lib', input='objegg_config_objegg.obj') + TargetAdd('p3objegg_objToEggConverter.obj', opts=OPTS, input='objToEggConverter.cxx') + TargetAdd('p3objegg_config_objegg.obj', opts=OPTS, input='config_objegg.cxx') + TargetAdd('libp3objegg.lib', input='p3objegg_objToEggConverter.obj') + TargetAdd('libp3objegg.lib', input='p3objegg_config_objegg.obj') # # DIRECTORY: pandatool/src/objprogs/ @@ -4235,7 +4307,7 @@ if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/objprogs'] TargetAdd('obj2egg_objToEgg.obj', opts=OPTS, input='objToEgg.cxx') TargetAdd('obj2egg.exe', input='obj2egg_objToEgg.obj') - TargetAdd('obj2egg.exe', input='libobjegg.lib') + TargetAdd('obj2egg.exe', input='libp3objegg.lib') TargetAdd('obj2egg.exe', input=COMMON_EGG2X_LIBS_PYSTUB) # @@ -4244,8 +4316,8 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/palettizer'] - TargetAdd('palettizer_composite1.obj', opts=OPTS, input='palettizer_composite1.cxx') - TargetAdd('libpalettizer.lib', input='palettizer_composite1.obj') + TargetAdd('p3palettizer_composite1.obj', opts=OPTS, input='p3palettizer_composite1.cxx') + TargetAdd('libp3palettizer.lib', input='p3palettizer_composite1.obj') # # DIRECTORY: pandatool/src/egg-mkfont/ @@ -4259,7 +4331,7 @@ if (PkgSkip("FREETYPE")==0) and (PkgSkip("PANDATOOL")==0): TargetAdd('egg-mkfont.exe', input='egg-mkfont_eggMakeFont.obj') TargetAdd('egg-mkfont.exe', input='egg-mkfont_rangeDescription.obj') TargetAdd('egg-mkfont.exe', input='egg-mkfont_rangeIterator.obj') - TargetAdd('egg-mkfont.exe', input='libpalettizer.lib') + TargetAdd('egg-mkfont.exe', input='libp3palettizer.lib') TargetAdd('egg-mkfont.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('egg-mkfont.exe', opts=['ADVAPI', 'FREETYPE']) @@ -4269,8 +4341,8 @@ if (PkgSkip("FREETYPE")==0) and (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/eggcharbase', 'ZLIB'] - TargetAdd('eggcharbase_composite1.obj', opts=OPTS, input='eggcharbase_composite1.cxx') - TargetAdd('libeggcharbase.lib', input='eggcharbase_composite1.obj') + TargetAdd('p3eggcharbase_composite1.obj', opts=OPTS, input='p3eggcharbase_composite1.cxx') + TargetAdd('libp3eggcharbase.lib', input='p3eggcharbase_composite1.obj') # # DIRECTORY: pandatool/src/egg-optchar/ @@ -4286,7 +4358,7 @@ if (PkgSkip("PANDATOOL")==0): TargetAdd('egg-optchar.exe', input='egg-optchar_eggOptchar.obj') TargetAdd('egg-optchar.exe', input='egg-optchar_eggOptcharUserData.obj') TargetAdd('egg-optchar.exe', input='egg-optchar_vertexMembership.obj') - TargetAdd('egg-optchar.exe', input='libeggcharbase.lib') + TargetAdd('egg-optchar.exe', input='libp3eggcharbase.lib') TargetAdd('egg-optchar.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('egg-optchar.exe', opts=['ADVAPI', 'FREETYPE']) @@ -4298,7 +4370,7 @@ if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/egg-palettize', 'DIR:pandatool/src/palettizer'] TargetAdd('egg-palettize_eggPalettize.obj', opts=OPTS, input='eggPalettize.cxx') TargetAdd('egg-palettize.exe', input='egg-palettize_eggPalettize.obj') - TargetAdd('egg-palettize.exe', input='libpalettizer.lib') + TargetAdd('egg-palettize.exe', input='libp3palettizer.lib') TargetAdd('egg-palettize.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('egg-palettize.exe', opts=['ADVAPI']) @@ -4310,9 +4382,9 @@ if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/egg-qtess'] TargetAdd('egg-qtess_composite1.obj', opts=OPTS, input='egg-qtess_composite1.cxx') TargetAdd('egg-qtess.exe', input='egg-qtess_composite1.obj') - TargetAdd('egg-qtess.exe', input='libeggbase.lib') - TargetAdd('egg-qtess.exe', input='libprogbase.lib') - TargetAdd('egg-qtess.exe', input='libconverter.lib') + TargetAdd('egg-qtess.exe', input='libp3eggbase.lib') + TargetAdd('egg-qtess.exe', input='libp3progbase.lib') + TargetAdd('egg-qtess.exe', input='libp3converter.lib') TargetAdd('egg-qtess.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('egg-qtess.exe', opts=['ADVAPI']) @@ -4339,7 +4411,7 @@ if (PkgSkip("PANDATOOL")==0): TargetAdd('egg-topstrip_eggTopstrip.obj', opts=OPTS, input='eggTopstrip.cxx') TargetAdd('egg-topstrip.exe', input='egg-topstrip_eggTopstrip.obj') - TargetAdd('egg-topstrip.exe', input='libeggcharbase.lib') + TargetAdd('egg-topstrip.exe', input='libp3eggcharbase.lib') TargetAdd('egg-topstrip.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('egg-topstrip.exe', opts=['ADVAPI']) @@ -4360,7 +4432,7 @@ if (PkgSkip("PANDATOOL")==0): TargetAdd('egg-retarget-anim_eggRetargetAnim.obj', opts=OPTS, input='eggRetargetAnim.cxx') TargetAdd('egg-retarget-anim.exe', input='egg-retarget-anim_eggRetargetAnim.obj') - TargetAdd('egg-retarget-anim.exe', input='libeggcharbase.lib') + TargetAdd('egg-retarget-anim.exe', input='libp3eggcharbase.lib') TargetAdd('egg-retarget-anim.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('egg-retarget-anim.exe', opts=['ADVAPI']) @@ -4375,9 +4447,9 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/flt', 'ZLIB'] - TargetAdd('flt_fltVectorRecord.obj', opts=OPTS, input='fltVectorRecord.cxx') - TargetAdd('flt_composite1.obj', opts=OPTS, input='flt_composite1.cxx') - TargetAdd('libflt.lib', input=['flt_fltVectorRecord.obj', 'flt_composite1.obj']) + TargetAdd('p3flt_fltVectorRecord.obj', opts=OPTS, input='fltVectorRecord.cxx') + TargetAdd('p3flt_composite1.obj', opts=OPTS, input='p3flt_composite1.cxx') + TargetAdd('libp3flt.lib', input=['p3flt_fltVectorRecord.obj', 'p3flt_composite1.obj']) # # DIRECTORY: pandatool/src/fltegg/ @@ -4385,9 +4457,9 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/fltegg'] - TargetAdd('fltegg_fltToEggConverter.obj', opts=OPTS, input='fltToEggConverter.cxx') - TargetAdd('fltegg_fltToEggLevelState.obj', opts=OPTS, input='fltToEggLevelState.cxx') - TargetAdd('libfltegg.lib', input=['fltegg_fltToEggConverter.obj', 'fltegg_fltToEggLevelState.obj']) + TargetAdd('p3fltegg_fltToEggConverter.obj', opts=OPTS, input='fltToEggConverter.cxx') + TargetAdd('p3fltegg_fltToEggLevelState.obj', opts=OPTS, input='fltToEggLevelState.cxx') + TargetAdd('libp3fltegg.lib', input=['p3fltegg_fltToEggConverter.obj', 'p3fltegg_fltToEggLevelState.obj']) # # DIRECTORY: pandatool/src/fltprogs/ @@ -4397,33 +4469,33 @@ if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/fltprogs', 'DIR:pandatool/src/flt', 'DIR:pandatool/src/cvscopy'] TargetAdd('egg2flt_eggToFlt.obj', opts=OPTS, input='eggToFlt.cxx') TargetAdd('egg2flt.exe', input='egg2flt_eggToFlt.obj') - TargetAdd('egg2flt.exe', input='libflt.lib') + TargetAdd('egg2flt.exe', input='libp3flt.lib') TargetAdd('egg2flt.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('egg2flt.exe', opts=['ADVAPI']) TargetAdd('flt-info_fltInfo.obj', opts=OPTS, input='fltInfo.cxx') TargetAdd('flt-info.exe', input='flt-info_fltInfo.obj') - TargetAdd('flt-info.exe', input='libflt.lib') + TargetAdd('flt-info.exe', input='libp3flt.lib') TargetAdd('flt-info.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('flt-info.exe', opts=['ADVAPI']) TargetAdd('flt-trans_fltTrans.obj', opts=OPTS, input='fltTrans.cxx') TargetAdd('flt-trans.exe', input='flt-trans_fltTrans.obj') - TargetAdd('flt-trans.exe', input='libflt.lib') + TargetAdd('flt-trans.exe', input='libp3flt.lib') TargetAdd('flt-trans.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('flt-trans.exe', opts=['ADVAPI']) TargetAdd('flt2egg_fltToEgg.obj', opts=OPTS, input='fltToEgg.cxx') TargetAdd('flt2egg.exe', input='flt2egg_fltToEgg.obj') - TargetAdd('flt2egg.exe', input='libflt.lib') - TargetAdd('flt2egg.exe', input='libfltegg.lib') + TargetAdd('flt2egg.exe', input='libp3flt.lib') + TargetAdd('flt2egg.exe', input='libp3fltegg.lib') TargetAdd('flt2egg.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('flt2egg.exe', opts=['ADVAPI']) TargetAdd('fltcopy_fltCopy.obj', opts=OPTS, input='fltCopy.cxx') TargetAdd('fltcopy.exe', input='fltcopy_fltCopy.obj') - TargetAdd('fltcopy.exe', input='libcvscopy.lib') - TargetAdd('fltcopy.exe', input='libflt.lib') + TargetAdd('fltcopy.exe', input='libp3cvscopy.lib') + TargetAdd('fltcopy.exe', input='libp3flt.lib') TargetAdd('fltcopy.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('fltcopy.exe', opts=['ADVAPI']) @@ -4434,8 +4506,8 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/imagebase'] - TargetAdd('imagebase_composite1.obj', opts=OPTS, input='imagebase_composite1.cxx') - TargetAdd('libimagebase.lib', input='imagebase_composite1.obj') + TargetAdd('p3imagebase_composite1.obj', opts=OPTS, input='p3imagebase_composite1.cxx') + TargetAdd('libp3imagebase.lib', input='p3imagebase_composite1.obj') # # DIRECTORY: pandatool/src/imageprogs/ @@ -4445,9 +4517,9 @@ if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/imageprogs'] TargetAdd('image-info_imageInfo.obj', opts=OPTS, input='imageInfo.cxx') TargetAdd('image-info.exe', input='image-info_imageInfo.obj') - TargetAdd('image-info.exe', input='libimagebase.lib') - TargetAdd('image-info.exe', input='libprogbase.lib') - TargetAdd('image-info.exe', input='libpandatoolbase.lib') + TargetAdd('image-info.exe', input='libp3imagebase.lib') + TargetAdd('image-info.exe', input='libp3progbase.lib') + TargetAdd('image-info.exe', input='libp3pandatoolbase.lib') TargetAdd('image-info.exe', input='libpandaegg.dll') TargetAdd('image-info.exe', input=COMMON_PANDA_LIBS) TargetAdd('image-info.exe', input='libp3pystub.dll') @@ -4455,9 +4527,9 @@ if (PkgSkip("PANDATOOL")==0): TargetAdd('image-resize_imageResize.obj', opts=OPTS, input='imageResize.cxx') TargetAdd('image-resize.exe', input='image-resize_imageResize.obj') - TargetAdd('image-resize.exe', input='libimagebase.lib') - TargetAdd('image-resize.exe', input='libprogbase.lib') - TargetAdd('image-resize.exe', input='libpandatoolbase.lib') + TargetAdd('image-resize.exe', input='libp3imagebase.lib') + TargetAdd('image-resize.exe', input='libp3progbase.lib') + TargetAdd('image-resize.exe', input='libp3pandatoolbase.lib') TargetAdd('image-resize.exe', input='libpandaegg.dll') TargetAdd('image-resize.exe', input=COMMON_PANDA_LIBS) TargetAdd('image-resize.exe', input='libp3pystub.dll') @@ -4465,9 +4537,9 @@ if (PkgSkip("PANDATOOL")==0): TargetAdd('image-trans_imageTrans.obj', opts=OPTS, input='imageTrans.cxx') TargetAdd('image-trans.exe', input='image-trans_imageTrans.obj') - TargetAdd('image-trans.exe', input='libimagebase.lib') - TargetAdd('image-trans.exe', input='libprogbase.lib') - TargetAdd('image-trans.exe', input='libpandatoolbase.lib') + TargetAdd('image-trans.exe', input='libp3imagebase.lib') + TargetAdd('image-trans.exe', input='libp3progbase.lib') + TargetAdd('image-trans.exe', input='libp3pandatoolbase.lib') TargetAdd('image-trans.exe', input='libpandaegg.dll') TargetAdd('image-trans.exe', input=COMMON_PANDA_LIBS) TargetAdd('image-trans.exe', input='libp3pystub.dll') @@ -4481,8 +4553,8 @@ if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/pfmprogs'] TargetAdd('pfm-trans_pfmTrans.obj', opts=OPTS, input='pfmTrans.cxx') TargetAdd('pfm-trans.exe', input='pfm-trans_pfmTrans.obj') - TargetAdd('pfm-trans.exe', input='libprogbase.lib') - TargetAdd('pfm-trans.exe', input='libpandatoolbase.lib') + TargetAdd('pfm-trans.exe', input='libp3progbase.lib') + TargetAdd('pfm-trans.exe', input='libp3pandatoolbase.lib') TargetAdd('pfm-trans.exe', input=COMMON_PANDA_LIBS) TargetAdd('pfm-trans.exe', input='libp3pystub.dll') TargetAdd('pfm-trans.exe', opts=['ADVAPI']) @@ -4493,8 +4565,8 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/lwo'] - TargetAdd('lwo_composite1.obj', opts=OPTS, input='lwo_composite1.cxx') - TargetAdd('liblwo.lib', input='lwo_composite1.obj') + TargetAdd('p3lwo_composite1.obj', opts=OPTS, input='p3lwo_composite1.cxx') + TargetAdd('libp3lwo.lib', input='p3lwo_composite1.obj') # # DIRECTORY: pandatool/src/lwoegg/ @@ -4502,8 +4574,8 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/lwoegg'] - TargetAdd('lwoegg_composite1.obj', opts=OPTS, input='lwoegg_composite1.cxx') - TargetAdd('liblwoegg.lib', input='lwoegg_composite1.obj') + TargetAdd('p3lwoegg_composite1.obj', opts=OPTS, input='p3lwoegg_composite1.cxx') + TargetAdd('libp3lwoegg.lib', input='p3lwoegg_composite1.obj') # # DIRECTORY: pandatool/src/lwoprogs/ @@ -4513,9 +4585,9 @@ if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/lwoprogs', 'DIR:pandatool/src/lwo'] TargetAdd('lwo-scan_lwoScan.obj', opts=OPTS, input='lwoScan.cxx') TargetAdd('lwo-scan.exe', input='lwo-scan_lwoScan.obj') - TargetAdd('lwo-scan.exe', input='liblwo.lib') - TargetAdd('lwo-scan.exe', input='libprogbase.lib') - TargetAdd('lwo-scan.exe', input='libpandatoolbase.lib') + TargetAdd('lwo-scan.exe', input='libp3lwo.lib') + TargetAdd('lwo-scan.exe', input='libp3progbase.lib') + TargetAdd('lwo-scan.exe', input='libp3pandatoolbase.lib') TargetAdd('lwo-scan.exe', input='libpandaegg.dll') TargetAdd('lwo-scan.exe', input=COMMON_PANDA_LIBS) TargetAdd('lwo-scan.exe', input='libp3pystub.dll') @@ -4523,8 +4595,8 @@ if (PkgSkip("PANDATOOL")==0): TargetAdd('lwo2egg_lwoToEgg.obj', opts=OPTS, input='lwoToEgg.cxx') TargetAdd('lwo2egg.exe', input='lwo2egg_lwoToEgg.obj') - TargetAdd('lwo2egg.exe', input='liblwo.lib') - TargetAdd('lwo2egg.exe', input='liblwoegg.lib') + TargetAdd('lwo2egg.exe', input='libp3lwo.lib') + TargetAdd('lwo2egg.exe', input='libp3lwoegg.lib') TargetAdd('lwo2egg.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('lwo2egg.exe', opts=['ADVAPI']) @@ -4536,7 +4608,7 @@ for VER in MAYAVERSIONS: VNUM=VER[4:] if (PkgSkip(VER)==0) and (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/maya', VER] - TargetAdd('maya'+VNUM+'_composite1.obj', opts=OPTS, input='maya_composite1.cxx') + TargetAdd('maya'+VNUM+'_composite1.obj', opts=OPTS, input='p3maya_composite1.cxx') TargetAdd('libmaya'+VNUM+'.lib', input='maya'+VNUM+'_composite1.obj') # @@ -4548,7 +4620,7 @@ for VER in MAYAVERSIONS: if (PkgSkip(VER)==0) and (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/mayaegg', 'DIR:pandatool/src/maya', VER] TargetAdd('mayaegg'+VNUM+'_loader.obj', opts=OPTS, input='mayaEggLoader.cxx') - TargetAdd('mayaegg'+VNUM+'_composite1.obj', opts=OPTS, input='mayaegg_composite1.cxx') + TargetAdd('mayaegg'+VNUM+'_composite1.obj', opts=OPTS, input='p3mayaegg_composite1.cxx') TargetAdd('libmayaegg'+VNUM+'.lib', input='mayaegg'+VNUM+'_loader.obj') TargetAdd('libmayaegg'+VNUM+'.lib', input='mayaegg'+VNUM+'_composite1.obj') @@ -4562,7 +4634,7 @@ for VER in MAXVERSIONS: OPTS=['DIR:pandatool/src/maxegg', VER, "WINCOMCTL", "WINCOMDLG", "WINUSER", "MSFORSCOPE"] TargetAdd('maxEgg'+VNUM+'.res', opts=OPTS, input='maxEgg.rc') TargetAdd('maxegg'+VNUM+'_loader.obj', opts=OPTS, input='maxEggLoader.cxx') - TargetAdd('maxegg'+VNUM+'_composite1.obj', opts=OPTS, input='maxegg_composite1.cxx') + TargetAdd('maxegg'+VNUM+'_composite1.obj', opts=OPTS, input='p3maxegg_composite1.cxx') TargetAdd('maxegg'+VNUM+'.dlo', input='maxegg'+VNUM+'_composite1.obj') TargetAdd('maxegg'+VNUM+'.dlo', input='maxEgg'+VNUM+'.res') TargetAdd('maxegg'+VNUM+'.dlo', input='maxEgg.def', ipath=OPTS) @@ -4596,19 +4668,19 @@ for VER in MAXVERSIONS: if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/vrml', 'ZLIB', 'BISONPREFIX_vrmlyy'] CreateFile(GetOutputDir()+"/include/vrmlParser.h") - TargetAdd('pvrml_vrmlParser.obj', opts=OPTS, input='vrmlParser.yxx') - TargetAdd('vrmlParser.h', input='pvrml_vrmlParser.obj', opts=['DEPENDENCYONLY']) - TargetAdd('pvrml_vrmlLexer.obj', opts=OPTS, input='vrmlLexer.lxx') - TargetAdd('pvrml_parse_vrml.obj', opts=OPTS, input='parse_vrml.cxx') - TargetAdd('pvrml_standard_nodes.obj', opts=OPTS, input='standard_nodes.cxx') - TargetAdd('pvrml_vrmlNode.obj', opts=OPTS, input='vrmlNode.cxx') - TargetAdd('pvrml_vrmlNodeType.obj', opts=OPTS, input='vrmlNodeType.cxx') - TargetAdd('libpvrml.lib', input='pvrml_parse_vrml.obj') - TargetAdd('libpvrml.lib', input='pvrml_standard_nodes.obj') - TargetAdd('libpvrml.lib', input='pvrml_vrmlNode.obj') - TargetAdd('libpvrml.lib', input='pvrml_vrmlNodeType.obj') - TargetAdd('libpvrml.lib', input='pvrml_vrmlParser.obj') - TargetAdd('libpvrml.lib', input='pvrml_vrmlLexer.obj') + TargetAdd('p3vrml_vrmlParser.obj', opts=OPTS, input='vrmlParser.yxx') + TargetAdd('vrmlParser.h', input='p3vrml_vrmlParser.obj', opts=['DEPENDENCYONLY']) + TargetAdd('p3vrml_vrmlLexer.obj', opts=OPTS, input='vrmlLexer.lxx') + TargetAdd('p3vrml_parse_vrml.obj', opts=OPTS, input='parse_vrml.cxx') + TargetAdd('p3vrml_standard_nodes.obj', opts=OPTS, input='standard_nodes.cxx') + TargetAdd('p3vrml_vrmlNode.obj', opts=OPTS, input='vrmlNode.cxx') + TargetAdd('p3vrml_vrmlNodeType.obj', opts=OPTS, input='vrmlNodeType.cxx') + TargetAdd('libp3vrml.lib', input='p3vrml_parse_vrml.obj') + TargetAdd('libp3vrml.lib', input='p3vrml_standard_nodes.obj') + TargetAdd('libp3vrml.lib', input='p3vrml_vrmlNode.obj') + TargetAdd('libp3vrml.lib', input='p3vrml_vrmlNodeType.obj') + TargetAdd('libp3vrml.lib', input='p3vrml_vrmlParser.obj') + TargetAdd('libp3vrml.lib', input='p3vrml_vrmlLexer.obj') # # DIRECTORY: pandatool/src/vrmlegg/ @@ -4616,12 +4688,12 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/vrmlegg', 'DIR:pandatool/src/vrml'] - TargetAdd('vrmlegg_indexedFaceSet.obj', opts=OPTS, input='indexedFaceSet.cxx') - TargetAdd('vrmlegg_vrmlAppearance.obj', opts=OPTS, input='vrmlAppearance.cxx') - TargetAdd('vrmlegg_vrmlToEggConverter.obj', opts=OPTS, input='vrmlToEggConverter.cxx') - TargetAdd('libvrmlegg.lib', input='vrmlegg_indexedFaceSet.obj') - TargetAdd('libvrmlegg.lib', input='vrmlegg_vrmlAppearance.obj') - TargetAdd('libvrmlegg.lib', input='vrmlegg_vrmlToEggConverter.obj') + TargetAdd('p3vrmlegg_indexedFaceSet.obj', opts=OPTS, input='indexedFaceSet.cxx') + TargetAdd('p3vrmlegg_vrmlAppearance.obj', opts=OPTS, input='vrmlAppearance.cxx') + TargetAdd('p3vrmlegg_vrmlToEggConverter.obj', opts=OPTS, input='vrmlToEggConverter.cxx') + TargetAdd('libp3vrmlegg.lib', input='p3vrmlegg_indexedFaceSet.obj') + TargetAdd('libp3vrmlegg.lib', input='p3vrmlegg_vrmlAppearance.obj') + TargetAdd('libp3vrmlegg.lib', input='p3vrmlegg_vrmlToEggConverter.obj') # # DIRECTORY: pandatool/src/xfile/ @@ -4630,13 +4702,13 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/xfile', 'ZLIB', 'BISONPREFIX_xyy', 'FLEXDASHI'] CreateFile(GetOutputDir()+"/include/xParser.h") - TargetAdd('xfile_xParser.obj', opts=OPTS, input='xParser.yxx') - TargetAdd('xParser.h', input='xfile_xParser.obj', opts=['DEPENDENCYONLY']) - TargetAdd('xfile_xLexer.obj', opts=OPTS, input='xLexer.lxx') - TargetAdd('xfile_composite1.obj', opts=OPTS, input='xfile_composite1.cxx') - TargetAdd('libxfile.lib', input='xfile_composite1.obj') - TargetAdd('libxfile.lib', input='xfile_xParser.obj') - TargetAdd('libxfile.lib', input='xfile_xLexer.obj') + TargetAdd('p3xfile_xParser.obj', opts=OPTS, input='xParser.yxx') + TargetAdd('xParser.h', input='p3xfile_xParser.obj', opts=['DEPENDENCYONLY']) + TargetAdd('p3xfile_xLexer.obj', opts=OPTS, input='xLexer.lxx') + TargetAdd('p3xfile_composite1.obj', opts=OPTS, input='p3xfile_composite1.cxx') + TargetAdd('libp3xfile.lib', input='p3xfile_composite1.obj') + TargetAdd('libp3xfile.lib', input='p3xfile_xParser.obj') + TargetAdd('libp3xfile.lib', input='p3xfile_xLexer.obj') # # DIRECTORY: pandatool/src/xfileegg/ @@ -4644,8 +4716,8 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/xfileegg', 'DIR:pandatool/src/xfile'] - TargetAdd('xfileegg_composite1.obj', opts=OPTS, input='xfileegg_composite1.cxx') - TargetAdd('libxfileegg.lib', input='xfileegg_composite1.obj') + TargetAdd('p3xfileegg_composite1.obj', opts=OPTS, input='p3xfileegg_composite1.cxx') + TargetAdd('libp3xfileegg.lib', input='p3xfileegg_composite1.obj') # # DIRECTORY: pandatool/src/ptloader/ @@ -4653,26 +4725,26 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/ptloader', 'DIR:pandatool/src/flt', 'DIR:pandatool/src/lwo', 'DIR:pandatool/src/xfile', 'DIR:pandatool/src/xfileegg', 'DIR:pandatool/src/daeegg', 'BUILDING:PTLOADER', 'FCOLLADA'] - TargetAdd('ptloader_config_ptloader.obj', opts=OPTS, input='config_ptloader.cxx') - TargetAdd('ptloader_loaderFileTypePandatool.obj', opts=OPTS, input='loaderFileTypePandatool.cxx') - TargetAdd('libp3ptloader.dll', input='ptloader_config_ptloader.obj') - TargetAdd('libp3ptloader.dll', input='ptloader_loaderFileTypePandatool.obj') - TargetAdd('libp3ptloader.dll', input='libfltegg.lib') - TargetAdd('libp3ptloader.dll', input='libflt.lib') - TargetAdd('libp3ptloader.dll', input='liblwoegg.lib') - TargetAdd('libp3ptloader.dll', input='liblwo.lib') - TargetAdd('libp3ptloader.dll', input='libdxfegg.lib') - TargetAdd('libp3ptloader.dll', input='libdxf.lib') - TargetAdd('libp3ptloader.dll', input='libobjegg.lib') - TargetAdd('libp3ptloader.dll', input='libvrmlegg.lib') - TargetAdd('libp3ptloader.dll', input='libpvrml.lib') - TargetAdd('libp3ptloader.dll', input='libxfileegg.lib') - TargetAdd('libp3ptloader.dll', input='libxfile.lib') - if (PkgSkip("FCOLLADA")==0): TargetAdd('libp3ptloader.dll', input='libdaeegg.lib') - TargetAdd('libp3ptloader.dll', input='libeggbase.lib') - TargetAdd('libp3ptloader.dll', input='libprogbase.lib') - TargetAdd('libp3ptloader.dll', input='libconverter.lib') - TargetAdd('libp3ptloader.dll', input='libpandatoolbase.lib') + TargetAdd('p3ptloader_config_ptloader.obj', opts=OPTS, input='config_ptloader.cxx') + TargetAdd('p3ptloader_loaderFileTypePandatool.obj', opts=OPTS, input='loaderFileTypePandatool.cxx') + TargetAdd('libp3ptloader.dll', input='p3ptloader_config_ptloader.obj') + TargetAdd('libp3ptloader.dll', input='p3ptloader_loaderFileTypePandatool.obj') + TargetAdd('libp3ptloader.dll', input='libp3fltegg.lib') + TargetAdd('libp3ptloader.dll', input='libp3flt.lib') + TargetAdd('libp3ptloader.dll', input='libp3lwoegg.lib') + TargetAdd('libp3ptloader.dll', input='libp3lwo.lib') + TargetAdd('libp3ptloader.dll', input='libp3dxfegg.lib') + TargetAdd('libp3ptloader.dll', input='libp3dxf.lib') + TargetAdd('libp3ptloader.dll', input='libp3objegg.lib') + TargetAdd('libp3ptloader.dll', input='libp3vrmlegg.lib') + TargetAdd('libp3ptloader.dll', input='libp3vrml.lib') + TargetAdd('libp3ptloader.dll', input='libp3xfileegg.lib') + TargetAdd('libp3ptloader.dll', input='libp3xfile.lib') + if (PkgSkip("FCOLLADA")==0): TargetAdd('libp3ptloader.dll', input='libp3daeegg.lib') + TargetAdd('libp3ptloader.dll', input='libp3eggbase.lib') + TargetAdd('libp3ptloader.dll', input='libp3progbase.lib') + TargetAdd('libp3ptloader.dll', input='libp3converter.lib') + TargetAdd('libp3ptloader.dll', input='libp3pandatoolbase.lib') TargetAdd('libp3ptloader.dll', input='libpandaegg.dll') TargetAdd('libp3ptloader.dll', input=COMMON_PANDA_LIBS) TargetAdd('libp3ptloader.dll', opts=['MODULE', 'ADVAPI', 'FCOLLADA', 'WINUSER']) @@ -4685,8 +4757,8 @@ if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/miscprogs'] TargetAdd('bin2c_binToC.obj', opts=OPTS, input='binToC.cxx') TargetAdd('bin2c.exe', input='bin2c_binToC.obj') - TargetAdd('bin2c.exe', input='libprogbase.lib') - TargetAdd('bin2c.exe', input='libpandatoolbase.lib') + TargetAdd('bin2c.exe', input='libp3progbase.lib') + TargetAdd('bin2c.exe', input='libp3pandatoolbase.lib') TargetAdd('bin2c.exe', input=COMMON_PANDA_LIBS) TargetAdd('bin2c.exe', input='libp3pystub.dll') TargetAdd('bin2c.exe', opts=['ADVAPI']) @@ -4697,8 +4769,8 @@ if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/pstatserver'] - TargetAdd('pstatserver_composite1.obj', opts=OPTS, input='pstatserver_composite1.cxx') - TargetAdd('libpstatserver.lib', input='pstatserver_composite1.obj') + TargetAdd('p3pstatserver_composite1.obj', opts=OPTS, input='p3pstatserver_composite1.cxx') + TargetAdd('libp3pstatserver.lib', input='p3pstatserver_composite1.obj') # # DIRECTORY: pandatool/src/softprogs/ @@ -4710,8 +4782,8 @@ if (PkgSkip("PANDATOOL")==0): TargetAdd('softcvs_softFilename.obj', opts=OPTS, input='softFilename.cxx') TargetAdd('softcvs.exe', input='softcvs_softCVS.obj') TargetAdd('softcvs.exe', input='softcvs_softFilename.obj') - TargetAdd('softcvs.exe', input='libprogbase.lib') - TargetAdd('softcvs.exe', input='libpandatoolbase.lib') + TargetAdd('softcvs.exe', input='libp3progbase.lib') + TargetAdd('softcvs.exe', input='libp3pandatoolbase.lib') TargetAdd('softcvs.exe', input='libpandaegg.dll') TargetAdd('softcvs.exe', input=COMMON_PANDA_LIBS) TargetAdd('softcvs.exe', input='libp3pystub.dll') @@ -4727,9 +4799,9 @@ if (PkgSkip("PANDATOOL")==0): TargetAdd('text-stats_textStats.obj', opts=OPTS, input='textStats.cxx') TargetAdd('text-stats.exe', input='text-stats_textMonitor.obj') TargetAdd('text-stats.exe', input='text-stats_textStats.obj') - TargetAdd('text-stats.exe', input='libprogbase.lib') - TargetAdd('text-stats.exe', input='libpstatserver.lib') - TargetAdd('text-stats.exe', input='libpandatoolbase.lib') + TargetAdd('text-stats.exe', input='libp3progbase.lib') + TargetAdd('text-stats.exe', input='libp3pstatserver.lib') + TargetAdd('text-stats.exe', input='libp3pandatoolbase.lib') TargetAdd('text-stats.exe', input='libpandaegg.dll') TargetAdd('text-stats.exe', input=COMMON_PANDA_LIBS) TargetAdd('text-stats.exe', input='libp3pystub.dll') @@ -4743,17 +4815,17 @@ if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/vrmlprogs', 'DIR:pandatool/src/vrml', 'DIR:pandatool/src/vrmlegg'] TargetAdd('vrml-trans_vrmlTrans.obj', opts=OPTS, input='vrmlTrans.cxx') TargetAdd('vrml-trans.exe', input='vrml-trans_vrmlTrans.obj') - TargetAdd('vrml-trans.exe', input='libpvrml.lib') - TargetAdd('vrml-trans.exe', input='libprogbase.lib') - TargetAdd('vrml-trans.exe', input='libpandatoolbase.lib') + TargetAdd('vrml-trans.exe', input='libp3vrml.lib') + TargetAdd('vrml-trans.exe', input='libp3progbase.lib') + TargetAdd('vrml-trans.exe', input='libp3pandatoolbase.lib') TargetAdd('vrml-trans.exe', input=COMMON_PANDA_LIBS) TargetAdd('vrml-trans.exe', input='libp3pystub.dll') TargetAdd('vrml-trans.exe', opts=['ADVAPI']) TargetAdd('vrml2egg_vrmlToEgg.obj', opts=OPTS, input='vrmlToEgg.cxx') TargetAdd('vrml2egg.exe', input='vrml2egg_vrmlToEgg.obj') - TargetAdd('vrml2egg.exe', input='libvrmlegg.lib') - TargetAdd('vrml2egg.exe', input='libpvrml.lib') + TargetAdd('vrml2egg.exe', input='libp3vrmlegg.lib') + TargetAdd('vrml2egg.exe', input='libp3vrml.lib') TargetAdd('vrml2egg.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('vrml2egg.exe', opts=['ADVAPI']) @@ -4770,9 +4842,9 @@ if (PkgSkip("PANDATOOL")==0 and (sys.platform.startswith("win") or PkgSkip("GTK2 OPTS=['DIR:pandatool/src/gtk-stats', 'GTK2'] TargetAdd('pstats_composite1.obj', opts=OPTS, input='gtkstats_composite1.cxx') TargetAdd('pstats.exe', input='pstats_composite1.obj') - TargetAdd('pstats.exe', input='libpstatserver.lib') - TargetAdd('pstats.exe', input='libprogbase.lib') - TargetAdd('pstats.exe', input='libpandatoolbase.lib') + TargetAdd('pstats.exe', input='libp3pstatserver.lib') + TargetAdd('pstats.exe', input='libp3progbase.lib') + TargetAdd('pstats.exe', input='libp3pandatoolbase.lib') TargetAdd('pstats.exe', input=COMMON_PANDA_LIBS) TargetAdd('pstats.exe', input='libp3pystub.dll') TargetAdd('pstats.exe', opts=['WINSOCK', 'WINIMM', 'WINGDI', 'WINKERNEL', 'WINOLDNAMES', 'WINUSER', 'WINMM', 'GTK2']) @@ -4785,24 +4857,24 @@ if (PkgSkip("PANDATOOL")==0): OPTS=['DIR:pandatool/src/xfileprogs', 'DIR:pandatool/src/xfile', 'DIR:pandatool/src/xfileegg'] TargetAdd('egg2x_eggToX.obj', opts=OPTS, input='eggToX.cxx') TargetAdd('egg2x.exe', input='egg2x_eggToX.obj') - TargetAdd('egg2x.exe', input='libxfileegg.lib') - TargetAdd('egg2x.exe', input='libxfile.lib') + TargetAdd('egg2x.exe', input='libp3xfileegg.lib') + TargetAdd('egg2x.exe', input='libp3xfile.lib') TargetAdd('egg2x.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('egg2x.exe', opts=['ADVAPI']) TargetAdd('x-trans_xFileTrans.obj', opts=OPTS, input='xFileTrans.cxx') TargetAdd('x-trans.exe', input='x-trans_xFileTrans.obj') - TargetAdd('x-trans.exe', input='libprogbase.lib') - TargetAdd('x-trans.exe', input='libxfile.lib') - TargetAdd('x-trans.exe', input='libpandatoolbase.lib') + TargetAdd('x-trans.exe', input='libp3progbase.lib') + TargetAdd('x-trans.exe', input='libp3xfile.lib') + TargetAdd('x-trans.exe', input='libp3pandatoolbase.lib') TargetAdd('x-trans.exe', input=COMMON_PANDA_LIBS) TargetAdd('x-trans.exe', input='libp3pystub.dll') TargetAdd('x-trans.exe', opts=['ADVAPI']) TargetAdd('x2egg_xFileToEgg.obj', opts=OPTS, input='xFileToEgg.cxx') TargetAdd('x2egg.exe', input='x2egg_xFileToEgg.obj') - TargetAdd('x2egg.exe', input='libxfileegg.lib') - TargetAdd('x2egg.exe', input='libxfile.lib') + TargetAdd('x2egg.exe', input='libp3xfileegg.lib') + TargetAdd('x2egg.exe', input='libp3xfile.lib') TargetAdd('x2egg.exe', input=COMMON_EGG2X_LIBS_PYSTUB) TargetAdd('x2egg.exe', opts=['ADVAPI']) @@ -4828,21 +4900,21 @@ for VER in MAYAVERSIONS: TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libmayaegg'+VNUM+'.lib') TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3ptloader.dll') TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libmaya'+VNUM+'.lib') - TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libfltegg.lib') - TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libflt.lib') - TargetAdd('libp3mayaloader'+VNUM+'.dll', input='liblwoegg.lib') - TargetAdd('libp3mayaloader'+VNUM+'.dll', input='liblwo.lib') - TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libdxfegg.lib') - TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libdxf.lib') - TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libobjegg.lib') - TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libvrmlegg.lib') - TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libpvrml.lib') - TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libxfileegg.lib') - TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libxfile.lib') - TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libeggbase.lib') - TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libprogbase.lib') - TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libconverter.lib') - TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libpandatoolbase.lib') + TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3fltegg.lib') + TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3flt.lib') + TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3lwoegg.lib') + TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3lwo.lib') + TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3dxfegg.lib') + TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3dxf.lib') + TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3objegg.lib') + TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3vrmlegg.lib') + TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3vrml.lib') + TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3xfileegg.lib') + TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3xfile.lib') + TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3eggbase.lib') + TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3progbase.lib') + TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3converter.lib') + TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3pandatoolbase.lib') TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libpandaegg.dll') TargetAdd('libp3mayaloader'+VNUM+'.dll', input=COMMON_PANDA_LIBS) TargetAdd('libp3mayaloader'+VNUM+'.dll', opts=['ADVAPI', VER]) @@ -4886,7 +4958,7 @@ for VER in MAYAVERSIONS: TargetAdd('mayacopy'+VNUM+'_mayaCopy.obj', opts=OPTS, input='mayaCopy.cxx') TargetAdd('mayacopy'+VNUM+'-wrapped.exe', input='mayacopy'+VNUM+'_mayaCopy.obj') - TargetAdd('mayacopy'+VNUM+'-wrapped.exe', input='libcvscopy.lib') + TargetAdd('mayacopy'+VNUM+'-wrapped.exe', input='libp3cvscopy.lib') TargetAdd('mayacopy'+VNUM+'-wrapped.exe', input='libmaya'+VNUM+'.lib') if sys.platform == "win32": TargetAdd('mayacopy'+VNUM+'-wrapped.exe', input=COMMON_EGG2X_LIBS_PYSTUB) @@ -4914,7 +4986,7 @@ for VER in MAYAVERSIONS: # if (PkgSkip("CONTRIB")==0 and not RUNTIME): OPTS=['DIR:contrib/src/ai', 'BUILDING:PANDAAI'] - TargetAdd('ai_composite1.obj', opts=OPTS, input='ai_composite1.cxx') + TargetAdd('p3ai_composite1.obj', opts=OPTS, input='p3ai_composite1.cxx') IGATEFILES=GetDirectoryContents('contrib/src/ai', ["*.h", "*_composite.cxx"]) TargetAdd('libpandaai.in', opts=OPTS, input=IGATEFILES) TargetAdd('libpandaai.in', opts=['IMOD:pandaai', 'ILIB:libpandaai', 'SRCDIR:contrib/src/ai']) @@ -4925,7 +4997,7 @@ if (PkgSkip("CONTRIB")==0 and not RUNTIME): TargetAdd('libpandaai_module.obj', opts=['IMOD:pandaai', 'ILIB:libpandaai']) TargetAdd('libpandaai.dll', input='libpandaai_module.obj') - TargetAdd('libpandaai.dll', input='ai_composite1.obj') + TargetAdd('libpandaai.dll', input='p3ai_composite1.obj') TargetAdd('libpandaai.dll', input='libpandaai_igate.obj') TargetAdd('libpandaai.dll', input=COMMON_PANDA_LIBS) diff --git a/panda/metalibs/panda/Sources.pp b/panda/metalibs/panda/Sources.pp index 0c4b31dfb8..86f9bbbd2b 100644 --- a/panda/metalibs/panda/Sources.pp +++ b/panda/metalibs/panda/Sources.pp @@ -6,29 +6,29 @@ #define DIR_TYPE metalib #define BUILDING_DLL BUILDING_PANDA -#define USE_PACKAGES net +#define USE_PACKAGES p3net #define COMPONENT_LIBS \ - recorder pgraph pgraphnodes pipeline \ - pvrpn grutil chan pstatclient \ - char collide cull device \ - dgraph display event gobj gsgbase \ - linmath mathutil movies net nativenet\ - parametrics \ - pnmimagetypes pnmimage \ - pnmtext text tform lerp putil \ - audio pgui pandabase dxml + p3recorder p3pgraph p3pgraphnodes p3pipeline \ + p3vrpn p3grutil p3chan p3pstatclient \ + p3char p3collide p3cull p3device \ + p3dgraph p3display p3event p3gobj p3gsgbase \ + p3linmath p3mathutil p3movies p3net nativenet\ + p3parametrics \ + p3pnmimagetypes p3pnmimage \ + p3pnmtext p3text p3tform p3lerp p3putil \ + p3audio p3pgui p3pandabase p3dxml #define LOCAL_LIBS \ - downloader express pandabase + p3downloader p3express p3pandabase #define OTHER_LIBS \ pandaexpress:m \ - interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #if $[LINK_IN_PHYSX] #define BUILDING_DLL $[BUILDING_DLL] BUILDING_PANDAPHYSX - #define COMPONENT_LIBS $[COMPONENT_LIBS] physx + #define COMPONENT_LIBS $[COMPONENT_LIBS] p3physx #endif #begin metalib_target diff --git a/panda/metalibs/pandabullet/Sources.pp b/panda/metalibs/pandabullet/Sources.pp index 32d26cb5a8..9ffe21a707 100644 --- a/panda/metalibs/pandabullet/Sources.pp +++ b/panda/metalibs/pandabullet/Sources.pp @@ -8,10 +8,10 @@ #define BUILD_DIRECTORY $[HAVE_BULLET] #define BUILDING_DLL BUILDING_PANDABULLET -#define COMPONENT_LIBS bullet -#define LOCAL_LIBS linmath putil express -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define COMPONENT_LIBS p3bullet +#define LOCAL_LIBS p3linmath p3putil p3express +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin metalib_target #define TARGET pandabullet diff --git a/panda/metalibs/pandadx8/Sources.pp b/panda/metalibs/pandadx8/Sources.pp index e1d051c518..aae0fed0b8 100644 --- a/panda/metalibs/pandadx8/Sources.pp +++ b/panda/metalibs/pandadx8/Sources.pp @@ -10,9 +10,9 @@ #define BUILDING_DLL BUILDING_PANDADX #define COMPONENT_LIBS \ - dxgsg8 -#define LOCAL_LIBS gsgbase display express gobj -#define OTHER_LIBS dtoolconfig dtool + p3dxgsg8 +#define LOCAL_LIBS p3gsgbase p3display p3express p3gobj +#define OTHER_LIBS p3dtoolconfig p3dtool #begin metalib_target #define TARGET pandadx8 diff --git a/panda/metalibs/pandadx9/Sources.pp b/panda/metalibs/pandadx9/Sources.pp index 6290723d0e..e107898137 100755 --- a/panda/metalibs/pandadx9/Sources.pp +++ b/panda/metalibs/pandadx9/Sources.pp @@ -10,9 +10,9 @@ #define BUILDING_DLL BUILDING_PANDADX #define COMPONENT_LIBS \ - dxgsg9 -#define LOCAL_LIBS gsgbase display express gobj -#define OTHER_LIBS dtoolconfig dtool + p3dxgsg9 +#define LOCAL_LIBS p3gsgbase p3display p3express p3gobj +#define OTHER_LIBS p3dtoolconfig p3dtool #begin metalib_target #define TARGET pandadx9 diff --git a/panda/metalibs/pandaegg/Sources.pp b/panda/metalibs/pandaegg/Sources.pp index eb89a1b655..ea7b843453 100644 --- a/panda/metalibs/pandaegg/Sources.pp +++ b/panda/metalibs/pandaegg/Sources.pp @@ -9,11 +9,11 @@ #define BUILDING_DLL BUILDING_PANDAEGG #define COMPONENT_LIBS \ - egg2pg egg2sg egg + p3egg2pg egg2sg p3egg -#define LOCAL_LIBS putil express -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolbase:c dtoolutil:c dtool:m prc:c +#define LOCAL_LIBS p3putil p3express +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolbase:c p3dtoolutil:c p3dtool:m p3prc:c #begin metalib_target #define TARGET pandaegg diff --git a/panda/metalibs/pandaexpress/Sources.pp b/panda/metalibs/pandaexpress/Sources.pp index 13c6205d15..4cbf790da9 100644 --- a/panda/metalibs/pandaexpress/Sources.pp +++ b/panda/metalibs/pandaexpress/Sources.pp @@ -6,10 +6,10 @@ #define DIR_TYPE metalib #define BUILDING_DLL BUILDING_PANDAEXPRESS -#define USE_PACKAGES net +#define USE_PACKAGES p3net -#define COMPONENT_LIBS downloader express pandabase -#define OTHER_LIBS dconfig:c prc:c interrogatedb:c dtoolutil:c dtoolbase:c dtoolconfig:m dtool:m +#define COMPONENT_LIBS p3downloader p3express p3pandabase +#define OTHER_LIBS p3dconfig:c p3prc:c p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3dtoolconfig:m p3dtool:m #begin metalib_target #define TARGET pandaexpress diff --git a/panda/metalibs/pandafx/Sources.pp b/panda/metalibs/pandafx/Sources.pp index 4154bc0202..c76563220f 100644 --- a/panda/metalibs/pandafx/Sources.pp +++ b/panda/metalibs/pandafx/Sources.pp @@ -8,10 +8,10 @@ #define BUILDING_DLL BUILDING_PANDAFX #define COMPONENT_LIBS \ - distort effects -#define LOCAL_LIBS putil express -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolbase:c dtoolutil:c dtool:m prc:c + p3distort p3effects +#define LOCAL_LIBS p3putil p3express +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolbase:c p3dtoolutil:c p3dtool:m p3prc:c #begin metalib_target #define TARGET pandafx diff --git a/panda/metalibs/pandagl/Sources.pp b/panda/metalibs/pandagl/Sources.pp index f662d1bd15..a64f57e20a 100644 --- a/panda/metalibs/pandagl/Sources.pp +++ b/panda/metalibs/pandagl/Sources.pp @@ -9,12 +9,12 @@ #define BUILD_DIRECTORY $[HAVE_GL] #define COMPONENT_LIBS \ - glgsg x11display glxdisplay \ - wgldisplay osxdisplay + p3glgsg p3x11display p3glxdisplay \ + p3wgldisplay p3osxdisplay -#define LOCAL_LIBS gsgbase display express -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define LOCAL_LIBS p3gsgbase p3display p3express +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin metalib_target #define TARGET pandagl diff --git a/panda/metalibs/pandagles/Sources.pp b/panda/metalibs/pandagles/Sources.pp index 6424bdfb3d..4f070c75ec 100644 --- a/panda/metalibs/pandagles/Sources.pp +++ b/panda/metalibs/pandagles/Sources.pp @@ -9,11 +9,11 @@ #define BUILD_DIRECTORY $[HAVE_GLES] #define COMPONENT_LIBS \ - glesgsg egldisplay + p3glesgsg p3egldisplay -#define LOCAL_LIBS gsgbase display express -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define LOCAL_LIBS p3gsgbase p3display p3express +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin metalib_target #define TARGET pandagles diff --git a/panda/metalibs/pandagles2/Sources.pp b/panda/metalibs/pandagles2/Sources.pp index ad6fd0e4dc..1189b99673 100644 --- a/panda/metalibs/pandagles2/Sources.pp +++ b/panda/metalibs/pandagles2/Sources.pp @@ -9,11 +9,11 @@ #define BUILD_DIRECTORY $[HAVE_GLES2] #define COMPONENT_LIBS \ - gles2gsg egl2display + p3gles2gsg egl2display -#define LOCAL_LIBS gsgbase display express -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define LOCAL_LIBS p3gsgbase p3display p3express +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin metalib_target #define TARGET pandagles2 diff --git a/panda/metalibs/pandaode/Sources.pp b/panda/metalibs/pandaode/Sources.pp index 565a0dcfd0..857db61bf7 100755 --- a/panda/metalibs/pandaode/Sources.pp +++ b/panda/metalibs/pandaode/Sources.pp @@ -11,9 +11,9 @@ #define COMPONENT_LIBS \ pode -#define LOCAL_LIBS pgraph -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define LOCAL_LIBS p3pgraph +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin metalib_target diff --git a/panda/metalibs/pandaphysics/Sources.pp b/panda/metalibs/pandaphysics/Sources.pp index 53ec7f5e29..48df8f0c1d 100644 --- a/panda/metalibs/pandaphysics/Sources.pp +++ b/panda/metalibs/pandaphysics/Sources.pp @@ -8,11 +8,11 @@ #define BUILDING_DLL BUILDING_PANDAPHYSICS #define COMPONENT_LIBS \ - physics particlesystem + p3physics p3particlesystem -#define LOCAL_LIBS linmath putil express -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolbase:c dtoolutil:c dtool:m prc:c +#define LOCAL_LIBS p3linmath p3putil p3express +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolbase:c p3dtoolutil:c p3dtool:m p3prc:c #begin metalib_target #define TARGET pandaphysics diff --git a/panda/metalibs/pandaphysx/Sources.pp b/panda/metalibs/pandaphysx/Sources.pp index 438b572cea..88534d158f 100644 --- a/panda/metalibs/pandaphysx/Sources.pp +++ b/panda/metalibs/pandaphysx/Sources.pp @@ -8,10 +8,10 @@ #define BUILD_DIRECTORY $[HAVE_PHYSX] #define BUILDING_DLL BUILDING_PANDAPHYSX -#define COMPONENT_LIBS physx -#define LOCAL_LIBS linmath putil express -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define COMPONENT_LIBS p3physx +#define LOCAL_LIBS p3linmath p3putil p3express +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin metalib_target #define TARGET pandaphysx diff --git a/panda/src/audio/Sources.pp b/panda/src/audio/Sources.pp index e35bcbe69a..3c439309ae 100644 --- a/panda/src/audio/Sources.pp +++ b/panda/src/audio/Sources.pp @@ -1,10 +1,10 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define BUILD_DIRECTORY $[HAVE_AUDIO] #begin lib_target - #define TARGET audio - #define LOCAL_LIBS putil event movies linmath + #define TARGET p3audio + #define LOCAL_LIBS p3putil p3event p3movies p3linmath #define COMBINED_SOURCES $[TARGET]_composite1.cxx @@ -41,9 +41,9 @@ #begin test_bin_target #define TARGET test_audio #define LOCAL_LIBS \ - audio + p3audio #define OTHER_LIBS \ - $[OTHER_LIBS] pystub + $[OTHER_LIBS] p3pystub #define SOURCES \ test_audio.cxx diff --git a/panda/src/audio/audio_composite.cxx b/panda/src/audio/audio_composite.cxx deleted file mode 100644 index 2c770da4c1..0000000000 --- a/panda/src/audio/audio_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "audio_composite1.cxx" diff --git a/panda/src/audio/audio_composite1.cxx b/panda/src/audio/p3audio_composite1.cxx similarity index 100% rename from panda/src/audio/audio_composite1.cxx rename to panda/src/audio/p3audio_composite1.cxx diff --git a/panda/src/audiotraits/Sources.pp b/panda/src/audiotraits/Sources.pp index 7ead044fe0..5f7d020123 100644 --- a/panda/src/audiotraits/Sources.pp +++ b/panda/src/audiotraits/Sources.pp @@ -1,5 +1,5 @@ -#define OTHER_LIBS dtoolconfig dtool dtoolbase:c dtoolutil:c \ - putil:c prc:c interrogatedb:c dconfig:c +#define OTHER_LIBS p3dtoolconfig p3dtool p3dtoolbase:c p3dtoolutil:c \ + p3putil:c p3prc:c p3interrogatedb:c p3dconfig:c #define BUILD_DIRECTORY $[HAVE_AUDIO] @@ -8,7 +8,7 @@ #define BUILD_TARGET $[HAVE_RAD_MSS] #define USE_PACKAGES rad_mss #define BUILDING_DLL BUILDING_MILES_AUDIO - #define LOCAL_LIBS audio event pipeline + #define LOCAL_LIBS p3audio p3event p3pipeline #define WIN_SYS_LIBS $[WIN_SYS_LIBS] user32.lib advapi32.lib winmm.lib #define COMBINED_SOURCES $[TARGET]_composite1.cxx @@ -34,7 +34,7 @@ #define BUILD_TARGET $[HAVE_FMODEX] #define USE_PACKAGES fmodex #define BUILDING_DLL BUILDING_FMOD_AUDIO - #define LOCAL_LIBS audio event + #define LOCAL_LIBS p3audio p3event #define WIN_SYS_LIBS $[WIN_SYS_LIBS] user32.lib advapi32.lib winmm.lib #define COMBINED_SOURCES fmod_audio_composite1.cxx @@ -54,7 +54,7 @@ #define BUILD_TARGET $[HAVE_OPENAL] #define USE_PACKAGES openal #define BUILDING_DLL BUILDING_OPENAL_AUDIO - #define LOCAL_LIBS audio event + #define LOCAL_LIBS p3audio p3event #define WIN_SYS_LIBS $[WIN_SYS_LIBS] user32.lib advapi32.lib winmm.lib #define COMBINED_SOURCES openal_audio_composite1.cxx @@ -73,7 +73,7 @@ // #define TARGET audio_linux // #define BUILDING_DLL BUILDING_MISC // //#define LOCAL_LIBS \ -// // audio +// // p3audio // // #define SOURCES \ // $[if $[HAVE_SYS_SOUNDCARD_H], \ diff --git a/panda/src/audiotraits/fmod_audio_composite.cxx b/panda/src/audiotraits/fmod_audio_composite.cxx deleted file mode 100644 index 2f8bf11f0e..0000000000 --- a/panda/src/audiotraits/fmod_audio_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "fmod_audio_composite1.cxx" diff --git a/panda/src/audiotraits/miles_audio_composite.cxx b/panda/src/audiotraits/miles_audio_composite.cxx deleted file mode 100644 index a5510aec6f..0000000000 --- a/panda/src/audiotraits/miles_audio_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "miles_audio_composite1.cxx" diff --git a/panda/src/audiotraits/openal_audio_composite.cxx b/panda/src/audiotraits/openal_audio_composite.cxx deleted file mode 100644 index 398b748d6b..0000000000 --- a/panda/src/audiotraits/openal_audio_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "openal_audio_composite1.cxx" diff --git a/panda/src/awesomium/Sources.pp b/panda/src/awesomium/Sources.pp index 0ed62aab13..2a65766df7 100644 --- a/panda/src/awesomium/Sources.pp +++ b/panda/src/awesomium/Sources.pp @@ -1,16 +1,16 @@ #define BUILD_DIRECTORY $[HAVE_AWESOMIUM] #define BUILDING_DLL BUILDING_PANDAAWESOMIUM -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - //I don't understand why ode can have TARGET as just pode, here it needs pandaawesomium + //I don't understand why ode can have TARGET as just p3ode, here it needs pandaawesomium #define TARGET pandaawesomium #define LOCAL_LIBS \ - pgraph physics + p3pgraph p3physics - #define USE_PACKAGES awesomium + #define USE_PACKAGES p3awesomium #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/panda/src/bullet/Sources.pp b/panda/src/bullet/Sources.pp index 9f2c46d4c4..99c1facfb6 100644 --- a/panda/src/bullet/Sources.pp +++ b/panda/src/bullet/Sources.pp @@ -1,12 +1,12 @@ #define BUILD_DIRECTORY $[HAVE_BULLET] #define BUILDING_DLL BUILDING_PANDABULLET -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET bullet - #define LOCAL_LIBS pgraph linmath grutil - #define USE_PACKAGES bullet + #define TARGET p3bullet + #define LOCAL_LIBS p3pgraph p3linmath p3grutil + #define USE_PACKAGES p3bullet #define COMBINED_SOURCES $[TARGET]_composite.cxx #define SOURCES \ @@ -131,7 +131,7 @@ bulletVehicle.cxx \ bulletWheel.cxx \ bulletWorld.cxx \ - bullet_composite.cxx \ + p3bullet_composite.cxx \ bullet_utils.cxx \ config_bullet.cxx \ diff --git a/panda/src/bullet/bullet_composite.cxx b/panda/src/bullet/p3bullet_composite.cxx similarity index 100% rename from panda/src/bullet/bullet_composite.cxx rename to panda/src/bullet/p3bullet_composite.cxx diff --git a/panda/src/cftalk/Sources.pp b/panda/src/cftalk/Sources.pp index 6c9ed3a53d..f2f7a23f93 100644 --- a/panda/src/cftalk/Sources.pp +++ b/panda/src/cftalk/Sources.pp @@ -1,13 +1,13 @@ #define BUILDING_DLL BUILDING_CFTALK -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET cftalk + #define TARGET p3cftalk #define LOCAL_LIBS \ - gsgbase gobj display \ - putil linmath mathutil pnmimage + p3gsgbase p3gobj p3display \ + p3putil p3linmath p3mathutil p3pnmimage #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/cftalk/cftalk_composite1.cxx b/panda/src/cftalk/p3cftalk_composite1.cxx similarity index 100% rename from panda/src/cftalk/cftalk_composite1.cxx rename to panda/src/cftalk/p3cftalk_composite1.cxx diff --git a/panda/src/cftalk/cftalk_composite2.cxx b/panda/src/cftalk/p3cftalk_composite2.cxx similarity index 100% rename from panda/src/cftalk/cftalk_composite2.cxx rename to panda/src/cftalk/p3cftalk_composite2.cxx diff --git a/panda/src/chan/Sources.pp b/panda/src/chan/Sources.pp index 8ff7710572..c6a84da277 100644 --- a/panda/src/chan/Sources.pp +++ b/panda/src/chan/Sources.pp @@ -1,10 +1,10 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET chan + #define TARGET p3chan #define LOCAL_LIBS \ - pgraph putil linmath mathutil event + p3pgraph p3putil p3linmath p3mathutil p3event #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/chan/chan_composite.cxx b/panda/src/chan/chan_composite.cxx deleted file mode 100644 index 845c8e255a..0000000000 --- a/panda/src/chan/chan_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "chan_composite1.cxx" -#include "chan_composite2.cxx" diff --git a/panda/src/chan/chan_composite1.cxx b/panda/src/chan/p3chan_composite1.cxx similarity index 100% rename from panda/src/chan/chan_composite1.cxx rename to panda/src/chan/p3chan_composite1.cxx diff --git a/panda/src/chan/chan_composite2.cxx b/panda/src/chan/p3chan_composite2.cxx similarity index 100% rename from panda/src/chan/chan_composite2.cxx rename to panda/src/chan/p3chan_composite2.cxx diff --git a/panda/src/char/Sources.pp b/panda/src/char/Sources.pp index a2579f1bd4..ea0d17a5eb 100644 --- a/panda/src/char/Sources.pp +++ b/panda/src/char/Sources.pp @@ -1,11 +1,11 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET char + #define TARGET p3char #define LOCAL_LIBS \ - chan linmath putil event mathutil gsgbase \ - pstatclient + p3chan p3linmath p3putil p3event p3mathutil p3gsgbase \ + p3pstatclient #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/char/char_composite.cxx b/panda/src/char/char_composite.cxx deleted file mode 100644 index 06abd5dd8e..0000000000 --- a/panda/src/char/char_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "char_composite1.cxx" -#include "char_composite2.cxx" diff --git a/panda/src/char/char_composite1.cxx b/panda/src/char/p3char_composite1.cxx similarity index 100% rename from panda/src/char/char_composite1.cxx rename to panda/src/char/p3char_composite1.cxx diff --git a/panda/src/char/char_composite2.cxx b/panda/src/char/p3char_composite2.cxx similarity index 100% rename from panda/src/char/char_composite2.cxx rename to panda/src/char/p3char_composite2.cxx diff --git a/panda/src/collada/Sources.pp b/panda/src/collada/Sources.pp index 59f1fd67fc..bca6e5edef 100644 --- a/panda/src/collada/Sources.pp +++ b/panda/src/collada/Sources.pp @@ -1,9 +1,9 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c -#define LOCAL_LIBS display pgraph express putil pandabase +#define LOCAL_LIBS p3display p3pgraph p3express p3putil p3pandabase -#define COMBINED_SOURCES collada_composite1.cxx +#define COMBINED_SOURCES p3collada_composite1.cxx #define SOURCES \ colladaBindMaterial.cxx \ diff --git a/panda/src/collada/collada_composite1.cxx b/panda/src/collada/p3collada_composite1.cxx similarity index 100% rename from panda/src/collada/collada_composite1.cxx rename to panda/src/collada/p3collada_composite1.cxx diff --git a/panda/src/collide/Sources.pp b/panda/src/collide/Sources.pp index 0cdc91b31c..82c4733ab8 100644 --- a/panda/src/collide/Sources.pp +++ b/panda/src/collide/Sources.pp @@ -1,11 +1,11 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET collide + #define TARGET p3collide #define LOCAL_LIBS \ - tform gobj pgraph putil \ - pstatclient + p3tform p3gobj p3pgraph p3putil \ + p3pstatclient #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx @@ -113,8 +113,8 @@ #begin test_bin_target #define TARGET test_collide #define LOCAL_LIBS \ - collide - #define OTHER_LIBS $[OTHER_LIBS] pystub + p3collide + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define SOURCES \ test_collide.cxx diff --git a/panda/src/collide/collide_composite.cxx b/panda/src/collide/collide_composite.cxx deleted file mode 100644 index db158d32a9..0000000000 --- a/panda/src/collide/collide_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "collide_composite1.cxx" -#include "collide_composite2.cxx" diff --git a/panda/src/collide/collide_composite1.cxx b/panda/src/collide/p3collide_composite1.cxx similarity index 100% rename from panda/src/collide/collide_composite1.cxx rename to panda/src/collide/p3collide_composite1.cxx diff --git a/panda/src/collide/collide_composite2.cxx b/panda/src/collide/p3collide_composite2.cxx similarity index 100% rename from panda/src/collide/collide_composite2.cxx rename to panda/src/collide/p3collide_composite2.cxx diff --git a/panda/src/configfiles/panda.prc.pp b/panda/src/configfiles/panda.prc.pp index 1a844c3948..79631837b4 100644 --- a/panda/src/configfiles/panda.prc.pp +++ b/panda/src/configfiles/panda.prc.pp @@ -31,12 +31,12 @@ aux-display pandagl aux-display pandadx8 #endif #if $[HAVE_TINYDISPLAY] -aux-display tinydisplay +aux-display p3tinydisplay #endif # Define an appropriate default audio library. #if $[HAVE_RAD_MSS] -audio-library-name miles_audio +audio-library-name p3miles_audio #elif $[HAVE_FMODEX] audio-library-name p3fmod_audio #elif $[HAVE_OPENAL] diff --git a/panda/src/cull/Sources.pp b/panda/src/cull/Sources.pp index a85e6cb8ec..8ba0c74e81 100644 --- a/panda/src/cull/Sources.pp +++ b/panda/src/cull/Sources.pp @@ -1,12 +1,12 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define LOCAL_LIBS \ - pgraph lerp event gsgbase gobj putil linmath \ - downloader express pandabase pstatclient + p3pgraph p3lerp p3event p3gsgbase p3gobj p3putil p3linmath \ + p3downloader p3express p3pandabase p3pstatclient #begin lib_target - #define TARGET cull + #define TARGET p3cull #define SOURCES \ binCullHandler.h binCullHandler.I \ diff --git a/panda/src/cull/cull_composite.cxx b/panda/src/cull/cull_composite.cxx deleted file mode 100644 index 7e4c0357c2..0000000000 --- a/panda/src/cull/cull_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "cull_composite1.cxx" -#include "cull_composite2.cxx" diff --git a/panda/src/cull/cull_composite1.cxx b/panda/src/cull/p3cull_composite1.cxx similarity index 100% rename from panda/src/cull/cull_composite1.cxx rename to panda/src/cull/p3cull_composite1.cxx diff --git a/panda/src/cull/cull_composite2.cxx b/panda/src/cull/p3cull_composite2.cxx similarity index 100% rename from panda/src/cull/cull_composite2.cxx rename to panda/src/cull/p3cull_composite2.cxx diff --git a/panda/src/device/Sources.pp b/panda/src/device/Sources.pp index 9b043b0cb2..0c38ba1016 100644 --- a/panda/src/device/Sources.pp +++ b/panda/src/device/Sources.pp @@ -1,10 +1,10 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET device + #define TARGET p3device #define LOCAL_LIBS \ - dgraph display gobj gsgbase mathutil linmath putil + p3dgraph p3display p3gobj p3gsgbase p3mathutil p3linmath p3putil #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/device/device_composite.cxx b/panda/src/device/device_composite.cxx deleted file mode 100644 index b6ec225c16..0000000000 --- a/panda/src/device/device_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "device_composite1.cxx" -#include "device_composite2.cxx" diff --git a/panda/src/device/device_composite1.cxx b/panda/src/device/p3device_composite1.cxx similarity index 100% rename from panda/src/device/device_composite1.cxx rename to panda/src/device/p3device_composite1.cxx diff --git a/panda/src/device/device_composite2.cxx b/panda/src/device/p3device_composite2.cxx similarity index 100% rename from panda/src/device/device_composite2.cxx rename to panda/src/device/p3device_composite2.cxx diff --git a/panda/src/dgraph/Sources.pp b/panda/src/dgraph/Sources.pp index b71f98e105..71eea809db 100644 --- a/panda/src/dgraph/Sources.pp +++ b/panda/src/dgraph/Sources.pp @@ -1,10 +1,10 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET dgraph + #define TARGET p3dgraph #define LOCAL_LIBS \ - pstatclient pgraph putil mathutil event + p3pstatclient p3pgraph p3putil p3mathutil p3event #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/dgraph/dgraph_composite.cxx b/panda/src/dgraph/dgraph_composite.cxx deleted file mode 100644 index d3990953e5..0000000000 --- a/panda/src/dgraph/dgraph_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "dgraph_composite1.cxx" -#include "dgraph_composite2.cxx" diff --git a/panda/src/dgraph/dgraph_composite1.cxx b/panda/src/dgraph/p3dgraph_composite1.cxx similarity index 100% rename from panda/src/dgraph/dgraph_composite1.cxx rename to panda/src/dgraph/p3dgraph_composite1.cxx diff --git a/panda/src/dgraph/dgraph_composite2.cxx b/panda/src/dgraph/p3dgraph_composite2.cxx similarity index 100% rename from panda/src/dgraph/dgraph_composite2.cxx rename to panda/src/dgraph/p3dgraph_composite2.cxx diff --git a/panda/src/display/Sources.pp b/panda/src/display/Sources.pp index d4bbf86775..74ba3923bb 100644 --- a/panda/src/display/Sources.pp +++ b/panda/src/display/Sources.pp @@ -1,12 +1,12 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define WIN_SYS_LIBS $[WIN_SYS_LIBS] ws2_32.lib #begin lib_target - #define TARGET display + #define TARGET p3display #define LOCAL_LIBS \ - pgraph pgraphnodes cull putil gsgbase gobj linmath mathutil \ - pstatclient + p3pgraph p3pgraphnodes p3cull p3putil p3gsgbase p3gobj p3linmath p3mathutil \ + p3pstatclient #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx @@ -130,7 +130,7 @@ #define BUILD_TARGET $[and $[OSX_PLATFORM],$[HAVE_P3D_PLUGIN]] - #define TARGET subprocbuffer + #define TARGET p3subprocbuffer #define SOURCES \ subprocessWindowBuffer.h subprocessWindowBuffer.I \ @@ -142,7 +142,7 @@ #begin test_bin_target #define TARGET test_display #define LOCAL_LIBS \ - display putil + p3display p3putil #define SOURCES \ test_display.cxx diff --git a/panda/src/display/display_composite.cxx b/panda/src/display/display_composite.cxx deleted file mode 100644 index 7fe4b7778b..0000000000 --- a/panda/src/display/display_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "display_composite1.cxx" -#include "display_composite2.cxx" diff --git a/panda/src/display/display_composite1.cxx b/panda/src/display/p3display_composite1.cxx similarity index 100% rename from panda/src/display/display_composite1.cxx rename to panda/src/display/p3display_composite1.cxx diff --git a/panda/src/display/display_composite2.cxx b/panda/src/display/p3display_composite2.cxx similarity index 100% rename from panda/src/display/display_composite2.cxx rename to panda/src/display/p3display_composite2.cxx diff --git a/panda/src/distort/Sources.pp b/panda/src/distort/Sources.pp index 319205bee7..72348d7831 100644 --- a/panda/src/distort/Sources.pp +++ b/panda/src/distort/Sources.pp @@ -1,11 +1,11 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c //#define OSX_SYS_LIBS mx #begin lib_target - #define TARGET distort + #define TARGET p3distort #define LOCAL_LIBS \ - display pgraph gobj linmath + p3display p3pgraph p3gobj p3linmath #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/panda/src/distort/distort_composite.cxx b/panda/src/distort/distort_composite.cxx deleted file mode 100644 index 4a0426c595..0000000000 --- a/panda/src/distort/distort_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "distort_composite1.cxx" diff --git a/panda/src/distort/distort_composite1.cxx b/panda/src/distort/p3distort_composite1.cxx similarity index 100% rename from panda/src/distort/distort_composite1.cxx rename to panda/src/distort/p3distort_composite1.cxx diff --git a/panda/src/doc/Sources.pp b/panda/src/doc/Sources.pp index aa65c69390..17da11ede2 100644 --- a/panda/src/doc/Sources.pp +++ b/panda/src/doc/Sources.pp @@ -1,3 +1,3 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m diff --git a/panda/src/downloader/Sources.pp b/panda/src/downloader/Sources.pp index 0367a33ebd..186839f5ec 100644 --- a/panda/src/downloader/Sources.pp +++ b/panda/src/downloader/Sources.pp @@ -1,10 +1,10 @@ -#define LOCAL_LIBS express pandabase -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c prc:c dtool:m -#define USE_PACKAGES zlib net openssl +#define LOCAL_LIBS p3express p3pandabase +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3prc:c p3dtool:m +#define USE_PACKAGES zlib p3net openssl #begin lib_target - #define TARGET downloader + #define TARGET p3downloader #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/downloader/downloader_composite.cxx b/panda/src/downloader/downloader_composite.cxx deleted file mode 100644 index 9e43d98d15..0000000000 --- a/panda/src/downloader/downloader_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "downloader_composite1.cxx" -#include "downloader_composite2.cxx" diff --git a/panda/src/downloader/downloader_composite1.cxx b/panda/src/downloader/p3downloader_composite1.cxx similarity index 100% rename from panda/src/downloader/downloader_composite1.cxx rename to panda/src/downloader/p3downloader_composite1.cxx diff --git a/panda/src/downloader/downloader_composite2.cxx b/panda/src/downloader/p3downloader_composite2.cxx similarity index 100% rename from panda/src/downloader/downloader_composite2.cxx rename to panda/src/downloader/p3downloader_composite2.cxx diff --git a/panda/src/downloadertools/Sources.pp b/panda/src/downloadertools/Sources.pp index ffc25efc9b..957709cbf1 100644 --- a/panda/src/downloadertools/Sources.pp +++ b/panda/src/downloadertools/Sources.pp @@ -1,6 +1,6 @@ -#define OTHER_LIBS interrogatedb:c prc:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m pystub prc:c -#define LOCAL_LIBS downloader express +#define OTHER_LIBS p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3pystub p3prc:c +#define LOCAL_LIBS p3downloader p3express #define USE_PACKAGES openssl zlib #begin bin_target diff --git a/panda/src/dxgsg8/Sources.pp b/panda/src/dxgsg8/Sources.pp index 729fcf1d58..1903beb0c4 100644 --- a/panda/src/dxgsg8/Sources.pp +++ b/panda/src/dxgsg8/Sources.pp @@ -1,16 +1,16 @@ #define BUILD_DIRECTORY $[HAVE_DX8] #define OTHER_LIBS \ - interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define USE_PACKAGES dx8 #begin lib_target - #define TARGET dxgsg8 + #define TARGET p3dxgsg8 #define LOCAL_LIBS \ - gsgbase gobj display windisplay \ - putil linmath mathutil pnmimage event + p3gsgbase p3gobj p3display p3windisplay \ + p3putil p3linmath p3mathutil p3pnmimage p3event #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/panda/src/dxgsg8/dxgsg8_composite.cxx b/panda/src/dxgsg8/dxgsg8_composite.cxx deleted file mode 100644 index 98ef17c868..0000000000 --- a/panda/src/dxgsg8/dxgsg8_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "dxgsg8_composite1.cxx" diff --git a/panda/src/dxgsg8/dxgsg8_composite1.cxx b/panda/src/dxgsg8/p3dxgsg8_composite1.cxx similarity index 100% rename from panda/src/dxgsg8/dxgsg8_composite1.cxx rename to panda/src/dxgsg8/p3dxgsg8_composite1.cxx diff --git a/panda/src/dxgsg9/Sources.pp b/panda/src/dxgsg9/Sources.pp index 2fc6dfdaee..0c5bd6a044 100755 --- a/panda/src/dxgsg9/Sources.pp +++ b/panda/src/dxgsg9/Sources.pp @@ -1,16 +1,16 @@ #define BUILD_DIRECTORY $[HAVE_DX9] #define OTHER_LIBS \ - interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define USE_PACKAGES dx9 cg cgdx9 #begin lib_target - #define TARGET dxgsg9 + #define TARGET p3dxgsg9 #define LOCAL_LIBS \ - gsgbase gobj display windisplay \ - putil linmath mathutil pnmimage event + p3gsgbase p3gobj p3display p3windisplay \ + p3putil p3linmath p3mathutil p3pnmimage p3event #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/panda/src/dxgsg9/dxgsg9_composite.cxx b/panda/src/dxgsg9/dxgsg9_composite.cxx deleted file mode 100644 index 7ff8974f2d..0000000000 --- a/panda/src/dxgsg9/dxgsg9_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "dxgsg9_composite1.cxx" diff --git a/panda/src/dxgsg9/dxgsg9_composite1.cxx b/panda/src/dxgsg9/p3dxgsg9_composite1.cxx similarity index 100% rename from panda/src/dxgsg9/dxgsg9_composite1.cxx rename to panda/src/dxgsg9/p3dxgsg9_composite1.cxx diff --git a/panda/src/dxml/Sources.pp b/panda/src/dxml/Sources.pp index f2b58898ef..77a2e5fac8 100644 --- a/panda/src/dxml/Sources.pp +++ b/panda/src/dxml/Sources.pp @@ -44,14 +44,14 @@ #endif // $[P3D_PLUGIN_MT] #begin lib_target - #define TARGET dxml + #define TARGET p3dxml - #define LOCAL_LIBS pandabase + #define LOCAL_LIBS p3pandabase #define OTHER_LIBS \ - interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c prc:c dtool:m + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3prc:c p3dtool:m - #define COMBINED_SOURCES dxml_composite1.cxx + #define COMBINED_SOURCES p3dxml_composite1.cxx #define SOURCES \ config_dxml.h tinyxml.h diff --git a/panda/src/dxml/dxml_composite1.cxx b/panda/src/dxml/p3dxml_composite1.cxx similarity index 100% rename from panda/src/dxml/dxml_composite1.cxx rename to panda/src/dxml/p3dxml_composite1.cxx diff --git a/panda/src/egg/Sources.pp b/panda/src/egg/Sources.pp index a0f839c96b..82f90098d1 100644 --- a/panda/src/egg/Sources.pp +++ b/panda/src/egg/Sources.pp @@ -1,15 +1,15 @@ #define BUILD_DIRECTORY $[HAVE_EGG] -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define YACC_PREFIX eggyy #define LFLAGS -i #define USE_PACKAGES zlib #begin lib_target - #define TARGET egg + #define TARGET p3egg #define LOCAL_LIBS \ - mathutil linmath putil + p3mathutil p3linmath p3putil #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx @@ -138,7 +138,7 @@ #begin test_bin_target #define TARGET test_egg #define LOCAL_LIBS \ - egg putil mathutil + p3egg p3putil p3mathutil #define SOURCES \ test_egg.cxx diff --git a/panda/src/egg/egg_composite.cxx b/panda/src/egg/egg_composite.cxx deleted file mode 100644 index 0d51294305..0000000000 --- a/panda/src/egg/egg_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "egg_composite1.cxx" -#include "egg_composite2.cxx" diff --git a/panda/src/egg/egg_composite1.cxx b/panda/src/egg/p3egg_composite1.cxx similarity index 100% rename from panda/src/egg/egg_composite1.cxx rename to panda/src/egg/p3egg_composite1.cxx diff --git a/panda/src/egg/egg_composite2.cxx b/panda/src/egg/p3egg_composite2.cxx similarity index 100% rename from panda/src/egg/egg_composite2.cxx rename to panda/src/egg/p3egg_composite2.cxx diff --git a/panda/src/egg2pg/Sources.pp b/panda/src/egg2pg/Sources.pp index e686438e4f..f9c3cbefa8 100644 --- a/panda/src/egg2pg/Sources.pp +++ b/panda/src/egg2pg/Sources.pp @@ -1,14 +1,14 @@ #define BUILD_DIRECTORY $[HAVE_EGG] -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define USE_PACKAGES nurbspp #begin lib_target - #define TARGET egg2pg + #define TARGET p3egg2pg #define LOCAL_LIBS \ - parametrics collide egg pgraph chan char + p3parametrics p3collide p3egg p3pgraph p3chan p3char #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/egg2pg/egg2pg_composite.cxx b/panda/src/egg2pg/egg2pg_composite.cxx deleted file mode 100644 index 029b5d4407..0000000000 --- a/panda/src/egg2pg/egg2pg_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "egg2pg_composite1.cxx" -#include "egg2pg_composite2.cxx" diff --git a/panda/src/egg2pg/egg2pg_composite1.cxx b/panda/src/egg2pg/p3egg2pg_composite1.cxx similarity index 100% rename from panda/src/egg2pg/egg2pg_composite1.cxx rename to panda/src/egg2pg/p3egg2pg_composite1.cxx diff --git a/panda/src/egg2pg/egg2pg_composite2.cxx b/panda/src/egg2pg/p3egg2pg_composite2.cxx similarity index 100% rename from panda/src/egg2pg/egg2pg_composite2.cxx rename to panda/src/egg2pg/p3egg2pg_composite2.cxx diff --git a/panda/src/egldisplay/Sources.pp b/panda/src/egldisplay/Sources.pp index 63b660f237..af90491b95 100644 --- a/panda/src/egldisplay/Sources.pp +++ b/panda/src/egldisplay/Sources.pp @@ -1,15 +1,15 @@ #define BUILD_DIRECTORY $[HAVE_EGL] -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #begin lib_target - #define TARGET egldisplay + #define TARGET p3egldisplay #define BUILD_TARGET $[HAVE_GLES] #define USE_PACKAGES gles egl x11 #define EXTRA_CDEFS OPENGLES_1 #define LOCAL_LIBS \ - glesgsg x11display + p3glesgsg p3x11display #define SOURCES \ config_egldisplay.cxx config_egldisplay.h \ @@ -32,7 +32,7 @@ #define USE_PACKAGES gles2 egl x11 #define EXTRA_CDEFS OPENGLES_2 #define LOCAL_LIBS \ - gles2gsg x11display + p3gles2gsg p3x11display #define SOURCES \ config_egldisplay.cxx config_egldisplay.h \ diff --git a/panda/src/egldisplay/egldisplay_composite1.cxx b/panda/src/egldisplay/p3egldisplay_composite1.cxx similarity index 100% rename from panda/src/egldisplay/egldisplay_composite1.cxx rename to panda/src/egldisplay/p3egldisplay_composite1.cxx diff --git a/panda/src/event/Sources.pp b/panda/src/event/Sources.pp index 7e1ee2bf04..bd3e322d5d 100644 --- a/panda/src/event/Sources.pp +++ b/panda/src/event/Sources.pp @@ -1,9 +1,9 @@ -#define LOCAL_LIBS putil express pandabase pstatclient linmath -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define LOCAL_LIBS p3putil p3express p3pandabase p3pstatclient p3linmath +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET event + #define TARGET p3event #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx @@ -67,10 +67,10 @@ #begin test_bin_target #define TARGET test_task - #define LOCAL_LIBS $[LOCAL_LIBS] mathutil + #define LOCAL_LIBS $[LOCAL_LIBS] p3mathutil #define OTHER_LIBS \ - interrogatedb:c dconfig:c dtoolbase:c prc:c \ - dtoolutil:c dtool:m dtoolconfig:m pystub + p3interrogatedb:c p3dconfig:c p3dtoolbase:c p3prc:c \ + p3dtoolutil:c p3dtool:m p3dtoolconfig:m p3pystub #define SOURCES \ test_task.cxx diff --git a/panda/src/event/event_composite.cxx b/panda/src/event/event_composite.cxx deleted file mode 100644 index 2e4e8f7d52..0000000000 --- a/panda/src/event/event_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "event_composite1.cxx" -#include "event_composite2.cxx" diff --git a/panda/src/event/event_composite1.cxx b/panda/src/event/p3event_composite1.cxx similarity index 100% rename from panda/src/event/event_composite1.cxx rename to panda/src/event/p3event_composite1.cxx diff --git a/panda/src/event/event_composite2.cxx b/panda/src/event/p3event_composite2.cxx similarity index 100% rename from panda/src/event/event_composite2.cxx rename to panda/src/event/p3event_composite2.cxx diff --git a/panda/src/express/Sources.pp b/panda/src/express/Sources.pp index 17e039bb1e..4d354d854b 100644 --- a/panda/src/express/Sources.pp +++ b/panda/src/express/Sources.pp @@ -1,9 +1,9 @@ -#define LOCAL_LIBS pandabase -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define LOCAL_LIBS p3pandabase +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET express + #define TARGET p3express #define USE_PACKAGES zlib openssl tar #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx @@ -220,8 +220,8 @@ // ca_bundle_data_src.c. #define TARGET make_ca_bundle - #define LOCAL_LIBS $[LOCAL_LIBS] express - #define OTHER_LIBS dtoolutil:c dtool:m pystub + #define LOCAL_LIBS $[LOCAL_LIBS] p3express + #define OTHER_LIBS p3dtoolutil:c p3dtool:m p3pystub #define SOURCES \ make_ca_bundle.cxx @@ -231,8 +231,8 @@ #begin test_bin_target #define TARGET test_types - #define LOCAL_LIBS $[LOCAL_LIBS] express - #define OTHER_LIBS dtoolutil:c dtool:m prc:c dtoolconfig:m pystub + #define LOCAL_LIBS $[LOCAL_LIBS] p3express + #define OTHER_LIBS p3dtoolutil:c p3dtool:m p3prc:c p3dtoolconfig:m p3pystub #define SOURCES \ test_types.cxx @@ -246,8 +246,8 @@ #define SOURCES \ test_ordered_vector.cxx - #define LOCAL_LIBS $[LOCAL_LIBS] putil - #define OTHER_LIBS dtoolutil:c dtool:m prc:c dtoolconfig:m pystub + #define LOCAL_LIBS $[LOCAL_LIBS] p3putil + #define OTHER_LIBS p3dtoolutil:c p3dtool:m p3prc:c p3dtoolconfig:m p3pystub #end test_bin_target @@ -256,8 +256,8 @@ #begin test_bin_target #define TARGET test_zstream #define USE_PACKAGES zlib - #define LOCAL_LIBS $[LOCAL_LIBS] express - #define OTHER_LIBS dtoolutil:c dtool:m prc:c dtoolconfig:m pystub + #define LOCAL_LIBS $[LOCAL_LIBS] p3express + #define OTHER_LIBS p3dtoolutil:c p3dtool:m p3prc:c p3dtoolconfig:m p3pystub #define SOURCES \ test_zstream.cxx diff --git a/panda/src/express/express_composite.cxx b/panda/src/express/express_composite.cxx deleted file mode 100644 index 978fe1d6bd..0000000000 --- a/panda/src/express/express_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "express_composite1.cxx" -#include "express_composite2.cxx" diff --git a/panda/src/express/express_composite1.cxx b/panda/src/express/p3express_composite1.cxx similarity index 100% rename from panda/src/express/express_composite1.cxx rename to panda/src/express/p3express_composite1.cxx diff --git a/panda/src/express/express_composite2.cxx b/panda/src/express/p3express_composite2.cxx similarity index 100% rename from panda/src/express/express_composite2.cxx rename to panda/src/express/p3express_composite2.cxx diff --git a/panda/src/framework/Sources.pp b/panda/src/framework/Sources.pp index e9c10c12ba..23d813b585 100644 --- a/panda/src/framework/Sources.pp +++ b/panda/src/framework/Sources.pp @@ -1,12 +1,12 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET framework + #define TARGET p3framework #define BUILDING_DLL BUILDING_FRAMEWORK #define LOCAL_LIBS \ - recorder pgui pgraph putil collide chan text \ - pnmimage pnmimagetypes event char + p3recorder p3pgui p3pgraph p3putil p3collide p3chan p3text \ + p3pnmimage p3pnmimagetypes p3event p3char #if $[LINK_ALL_STATIC] // If we're statically linking, we need to explicitly link with @@ -18,10 +18,10 @@ #elif $[HAVE_DX8] #define LOCAL_LIBS pandadx8 $[LOCAL_LIBS] #elif $[HAVE_TINYDISPLAY] - #define LOCAL_LIBS tinydisplay $[LOCAL_LIBS] + #define LOCAL_LIBS p3tinydisplay $[LOCAL_LIBS] #endif - // And we might like to have the egg loader available. + // And we might like to have the p3egg loader available. #if $[HAVE_EGG] #define LOCAL_LIBS pandaegg $[LOCAL_LIBS] #endif diff --git a/panda/src/framework/framework_composite.cxx b/panda/src/framework/framework_composite.cxx deleted file mode 100644 index 5ab43fec26..0000000000 --- a/panda/src/framework/framework_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "framework_composite1.cxx" diff --git a/panda/src/framework/framework_composite1.cxx b/panda/src/framework/p3framework_composite1.cxx similarity index 100% rename from panda/src/framework/framework_composite1.cxx rename to panda/src/framework/p3framework_composite1.cxx diff --git a/panda/src/gles2gsg/Sources.pp b/panda/src/gles2gsg/Sources.pp index 90f9890121..76269c227b 100644 --- a/panda/src/gles2gsg/Sources.pp +++ b/panda/src/gles2gsg/Sources.pp @@ -1,12 +1,12 @@ #define BUILD_DIRECTORY $[HAVE_GLES2] -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define USE_PACKAGES gles2 #begin lib_target - #define TARGET gles2gsg + #define TARGET p3gles2gsg #define LOCAL_LIBS \ - glstuff gsgbase gobj display \ - putil linmath mathutil pnmimage + p3glstuff p3gsgbase p3gobj p3display \ + p3putil p3linmath p3mathutil p3pnmimage #define SOURCES \ config_gles2gsg.h config_gles2gsg.cxx \ diff --git a/panda/src/gles2gsg/gles2gsg_composite.cxx b/panda/src/gles2gsg/gles2gsg_composite.cxx deleted file mode 100644 index 4d1c8de928..0000000000 --- a/panda/src/gles2gsg/gles2gsg_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "gles2gsg_composite1.cxx" diff --git a/panda/src/gles2gsg/gles2gsg_composite1.cxx b/panda/src/gles2gsg/p3gles2gsg_composite1.cxx similarity index 100% rename from panda/src/gles2gsg/gles2gsg_composite1.cxx rename to panda/src/gles2gsg/p3gles2gsg_composite1.cxx diff --git a/panda/src/glesgsg/Sources.pp b/panda/src/glesgsg/Sources.pp index 95298d1ae8..45f7363cb3 100644 --- a/panda/src/glesgsg/Sources.pp +++ b/panda/src/glesgsg/Sources.pp @@ -1,12 +1,12 @@ #define BUILD_DIRECTORY $[HAVE_GLES] -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define USE_PACKAGES gles #begin lib_target - #define TARGET glesgsg + #define TARGET p3glesgsg #define LOCAL_LIBS \ - glstuff gsgbase gobj display \ - putil linmath mathutil pnmimage + p3glstuff p3gsgbase p3gobj p3display \ + p3putil p3linmath p3mathutil p3pnmimage #define SOURCES \ config_glesgsg.h config_glesgsg.cxx \ diff --git a/panda/src/glesgsg/glesgsg_composite.cxx b/panda/src/glesgsg/glesgsg_composite.cxx deleted file mode 100644 index 78b5c0d691..0000000000 --- a/panda/src/glesgsg/glesgsg_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "glesgsg_composite1.cxx" diff --git a/panda/src/glesgsg/glesgsg_composite1.cxx b/panda/src/glesgsg/p3glesgsg_composite1.cxx similarity index 100% rename from panda/src/glesgsg/glesgsg_composite1.cxx rename to panda/src/glesgsg/p3glesgsg_composite1.cxx diff --git a/panda/src/glgsg/Sources.pp b/panda/src/glgsg/Sources.pp index bceb3df39f..7558bf2afa 100644 --- a/panda/src/glgsg/Sources.pp +++ b/panda/src/glgsg/Sources.pp @@ -1,12 +1,12 @@ #define BUILD_DIRECTORY $[HAVE_GL] -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define USE_PACKAGES gl cg cggl #begin lib_target - #define TARGET glgsg + #define TARGET p3glgsg #define LOCAL_LIBS \ - glstuff gsgbase gobj display \ - putil linmath mathutil pnmimage + p3glstuff p3gsgbase p3gobj p3display \ + p3putil p3linmath p3mathutil p3pnmimage #define SOURCES \ config_glgsg.h config_glgsg.cxx \ diff --git a/panda/src/glgsg/glgsg_composite.cxx b/panda/src/glgsg/glgsg_composite.cxx deleted file mode 100644 index dad5191656..0000000000 --- a/panda/src/glgsg/glgsg_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "glgsg_composite1.cxx" diff --git a/panda/src/glgsg/glgsg_composite1.cxx b/panda/src/glgsg/p3glgsg_composite1.cxx similarity index 100% rename from panda/src/glgsg/glgsg_composite1.cxx rename to panda/src/glgsg/p3glgsg_composite1.cxx diff --git a/panda/src/glstuff/Sources.pp b/panda/src/glstuff/Sources.pp index 39e9da3fdd..5c18c659de 100644 --- a/panda/src/glstuff/Sources.pp +++ b/panda/src/glstuff/Sources.pp @@ -1,14 +1,14 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c // Most of the files here are not actually compiled into anything; // they're just included by various other directories. #begin lib_target - #define TARGET glstuff + #define TARGET p3glstuff #define LOCAL_LIBS \ - gsgbase gobj display \ - putil linmath mathutil pnmimage + p3gsgbase p3gobj p3display \ + p3putil p3linmath p3mathutil p3pnmimage #define INSTALL_HEADERS \ diff --git a/panda/src/glxdisplay/Sources.pp b/panda/src/glxdisplay/Sources.pp index eff39d789c..5382d24061 100644 --- a/panda/src/glxdisplay/Sources.pp +++ b/panda/src/glxdisplay/Sources.pp @@ -1,16 +1,16 @@ #define BUILD_DIRECTORY $[HAVE_GLX] -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define USE_PACKAGES gl glx cg #if $[LINK_IN_GLXGETPROCADDRESS] #define EXTRA_CDEFS LINK_IN_GLXGETPROCADDRESS #endif #begin lib_target - #define TARGET glxdisplay + #define TARGET p3glxdisplay #define LOCAL_LIBS \ - glgsg x11display + p3glgsg p3x11display #define SOURCES \ config_glxdisplay.cxx config_glxdisplay.h \ diff --git a/panda/src/glxdisplay/glxdisplay_composite.cxx b/panda/src/glxdisplay/glxdisplay_composite.cxx deleted file mode 100644 index 2509543566..0000000000 --- a/panda/src/glxdisplay/glxdisplay_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "glxdisplay_composite1.cxx" diff --git a/panda/src/glxdisplay/glxdisplay_composite1.cxx b/panda/src/glxdisplay/p3glxdisplay_composite1.cxx similarity index 100% rename from panda/src/glxdisplay/glxdisplay_composite1.cxx rename to panda/src/glxdisplay/p3glxdisplay_composite1.cxx diff --git a/panda/src/gobj/Sources.pp b/panda/src/gobj/Sources.pp index 0e6b0cdeda..ec64133cc2 100644 --- a/panda/src/gobj/Sources.pp +++ b/panda/src/gobj/Sources.pp @@ -1,12 +1,12 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c //#define OSX_SYS_LIBS mx #define USE_PACKAGES zlib cg squish #begin lib_target - #define TARGET gobj + #define TARGET p3gobj #define LOCAL_LIBS \ - pstatclient event linmath mathutil pnmimage gsgbase putil + p3pstatclient p3event p3linmath p3mathutil p3pnmimage p3gsgbase p3putil #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx @@ -227,7 +227,7 @@ #begin test_bin_target #define TARGET test_gobj #define LOCAL_LIBS \ - gobj putil + p3gobj p3putil #define SOURCES \ test_gobj.cxx diff --git a/panda/src/gobj/gobj_composite.cxx b/panda/src/gobj/gobj_composite.cxx deleted file mode 100644 index 1c8cb1715d..0000000000 --- a/panda/src/gobj/gobj_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "gobj_composite1.cxx" -#include "gobj_composite2.cxx" diff --git a/panda/src/gobj/gobj_composite1.cxx b/panda/src/gobj/p3gobj_composite1.cxx similarity index 100% rename from panda/src/gobj/gobj_composite1.cxx rename to panda/src/gobj/p3gobj_composite1.cxx diff --git a/panda/src/gobj/gobj_composite2.cxx b/panda/src/gobj/p3gobj_composite2.cxx similarity index 100% rename from panda/src/gobj/gobj_composite2.cxx rename to panda/src/gobj/p3gobj_composite2.cxx diff --git a/panda/src/grutil/Sources.pp b/panda/src/grutil/Sources.pp index a061fff52a..1252d1e70c 100644 --- a/panda/src/grutil/Sources.pp +++ b/panda/src/grutil/Sources.pp @@ -1,12 +1,12 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define USE_PACKAGES ffmpeg #begin lib_target - #define TARGET grutil + #define TARGET p3grutil #define LOCAL_LIBS \ - display text pgraph gobj linmath putil movies audio + p3display p3text p3pgraph p3gobj p3linmath p3putil p3movies p3audio #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/grutil/grutil_composite.cxx b/panda/src/grutil/grutil_composite.cxx deleted file mode 100644 index 842b2c168d..0000000000 --- a/panda/src/grutil/grutil_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "grutil_composite1.cxx" -#include "grutil_composite2.cxx" diff --git a/panda/src/grutil/grutil_composite1.cxx b/panda/src/grutil/p3grutil_composite1.cxx similarity index 100% rename from panda/src/grutil/grutil_composite1.cxx rename to panda/src/grutil/p3grutil_composite1.cxx diff --git a/panda/src/grutil/grutil_composite2.cxx b/panda/src/grutil/p3grutil_composite2.cxx similarity index 100% rename from panda/src/grutil/grutil_composite2.cxx rename to panda/src/grutil/p3grutil_composite2.cxx diff --git a/panda/src/gsgbase/Sources.pp b/panda/src/gsgbase/Sources.pp index f16b02129b..ffdb5592d3 100644 --- a/panda/src/gsgbase/Sources.pp +++ b/panda/src/gsgbase/Sources.pp @@ -1,10 +1,10 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET gsgbase + #define TARGET p3gsgbase #define LOCAL_LIBS \ - putil linmath + p3putil p3linmath #define COMBINED_SOURCES $[TARGET]_composite1.cxx @@ -32,7 +32,7 @@ #begin test_bin_target #define TARGET test_gsgbase #define LOCAL_LIBS \ - gsgbase + p3gsgbase #define SOURCES \ test_gsgbase.cxx diff --git a/panda/src/gsgbase/gsgbase_composite.cxx b/panda/src/gsgbase/gsgbase_composite.cxx deleted file mode 100644 index 390c9fbd43..0000000000 --- a/panda/src/gsgbase/gsgbase_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "gsgbase_composite1.cxx" diff --git a/panda/src/gsgbase/gsgbase_composite1.cxx b/panda/src/gsgbase/p3gsgbase_composite1.cxx similarity index 100% rename from panda/src/gsgbase/gsgbase_composite1.cxx rename to panda/src/gsgbase/p3gsgbase_composite1.cxx diff --git a/panda/src/iphone/Sources.pp b/panda/src/iphone/Sources.pp index 6872c582ef..5c79142a94 100644 --- a/panda/src/iphone/Sources.pp +++ b/panda/src/iphone/Sources.pp @@ -1,20 +1,20 @@ #define BUILD_DIRECTORY $[BUILD_IPHONE] -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define OSX_SYS_FRAMEWORKS Foundation QuartzCore UIKit OpenGLES #begin bin_target #define TARGET iphone_pview - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define LOCAL_LIBS \ - iphonedisplay \ - framework putil collide pgraph chan text \ - pnmimage pnmimagetypes event gobj display \ - mathutil putil express dgraph device tform \ - linmath pstatclient panda glstuff + p3iphonedisplay \ + p3framework p3putil p3collide p3pgraph p3chan p3text \ + p3pnmimage p3pnmimagetypes p3event p3gobj p3display \ + p3mathutil p3putil p3express p3dgraph p3device p3tform \ + p3linmath p3pstatclient panda p3glstuff #define SOURCES \ pview_delegate.h pview_delegate.mm \ diff --git a/panda/src/iphonedisplay/Sources.pp b/panda/src/iphonedisplay/Sources.pp index 61b3d364c8..e3561e099e 100644 --- a/panda/src/iphonedisplay/Sources.pp +++ b/panda/src/iphonedisplay/Sources.pp @@ -1,18 +1,18 @@ #define BUILD_DIRECTORY $[BUILD_IPHONE] -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define OSX_SYS_FRAMEWORKS Foundation QuartzCore UIKit OpenGLES #begin lib_target - #define TARGET iphonedisplay + #define TARGET p3iphonedisplay #define LOCAL_LIBS \ - framework putil collide pgraph chan text \ - pnmimage pnmimagetypes event gobj display \ - mathutil putil express dgraph device tform \ - linmath pstatclient panda glstuff glesgsg + p3framework p3putil p3collide p3pgraph p3chan p3text \ + p3pnmimage p3pnmimagetypes p3event p3gobj p3display \ + p3mathutil p3putil p3express p3dgraph p3device p3tform \ + p3linmath p3pstatclient panda p3glstuff p3glesgsg #define SOURCES \ config_iphonedisplay.h config_iphonedisplay.mm \ diff --git a/panda/src/lerp/Sources.pp b/panda/src/lerp/Sources.pp index 98ce7e3d08..391693df1d 100644 --- a/panda/src/lerp/Sources.pp +++ b/panda/src/lerp/Sources.pp @@ -1,10 +1,10 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET lerp + #define TARGET p3lerp #define LOCAL_LIBS \ - event linmath putil + p3event p3linmath p3putil #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/panda/src/lerp/lerp_composite.cxx b/panda/src/lerp/lerp_composite.cxx deleted file mode 100644 index 7ae763f422..0000000000 --- a/panda/src/lerp/lerp_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "lerp_composite1.cxx" diff --git a/panda/src/lerp/lerp_composite1.cxx b/panda/src/lerp/p3lerp_composite1.cxx similarity index 100% rename from panda/src/lerp/lerp_composite1.cxx rename to panda/src/lerp/p3lerp_composite1.cxx diff --git a/panda/src/linmath/Sources.pp b/panda/src/linmath/Sources.pp index dd363c86b9..ef48ca8197 100644 --- a/panda/src/linmath/Sources.pp +++ b/panda/src/linmath/Sources.pp @@ -1,10 +1,10 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET linmath + #define TARGET p3linmath #define LOCAL_LIBS \ - putil + p3putil #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx @@ -75,8 +75,8 @@ #begin test_bin_target #define TARGET test_math #define LOCAL_LIBS \ - linmath - #define OTHER_LIBS $[OTHER_LIBS] pystub + p3linmath + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define SOURCES \ test_math.cxx diff --git a/panda/src/linmath/linmath_composite.cxx b/panda/src/linmath/linmath_composite.cxx deleted file mode 100644 index 2bdf4da33a..0000000000 --- a/panda/src/linmath/linmath_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "linmath_composite1.cxx" -#include "linmath_composite2.cxx" diff --git a/panda/src/linmath/linmath_composite1.cxx b/panda/src/linmath/p3linmath_composite1.cxx similarity index 100% rename from panda/src/linmath/linmath_composite1.cxx rename to panda/src/linmath/p3linmath_composite1.cxx diff --git a/panda/src/linmath/linmath_composite2.cxx b/panda/src/linmath/p3linmath_composite2.cxx similarity index 100% rename from panda/src/linmath/linmath_composite2.cxx rename to panda/src/linmath/p3linmath_composite2.cxx diff --git a/panda/src/mathutil/Sources.pp b/panda/src/mathutil/Sources.pp index 009ada5651..e13ec4bcaf 100644 --- a/panda/src/mathutil/Sources.pp +++ b/panda/src/mathutil/Sources.pp @@ -1,10 +1,10 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET mathutil + #define TARGET p3mathutil #define LOCAL_LIBS \ - linmath putil event express + p3linmath p3putil p3event p3express #define USE_PACKAGES fftw #define UNIX_SYS_LIBS m @@ -99,8 +99,8 @@ #begin test_bin_target #define TARGET test_mathutil #define LOCAL_LIBS \ - mathutil pipeline - #define OTHER_LIBS $[OTHER_LIBS] pystub + p3mathutil p3pipeline + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define SOURCES \ test_mathutil.cxx @@ -111,8 +111,8 @@ #begin test_bin_target #define TARGET test_tri #define LOCAL_LIBS \ - mathutil pipeline - #define OTHER_LIBS $[OTHER_LIBS] pystub + p3mathutil p3pipeline + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define SOURCES \ test_tri.cxx diff --git a/panda/src/mathutil/mathutil_composite.cxx b/panda/src/mathutil/mathutil_composite.cxx deleted file mode 100644 index 9aa6f6cf4f..0000000000 --- a/panda/src/mathutil/mathutil_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "mathutil_composite1.cxx" -#include "mathutil_composite2.cxx" diff --git a/panda/src/mathutil/mathutil_composite1.cxx b/panda/src/mathutil/p3mathutil_composite1.cxx similarity index 100% rename from panda/src/mathutil/mathutil_composite1.cxx rename to panda/src/mathutil/p3mathutil_composite1.cxx diff --git a/panda/src/mathutil/mathutil_composite2.cxx b/panda/src/mathutil/p3mathutil_composite2.cxx similarity index 100% rename from panda/src/mathutil/mathutil_composite2.cxx rename to panda/src/mathutil/p3mathutil_composite2.cxx diff --git a/panda/src/mesadisplay/Sources.pp b/panda/src/mesadisplay/Sources.pp index 41e8116c1f..ad3017e39d 100644 --- a/panda/src/mesadisplay/Sources.pp +++ b/panda/src/mesadisplay/Sources.pp @@ -1,15 +1,15 @@ #define BUILD_DIRECTORY $[HAVE_MESA] #define BUILDING_DLL BUILDING_PANDAMESA -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define USE_PACKAGES mesa cg cggl #begin lib_target - #define TARGET mesadisplay + #define TARGET p3mesadisplay #define LOCAL_LIBS \ - glstuff gsgbase gobj display \ - putil linmath mathutil pnmimage + p3glstuff p3gsgbase p3gobj p3display \ + p3putil p3linmath p3mathutil p3pnmimage #define SOURCES \ config_mesadisplay.cxx config_mesadisplay.h \ diff --git a/panda/src/mesadisplay/mesadisplay_composite.cxx b/panda/src/mesadisplay/mesadisplay_composite.cxx deleted file mode 100644 index cbaf67323a..0000000000 --- a/panda/src/mesadisplay/mesadisplay_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "mesadisplay_composite1.cxx" diff --git a/panda/src/mesadisplay/mesadisplay_composite1.cxx b/panda/src/mesadisplay/p3mesadisplay_composite1.cxx similarity index 100% rename from panda/src/mesadisplay/mesadisplay_composite1.cxx rename to panda/src/mesadisplay/p3mesadisplay_composite1.cxx diff --git a/panda/src/movies/Sources.pp b/panda/src/movies/Sources.pp index 3aff396ef2..bb86b35cfb 100644 --- a/panda/src/movies/Sources.pp +++ b/panda/src/movies/Sources.pp @@ -1,13 +1,13 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define USE_PACKAGES ffmpeg dx9 #define WIN_SYS_LIBS strmiids.lib #begin lib_target - #define TARGET movies + #define TARGET p3movies #define LOCAL_LIBS \ - gobj + p3gobj #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/panda/src/movies/movies_composite.cxx b/panda/src/movies/movies_composite.cxx deleted file mode 100644 index 2fe02680b2..0000000000 --- a/panda/src/movies/movies_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "movies_composite1.cxx" diff --git a/panda/src/movies/movies_composite1.cxx b/panda/src/movies/p3movies_composite1.cxx similarity index 100% rename from panda/src/movies/movies_composite1.cxx rename to panda/src/movies/p3movies_composite1.cxx diff --git a/panda/src/nativenet/Sources.pp b/panda/src/nativenet/Sources.pp index 33fd578de0..03bd7dad36 100644 --- a/panda/src/nativenet/Sources.pp +++ b/panda/src/nativenet/Sources.pp @@ -1,14 +1,14 @@ -#define LOCAL_LIBS express pandabase +#define LOCAL_LIBS p3express p3pandabase #define OTHER_LIBS \ - interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c prc:c dtool:m + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3prc:c p3dtool:m #define BUILD_DIRECTORY $[WANT_NATIVE_NET] #define USE_PACKAGES native_net openssl #begin lib_target - #define TARGET nativenet + #define TARGET p3nativenet #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/panda/src/nativenet/nativenet_composite1.cxx b/panda/src/nativenet/p3nativenet_composite1.cxx similarity index 100% rename from panda/src/nativenet/nativenet_composite1.cxx rename to panda/src/nativenet/p3nativenet_composite1.cxx diff --git a/panda/src/net/Sources.pp b/panda/src/net/Sources.pp index f9865076a0..2f4c1a9c2b 100644 --- a/panda/src/net/Sources.pp +++ b/panda/src/net/Sources.pp @@ -1,13 +1,13 @@ #define OTHER_LIBS \ - interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c prc:c dtool:m + p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3prc:c p3dtool:m #define BUILD_DIRECTORY $[and $[HAVE_NET],$[WANT_NATIVE_NET]] -#define USE_PACKAGES net +#define USE_PACKAGES p3net #begin lib_target - #define TARGET net + #define TARGET p3net #define LOCAL_LIBS \ - express downloader pandabase nativenet pipeline + p3express p3downloader p3pandabase p3nativenet p3pipeline #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx @@ -57,8 +57,8 @@ #begin test_bin_target #define TARGET test_datagram - #define LOCAL_LIBS net - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define LOCAL_LIBS p3net + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define SOURCES \ test_datagram.cxx @@ -67,8 +67,8 @@ #begin test_bin_target #define TARGET test_spam_client - #define LOCAL_LIBS net putil - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define LOCAL_LIBS p3net p3putil + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define SOURCES \ datagram_ui.cxx datagram_ui.h test_spam_client.cxx @@ -77,8 +77,8 @@ #begin test_bin_target #define TARGET test_spam_server - #define LOCAL_LIBS net putil - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define LOCAL_LIBS p3net p3putil + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define SOURCES \ datagram_ui.cxx datagram_ui.h test_spam_server.cxx @@ -87,8 +87,8 @@ #begin test_bin_target #define TARGET test_tcp_client - #define LOCAL_LIBS net - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define LOCAL_LIBS p3net + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define SOURCES \ datagram_ui.cxx datagram_ui.h test_tcp_client.cxx @@ -97,8 +97,8 @@ #begin test_bin_target #define TARGET test_tcp_server - #define LOCAL_LIBS net - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define LOCAL_LIBS p3net + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define SOURCES \ datagram_ui.cxx datagram_ui.h test_tcp_server.cxx @@ -107,8 +107,8 @@ #begin test_bin_target #define TARGET test_raw_server - #define LOCAL_LIBS net - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define LOCAL_LIBS p3net + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define SOURCES \ test_raw_server.cxx @@ -117,8 +117,8 @@ #begin test_bin_target #define TARGET test_udp - #define LOCAL_LIBS net - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define LOCAL_LIBS p3net + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define SOURCES \ datagram_ui.cxx datagram_ui.h test_udp.cxx @@ -127,8 +127,8 @@ #begin test_bin_target #define TARGET fake_http_server - #define LOCAL_LIBS net - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define LOCAL_LIBS p3net + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define SOURCES \ fake_http_server.cxx diff --git a/panda/src/net/net_composite.cxx b/panda/src/net/net_composite.cxx deleted file mode 100644 index 247dca40f2..0000000000 --- a/panda/src/net/net_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "net_composite1.cxx" -#include "net_composite2.cxx" diff --git a/panda/src/net/net_composite1.cxx b/panda/src/net/p3net_composite1.cxx similarity index 100% rename from panda/src/net/net_composite1.cxx rename to panda/src/net/p3net_composite1.cxx diff --git a/panda/src/net/net_composite2.cxx b/panda/src/net/p3net_composite2.cxx similarity index 100% rename from panda/src/net/net_composite2.cxx rename to panda/src/net/p3net_composite2.cxx diff --git a/panda/src/ode/Sources.pp b/panda/src/ode/Sources.pp index afd13f6fae..1006da1815 100755 --- a/panda/src/ode/Sources.pp +++ b/panda/src/ode/Sources.pp @@ -1,13 +1,13 @@ #define BUILD_DIRECTORY $[HAVE_ODE] #define BUILDING_DLL BUILDING_PANDAODE -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET pode + #define TARGET p3ode #define LOCAL_LIBS \ - pgraph physics + p3pgraph p3physics #define USE_PACKAGES ode diff --git a/panda/src/ode/pode_composite1.cxx b/panda/src/ode/p3ode_composite1.cxx similarity index 100% rename from panda/src/ode/pode_composite1.cxx rename to panda/src/ode/p3ode_composite1.cxx diff --git a/panda/src/ode/pode_composite2.cxx b/panda/src/ode/p3ode_composite2.cxx similarity index 100% rename from panda/src/ode/pode_composite2.cxx rename to panda/src/ode/p3ode_composite2.cxx diff --git a/panda/src/ode/pode_composite3.cxx b/panda/src/ode/p3ode_composite3.cxx similarity index 100% rename from panda/src/ode/pode_composite3.cxx rename to panda/src/ode/p3ode_composite3.cxx diff --git a/panda/src/osxdisplay/Sources.pp b/panda/src/osxdisplay/Sources.pp index 4e3938e494..d9a2ee3f67 100644 --- a/panda/src/osxdisplay/Sources.pp +++ b/panda/src/osxdisplay/Sources.pp @@ -1,15 +1,15 @@ #define BUILD_DIRECTORY $[and $[IS_OSX],$[HAVE_GL]] -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define OSX_SYS_FRAMEWORKS ApplicationServices Carbon AGL CoreServices Cocoa #define USE_PACKAGES gl cggl #begin lib_target - #define TARGET osxdisplay + #define TARGET p3osxdisplay #define LOCAL_LIBS \ - display putil glgsg + p3display p3putil p3glgsg #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/panda/src/osxdisplay/osxdisplay_composite1.cxx b/panda/src/osxdisplay/p3osxdisplay_composite1.cxx similarity index 100% rename from panda/src/osxdisplay/osxdisplay_composite1.cxx rename to panda/src/osxdisplay/p3osxdisplay_composite1.cxx diff --git a/panda/src/pandabase/Sources.pp b/panda/src/pandabase/Sources.pp index 7557a8eebf..b81651e970 100644 --- a/panda/src/pandabase/Sources.pp +++ b/panda/src/pandabase/Sources.pp @@ -1,8 +1,8 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET pandabase + #define TARGET p3pandabase #define SOURCES \ pandabase.cxx pandabase.h pandasymbols.h \ diff --git a/panda/src/parametrics/Sources.pp b/panda/src/parametrics/Sources.pp index 704616e47e..5ddbb707af 100644 --- a/panda/src/parametrics/Sources.pp +++ b/panda/src/parametrics/Sources.pp @@ -1,10 +1,10 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET parametrics + #define TARGET p3parametrics #define LOCAL_LIBS \ - pgraph linmath express putil pandabase + p3pgraph p3linmath p3express p3putil p3pandabase #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx @@ -68,7 +68,7 @@ #begin test_bin_target #define TARGET test_parametrics #define LOCAL_LIBS \ - parametrics + p3parametrics #define SOURCES \ test_parametrics.cxx diff --git a/panda/src/parametrics/parametrics_composite1.cxx b/panda/src/parametrics/p3parametrics_composite1.cxx similarity index 100% rename from panda/src/parametrics/parametrics_composite1.cxx rename to panda/src/parametrics/p3parametrics_composite1.cxx diff --git a/panda/src/parametrics/parametrics_composite2.cxx b/panda/src/parametrics/p3parametrics_composite2.cxx similarity index 100% rename from panda/src/parametrics/parametrics_composite2.cxx rename to panda/src/parametrics/p3parametrics_composite2.cxx diff --git a/panda/src/parametrics/parametrics_composite.cxx b/panda/src/parametrics/parametrics_composite.cxx deleted file mode 100644 index 76a59ef86d..0000000000 --- a/panda/src/parametrics/parametrics_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "parametrics_composite1.cxx" -#include "parametrics_composite2.cxx" diff --git a/panda/src/particlesystem/Sources.pp b/panda/src/particlesystem/Sources.pp index f18230c0c3..c16bf74b0c 100644 --- a/panda/src/particlesystem/Sources.pp +++ b/panda/src/particlesystem/Sources.pp @@ -1,10 +1,10 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET particlesystem + #define TARGET p3particlesystem #define LOCAL_LIBS \ - pgraph physics + p3pgraph p3physics #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/particlesystem/particlesystem_composite1.cxx b/panda/src/particlesystem/p3particlesystem_composite1.cxx similarity index 100% rename from panda/src/particlesystem/particlesystem_composite1.cxx rename to panda/src/particlesystem/p3particlesystem_composite1.cxx diff --git a/panda/src/particlesystem/particlesystem_composite2.cxx b/panda/src/particlesystem/p3particlesystem_composite2.cxx similarity index 100% rename from panda/src/particlesystem/particlesystem_composite2.cxx rename to panda/src/particlesystem/p3particlesystem_composite2.cxx diff --git a/panda/src/particlesystem/particlesystem_composite.cxx b/panda/src/particlesystem/particlesystem_composite.cxx deleted file mode 100644 index 9c989b7cca..0000000000 --- a/panda/src/particlesystem/particlesystem_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "particlesystem_composite1.cxx" -#include "particlesystem_composite2.cxx" diff --git a/panda/src/pgraph/Sources.pp b/panda/src/pgraph/Sources.pp index 7e4af88970..656116af87 100644 --- a/panda/src/pgraph/Sources.pp +++ b/panda/src/pgraph/Sources.pp @@ -1,12 +1,12 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define LOCAL_LIBS \ - lerp event gsgbase gobj putil linmath \ - downloader express pandabase pstatclient + p3lerp p3event p3gsgbase p3gobj p3putil p3linmath \ + p3downloader p3express p3pandabase p3pstatclient #define USE_PACKAGES python #begin lib_target - #define TARGET pgraph + #define TARGET p3pgraph // This directory is too big to combine into a single composite // file--at least on Windows. @@ -315,7 +315,7 @@ #define IGATESCAN all // Uncomment these lines to compile everything individually instead of -// combining into pgraph_composite*.cxx. +// combining into p3pgraph_composite*.cxx. // #define COMBINED_SOURCES // #define SOURCES $[SOURCES] $[INCLUDED_SOURCES] @@ -329,7 +329,7 @@ #define SOURCES \ test_pgraph.cxx - #define LOCAL_LIBS $[LOCAL_LIBS] pgraph - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define LOCAL_LIBS $[LOCAL_LIBS] p3pgraph + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #end test_bin_target diff --git a/panda/src/pgraph/pgraph_composite1.cxx b/panda/src/pgraph/p3pgraph_composite1.cxx similarity index 100% rename from panda/src/pgraph/pgraph_composite1.cxx rename to panda/src/pgraph/p3pgraph_composite1.cxx diff --git a/panda/src/pgraph/pgraph_composite2.cxx b/panda/src/pgraph/p3pgraph_composite2.cxx similarity index 100% rename from panda/src/pgraph/pgraph_composite2.cxx rename to panda/src/pgraph/p3pgraph_composite2.cxx diff --git a/panda/src/pgraph/pgraph_composite3.cxx b/panda/src/pgraph/p3pgraph_composite3.cxx similarity index 100% rename from panda/src/pgraph/pgraph_composite3.cxx rename to panda/src/pgraph/p3pgraph_composite3.cxx diff --git a/panda/src/pgraph/pgraph_composite4.cxx b/panda/src/pgraph/p3pgraph_composite4.cxx similarity index 100% rename from panda/src/pgraph/pgraph_composite4.cxx rename to panda/src/pgraph/p3pgraph_composite4.cxx diff --git a/panda/src/pgraph/pgraph_composite.cxx b/panda/src/pgraph/pgraph_composite.cxx deleted file mode 100644 index 1122ca404c..0000000000 --- a/panda/src/pgraph/pgraph_composite.cxx +++ /dev/null @@ -1,4 +0,0 @@ -#include "pgraph_composite1.cxx" -#include "pgraph_composite2.cxx" -#include "pgraph_composite3.cxx" -#include "pgraph_composite4.cxx" diff --git a/panda/src/pgraphnodes/Sources.pp b/panda/src/pgraphnodes/Sources.pp index 893fec66db..c529f40ee6 100644 --- a/panda/src/pgraphnodes/Sources.pp +++ b/panda/src/pgraphnodes/Sources.pp @@ -1,12 +1,12 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define LOCAL_LIBS \ - lerp event gsgbase gobj putil linmath \ - downloader express pandabase pstatclient pgraph + p3lerp p3event p3gsgbase p3gobj p3putil p3linmath \ + p3downloader p3express p3pandabase p3pstatclient p3pgraph #define USE_PACKAGES python #begin lib_target - #define TARGET pgraphnodes + #define TARGET p3pgraphnodes #define COMBINED_SOURCES \ $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/pgraphnodes/pgraphnodes_composite1.cxx b/panda/src/pgraphnodes/p3pgraphnodes_composite1.cxx similarity index 100% rename from panda/src/pgraphnodes/pgraphnodes_composite1.cxx rename to panda/src/pgraphnodes/p3pgraphnodes_composite1.cxx diff --git a/panda/src/pgraphnodes/pgraphnodes_composite2.cxx b/panda/src/pgraphnodes/p3pgraphnodes_composite2.cxx similarity index 100% rename from panda/src/pgraphnodes/pgraphnodes_composite2.cxx rename to panda/src/pgraphnodes/p3pgraphnodes_composite2.cxx diff --git a/panda/src/pgraphnodes/pgraphnodes_composite.cxx b/panda/src/pgraphnodes/pgraphnodes_composite.cxx deleted file mode 100644 index 5456955cdb..0000000000 --- a/panda/src/pgraphnodes/pgraphnodes_composite.cxx +++ /dev/null @@ -1,4 +0,0 @@ - -#include "pgraphnodes_composite1.cxx" -#include "pgraphnodes_composite2.cxx" - diff --git a/panda/src/pgui/Sources.pp b/panda/src/pgui/Sources.pp index e6f6eaeb50..503e2ff2d5 100644 --- a/panda/src/pgui/Sources.pp +++ b/panda/src/pgui/Sources.pp @@ -1,11 +1,11 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET pgui + #define TARGET p3pgui #define LOCAL_LIBS \ - audio grutil text tform linmath event putil gobj \ - mathutil + p3audio p3grutil p3text p3tform p3linmath p3event p3putil p3gobj \ + p3mathutil #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx @@ -77,13 +77,13 @@ #begin test_bin_target #define TARGET test_pgentry - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define LOCAL_LIBS \ - framework putil collide pgraph chan text \ - pnmimage pnmimagetypes event gobj display \ - mathutil putil express dgraph device tform \ - linmath pstatclient panda + p3framework p3putil p3collide p3pgraph p3chan p3text \ + p3pnmimage p3pnmimagetypes p3event p3gobj p3display \ + p3mathutil p3putil p3express p3dgraph p3device p3tform \ + p3linmath p3pstatclient panda #define UNIX_SYS_LIBS m diff --git a/panda/src/pgui/pgui_composite1.cxx b/panda/src/pgui/p3pgui_composite1.cxx similarity index 100% rename from panda/src/pgui/pgui_composite1.cxx rename to panda/src/pgui/p3pgui_composite1.cxx diff --git a/panda/src/pgui/pgui_composite2.cxx b/panda/src/pgui/p3pgui_composite2.cxx similarity index 100% rename from panda/src/pgui/pgui_composite2.cxx rename to panda/src/pgui/p3pgui_composite2.cxx diff --git a/panda/src/pgui/pgui_composite.cxx b/panda/src/pgui/pgui_composite.cxx deleted file mode 100644 index 9393c7ff72..0000000000 --- a/panda/src/pgui/pgui_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "pgui_composite1.cxx" -#include "pgui_composite2.cxx" diff --git a/panda/src/physics/Sources.pp b/panda/src/physics/Sources.pp index 15d34d4f14..af187c0ab8 100644 --- a/panda/src/physics/Sources.pp +++ b/panda/src/physics/Sources.pp @@ -1,10 +1,10 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET physics + #define TARGET p3physics #define LOCAL_LIBS \ - pgraph linmath collide + p3pgraph p3linmath p3collide #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx @@ -72,7 +72,7 @@ #begin test_bin_target #define TARGET test_physics #define LOCAL_LIBS \ - linmath physics collide + p3linmath p3physics p3collide #define SOURCES \ test_physics.cxx diff --git a/panda/src/physics/physics_composite1.cxx b/panda/src/physics/p3physics_composite1.cxx similarity index 100% rename from panda/src/physics/physics_composite1.cxx rename to panda/src/physics/p3physics_composite1.cxx diff --git a/panda/src/physics/physics_composite2.cxx b/panda/src/physics/p3physics_composite2.cxx similarity index 100% rename from panda/src/physics/physics_composite2.cxx rename to panda/src/physics/p3physics_composite2.cxx diff --git a/panda/src/physics/physics_composite.cxx b/panda/src/physics/physics_composite.cxx deleted file mode 100644 index 2976afac7c..0000000000 --- a/panda/src/physics/physics_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "physics_composite1.cxx" -#include "physics_composite2.cxx" diff --git a/panda/src/physx/Sources.pp b/panda/src/physx/Sources.pp index bf1a23401d..a2a91c5530 100644 --- a/panda/src/physx/Sources.pp +++ b/panda/src/physx/Sources.pp @@ -1,13 +1,13 @@ #define BUILD_DIRECTORY $[HAVE_PHYSX] #define BUILDING_DLL BUILDING_PANDAPHYSX -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET physx - #define LOCAL_LIBS pgraph linmath grutil - #define USE_PACKAGES physx + #define TARGET p3physx + #define LOCAL_LIBS p3pgraph p3linmath p3grutil + #define USE_PACKAGES p3physx #define COMBINED_SOURCES $[TARGET]_composite.cxx #define SOURCES \ diff --git a/panda/src/physx/physx_composite.cxx b/panda/src/physx/p3physx_composite.cxx similarity index 100% rename from panda/src/physx/physx_composite.cxx rename to panda/src/physx/p3physx_composite.cxx diff --git a/panda/src/pipeline/Sources.pp b/panda/src/pipeline/Sources.pp index 7034c00734..c072750f11 100644 --- a/panda/src/pipeline/Sources.pp +++ b/panda/src/pipeline/Sources.pp @@ -1,11 +1,11 @@ -#define LOCAL_LIBS express pandabase -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define LOCAL_LIBS p3express p3pandabase +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define SELECT_TAU select.tau #begin lib_target - #define TARGET pipeline + #define TARGET p3pipeline #define USE_PACKAGES threads #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx @@ -198,10 +198,10 @@ #begin test_bin_target #define TARGET test_threaddata - #define LOCAL_LIBS $[LOCAL_LIBS] pipeline + #define LOCAL_LIBS $[LOCAL_LIBS] p3pipeline #define OTHER_LIBS \ - interrogatedb:c dconfig:c dtoolbase:c prc:c \ - dtoolutil:c dtool:m dtoolconfig:m pystub + p3interrogatedb:c p3dconfig:c p3dtoolbase:c p3prc:c \ + p3dtoolutil:c p3dtool:m p3dtoolconfig:m p3pystub #define SOURCES \ test_threaddata.cxx @@ -211,10 +211,10 @@ #begin test_bin_target #define TARGET test_diners - #define LOCAL_LIBS $[LOCAL_LIBS] pipeline + #define LOCAL_LIBS $[LOCAL_LIBS] p3pipeline #define OTHER_LIBS \ - interrogatedb:c dconfig:c dtoolbase:c prc:c \ - dtoolutil:c dtool:m dtoolconfig:m pystub + p3interrogatedb:c p3dconfig:c p3dtoolbase:c p3prc:c \ + p3dtoolutil:c p3dtool:m p3dtoolconfig:m p3pystub #define SOURCES \ test_diners.cxx @@ -224,10 +224,10 @@ #begin test_bin_target #define TARGET test_mutex - #define LOCAL_LIBS $[LOCAL_LIBS] pipeline + #define LOCAL_LIBS $[LOCAL_LIBS] p3pipeline #define OTHER_LIBS \ - interrogatedb:c dconfig:c dtoolbase:c prc:c \ - dtoolutil:c dtool:m dtoolconfig:m pystub + p3interrogatedb:c p3dconfig:c p3dtoolbase:c p3prc:c \ + p3dtoolutil:c p3dtool:m p3dtoolconfig:m p3pystub #define SOURCES \ test_mutex.cxx @@ -237,10 +237,10 @@ #begin test_bin_target #define TARGET test_concurrency - #define LOCAL_LIBS $[LOCAL_LIBS] pipeline + #define LOCAL_LIBS $[LOCAL_LIBS] p3pipeline #define OTHER_LIBS \ - interrogatedb:c dconfig:c dtoolbase:c prc:c \ - dtoolutil:c dtool:m dtoolconfig:m pystub + p3interrogatedb:c p3dconfig:c p3dtoolbase:c p3prc:c \ + p3dtoolutil:c p3dtool:m p3dtoolconfig:m p3pystub #define SOURCES \ test_concurrency.cxx @@ -250,10 +250,10 @@ #begin test_bin_target #define TARGET test_delete - #define LOCAL_LIBS $[LOCAL_LIBS] pipeline + #define LOCAL_LIBS $[LOCAL_LIBS] p3pipeline #define OTHER_LIBS \ - interrogatedb:c dconfig:c dtoolbase:c prc:c \ - dtoolutil:c dtool:m dtoolconfig:m pystub + p3interrogatedb:c p3dconfig:c p3dtoolbase:c p3prc:c \ + p3dtoolutil:c p3dtool:m p3dtoolconfig:m p3pystub #define SOURCES \ test_delete.cxx @@ -263,10 +263,10 @@ #begin test_bin_target #define TARGET test_atomic - #define LOCAL_LIBS $[LOCAL_LIBS] pipeline + #define LOCAL_LIBS $[LOCAL_LIBS] p3pipeline #define OTHER_LIBS \ - interrogatedb:c dconfig:c dtoolbase:c prc:c \ - dtoolutil:c dtool:m dtoolconfig:m pystub + p3interrogatedb:c p3dconfig:c p3dtoolbase:c p3prc:c \ + p3dtoolutil:c p3dtool:m p3dtoolconfig:m p3pystub #define SOURCES \ test_atomic.cxx @@ -277,10 +277,10 @@ #begin test_bin_target #define TARGET test_setjmp - #define LOCAL_LIBS $[LOCAL_LIBS] pipeline + #define LOCAL_LIBS $[LOCAL_LIBS] p3pipeline #define OTHER_LIBS \ - interrogatedb:c dconfig:c dtoolbase:c prc:c \ - dtoolutil:c dtool:m dtoolconfig:m pystub + p3interrogatedb:c p3dconfig:c p3dtoolbase:c p3prc:c \ + p3dtoolutil:c p3dtool:m p3dtoolconfig:m p3pystub #define SOURCES \ test_setjmp.cxx diff --git a/panda/src/pipeline/pipeline_composite1.cxx b/panda/src/pipeline/p3pipeline_composite1.cxx similarity index 100% rename from panda/src/pipeline/pipeline_composite1.cxx rename to panda/src/pipeline/p3pipeline_composite1.cxx diff --git a/panda/src/pipeline/pipeline_composite2.cxx b/panda/src/pipeline/p3pipeline_composite2.cxx similarity index 100% rename from panda/src/pipeline/pipeline_composite2.cxx rename to panda/src/pipeline/p3pipeline_composite2.cxx diff --git a/panda/src/pipeline/pipeline_composite.cxx b/panda/src/pipeline/pipeline_composite.cxx deleted file mode 100644 index 6f682cebff..0000000000 --- a/panda/src/pipeline/pipeline_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "pipeline_composite1.cxx" -#include "pipeline_composite2.cxx" diff --git a/panda/src/pnmimage/Sources.pp b/panda/src/pnmimage/Sources.pp index 92c50f9871..a3e906f8ef 100644 --- a/panda/src/pnmimage/Sources.pp +++ b/panda/src/pnmimage/Sources.pp @@ -1,11 +1,11 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define USE_PACKAGES zlib #begin lib_target - #define TARGET pnmimage + #define TARGET p3pnmimage #define LOCAL_LIBS \ - linmath putil express mathutil + p3linmath p3putil p3express p3mathutil #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/pnmimage/pnmimage_composite1.cxx b/panda/src/pnmimage/p3pnmimage_composite1.cxx similarity index 100% rename from panda/src/pnmimage/pnmimage_composite1.cxx rename to panda/src/pnmimage/p3pnmimage_composite1.cxx diff --git a/panda/src/pnmimage/pnmimage_composite2.cxx b/panda/src/pnmimage/p3pnmimage_composite2.cxx similarity index 100% rename from panda/src/pnmimage/pnmimage_composite2.cxx rename to panda/src/pnmimage/p3pnmimage_composite2.cxx diff --git a/panda/src/pnmimage/pnmimage_composite.cxx b/panda/src/pnmimage/pnmimage_composite.cxx deleted file mode 100644 index 82aeeca3dc..0000000000 --- a/panda/src/pnmimage/pnmimage_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "pnmimage_composite1.cxx" -#include "pnmimage_composite2.cxx" diff --git a/panda/src/pnmimagetypes/Sources.pp b/panda/src/pnmimagetypes/Sources.pp index 5dfa743027..1770c44a41 100644 --- a/panda/src/pnmimagetypes/Sources.pp +++ b/panda/src/pnmimagetypes/Sources.pp @@ -1,11 +1,11 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define USE_PACKAGES jpeg png zlib tiff #begin lib_target - #define TARGET pnmimagetypes + #define TARGET p3pnmimagetypes #define LOCAL_LIBS \ - pnmimage + p3pnmimage #define COMBINED_SOURCES \ $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/pnmimagetypes/pnmimagetypes_composite1.cxx b/panda/src/pnmimagetypes/p3pnmimagetypes_composite1.cxx similarity index 100% rename from panda/src/pnmimagetypes/pnmimagetypes_composite1.cxx rename to panda/src/pnmimagetypes/p3pnmimagetypes_composite1.cxx diff --git a/panda/src/pnmimagetypes/pnmimagetypes_composite2.cxx b/panda/src/pnmimagetypes/p3pnmimagetypes_composite2.cxx similarity index 100% rename from panda/src/pnmimagetypes/pnmimagetypes_composite2.cxx rename to panda/src/pnmimagetypes/p3pnmimagetypes_composite2.cxx diff --git a/panda/src/pnmimagetypes/pnmimagetypes_composite.cxx b/panda/src/pnmimagetypes/pnmimagetypes_composite.cxx deleted file mode 100644 index 4669c1b766..0000000000 --- a/panda/src/pnmimagetypes/pnmimagetypes_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "pnmimagetypes_composite1.cxx" -#include "pnmimagetypes_composite2.cxx" diff --git a/panda/src/pnmtext/Sources.pp b/panda/src/pnmtext/Sources.pp index fa3f4bd0bf..73d07ca903 100644 --- a/panda/src/pnmtext/Sources.pp +++ b/panda/src/pnmtext/Sources.pp @@ -1,15 +1,15 @@ #define BUILD_DIRECTORY $[HAVE_FREETYPE] #define USE_PACKAGES freetype -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target #define USE_PACKAGES freetype - #define TARGET pnmtext + #define TARGET p3pnmtext #define LOCAL_LIBS \ - pnmimage putil linmath pipeline + p3pnmimage p3putil p3linmath p3pipeline #define SOURCES \ config_pnmtext.cxx config_pnmtext.h \ diff --git a/panda/src/pnmtext/pnmtext_composite1.cxx b/panda/src/pnmtext/p3pnmtext_composite1.cxx similarity index 100% rename from panda/src/pnmtext/pnmtext_composite1.cxx rename to panda/src/pnmtext/p3pnmtext_composite1.cxx diff --git a/panda/src/pnmtext/pnmtext_composite.cxx b/panda/src/pnmtext/pnmtext_composite.cxx deleted file mode 100644 index 08071e4dc9..0000000000 --- a/panda/src/pnmtext/pnmtext_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "pnmtext_composite1.cxx" diff --git a/panda/src/pstatclient/Sources.pp b/panda/src/pstatclient/Sources.pp index d0dabd7af7..7ba3a7bee2 100644 --- a/panda/src/pstatclient/Sources.pp +++ b/panda/src/pstatclient/Sources.pp @@ -1,11 +1,11 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target #define LOCAL_LIBS \ - net putil express + p3net p3putil p3express - #define TARGET pstatclient + #define TARGET p3pstatclient #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx @@ -49,9 +49,9 @@ #begin test_bin_target #define LOCAL_LIBS \ - pstatclient + p3pstatclient #define OTHER_LIBS \ - $[OTHER_LIBS] pystub + $[OTHER_LIBS] p3pystub #define TARGET test_client diff --git a/panda/src/pstatclient/pstatclient_composite1.cxx b/panda/src/pstatclient/p3pstatclient_composite1.cxx similarity index 100% rename from panda/src/pstatclient/pstatclient_composite1.cxx rename to panda/src/pstatclient/p3pstatclient_composite1.cxx diff --git a/panda/src/pstatclient/pstatclient_composite2.cxx b/panda/src/pstatclient/p3pstatclient_composite2.cxx similarity index 100% rename from panda/src/pstatclient/pstatclient_composite2.cxx rename to panda/src/pstatclient/p3pstatclient_composite2.cxx diff --git a/panda/src/pstatclient/pstatclient_composite.cxx b/panda/src/pstatclient/pstatclient_composite.cxx deleted file mode 100644 index 7d0896b03e..0000000000 --- a/panda/src/pstatclient/pstatclient_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "pstatclient_composite1.cxx" -#include "pstatclient_composite2.cxx" diff --git a/panda/src/putil/Sources.pp b/panda/src/putil/Sources.pp index 28c6c0a0ae..f20e4ea9e8 100644 --- a/panda/src/putil/Sources.pp +++ b/panda/src/putil/Sources.pp @@ -1,10 +1,10 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c -#define LOCAL_LIBS pipeline express pandabase +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c +#define LOCAL_LIBS p3pipeline p3express p3pandabase #define USE_PACKAGES zlib #begin lib_target - #define TARGET putil + #define TARGET p3putil #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx @@ -189,7 +189,7 @@ #begin test_bin_target #define TARGET test_bamRead #define LOCAL_LIBS \ - putil pgraph + p3putil p3pgraph #define SOURCES \ test_bam.cxx test_bam.h test_bamRead.cxx @@ -199,7 +199,7 @@ #begin test_bin_target #define TARGET test_bamWrite #define LOCAL_LIBS \ - putil pgraph + p3putil p3pgraph #define SOURCES \ test_bam.cxx test_bam.h test_bamWrite.cxx @@ -228,8 +228,8 @@ #define SOURCES \ test_glob.cxx - #define LOCAL_LIBS $[LOCAL_LIBS] putil - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define LOCAL_LIBS $[LOCAL_LIBS] p3putil + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #end test_bin_target @@ -239,7 +239,7 @@ #define SOURCES \ test_linestream.cxx - #define LOCAL_LIBS $[LOCAL_LIBS] putil - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define LOCAL_LIBS $[LOCAL_LIBS] p3putil + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #end test_bin_target diff --git a/panda/src/putil/putil_composite1.cxx b/panda/src/putil/p3putil_composite1.cxx similarity index 100% rename from panda/src/putil/putil_composite1.cxx rename to panda/src/putil/p3putil_composite1.cxx diff --git a/panda/src/putil/putil_composite2.cxx b/panda/src/putil/p3putil_composite2.cxx similarity index 100% rename from panda/src/putil/putil_composite2.cxx rename to panda/src/putil/p3putil_composite2.cxx diff --git a/panda/src/putil/putil_composite.cxx b/panda/src/putil/putil_composite.cxx deleted file mode 100644 index 49871238f8..0000000000 --- a/panda/src/putil/putil_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "putil_composite1.cxx" -#include "putil_composite2.cxx" diff --git a/panda/src/recorder/Sources.pp b/panda/src/recorder/Sources.pp index ee3836c485..4a6b1ca898 100644 --- a/panda/src/recorder/Sources.pp +++ b/panda/src/recorder/Sources.pp @@ -1,9 +1,9 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c -#define LOCAL_LIBS dgraph putil express pandabase +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c +#define LOCAL_LIBS p3dgraph p3putil p3express p3pandabase #begin lib_target - #define TARGET recorder + #define TARGET p3recorder #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/recorder/recorder_composite1.cxx b/panda/src/recorder/p3recorder_composite1.cxx similarity index 100% rename from panda/src/recorder/recorder_composite1.cxx rename to panda/src/recorder/p3recorder_composite1.cxx diff --git a/panda/src/recorder/recorder_composite2.cxx b/panda/src/recorder/p3recorder_composite2.cxx similarity index 100% rename from panda/src/recorder/recorder_composite2.cxx rename to panda/src/recorder/p3recorder_composite2.cxx diff --git a/panda/src/recorder/recorder_composite.cxx b/panda/src/recorder/recorder_composite.cxx deleted file mode 100644 index b830692f30..0000000000 --- a/panda/src/recorder/recorder_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "recorder_composite1.cxx" -#include "recorder_composite2.cxx" diff --git a/panda/src/skel/Sources.pp b/panda/src/skel/Sources.pp index 94e9ab5286..58d9c1a1d5 100644 --- a/panda/src/skel/Sources.pp +++ b/panda/src/skel/Sources.pp @@ -1,13 +1,13 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define USE_PACKAGES #define BUILDING_DLL BUILDING_PANDASKEL #begin lib_target - #define TARGET skel + #define TARGET p3skel #define LOCAL_LIBS \ - display text pgraph gobj linmath putil + p3display p3text p3pgraph p3gobj p3linmath p3putil #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/panda/src/skel/skel_composite1.cxx b/panda/src/skel/p3skel_composite1.cxx similarity index 100% rename from panda/src/skel/skel_composite1.cxx rename to panda/src/skel/p3skel_composite1.cxx diff --git a/panda/src/skel/skel_composite.cxx b/panda/src/skel/skel_composite.cxx deleted file mode 100644 index 7f6a16413b..0000000000 --- a/panda/src/skel/skel_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "skel_composite1.cxx" diff --git a/panda/src/speedtree/Sources.pp b/panda/src/speedtree/Sources.pp index 06c115efc4..db318a3958 100644 --- a/panda/src/speedtree/Sources.pp +++ b/panda/src/speedtree/Sources.pp @@ -1,15 +1,15 @@ #define BUILD_DIRECTORY $[HAVE_SPEEDTREE] -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c -#define USE_PACKAGES speedtree $[if $[eq $[SPEEDTREE_API],OpenGL],gl cg cggl] $[if $[eq $[SPEEDTREE_API],DirectX9],dx9 cg cgdx9] +#define USE_PACKAGES p3speedtree $[if $[eq $[SPEEDTREE_API],OpenGL],gl cg cggl] $[if $[eq $[SPEEDTREE_API],DirectX9],dx9 cg cgdx9] #define BUILDING_DLL BUILDING_PANDASPEEDTREE #begin lib_target #define TARGET pandaspeedtree #define LOCAL_LIBS \ - display text pgraph gobj linmath putil $[if $[eq $[SPEEDTREE_API],DirectX9],dxgsg9] + p3display p3text p3pgraph p3gobj p3linmath p3putil $[if $[eq $[SPEEDTREE_API],DirectX9],dxgsg9] #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/panda/src/testbed/Sources.pp b/panda/src/testbed/Sources.pp index 5fd2c27e4d..0b6082d095 100644 --- a/panda/src/testbed/Sources.pp +++ b/panda/src/testbed/Sources.pp @@ -1,13 +1,13 @@ -#define OTHER_LIBS interrogatedb:c prc:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m pystub +#define OTHER_LIBS p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3pystub #define USE_PACKAGES cg freetype #define LOCAL_LIBS \ - framework putil collide pgraph chan text \ - pnmimage pnmimagetypes pnmtext event gobj display \ - mathutil putil express dgraph device tform \ - linmath pstatclient panda + p3framework p3putil p3collide p3pgraph p3chan p3text \ + p3pnmimage p3pnmimagetypes p3pnmtext p3event p3gobj p3display \ + p3mathutil p3putil p3express p3dgraph p3device p3tform \ + p3linmath p3pstatclient panda #begin bin_target #define TARGET pview diff --git a/panda/src/text/Sources.pp b/panda/src/text/Sources.pp index 86b3b4f573..26768cf47c 100644 --- a/panda/src/text/Sources.pp +++ b/panda/src/text/Sources.pp @@ -1,14 +1,14 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target #define USE_PACKAGES freetype zlib - #define TARGET text + #define TARGET p3text #define LOCAL_LIBS \ - putil gobj pgraph linmath \ - pnmtext pnmimage gsgbase mathutil \ - parametrics + p3putil p3gobj p3pgraph p3linmath \ + p3pnmtext p3pnmimage p3gsgbase p3mathutil \ + p3parametrics #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/text/text_composite1.cxx b/panda/src/text/p3text_composite1.cxx similarity index 100% rename from panda/src/text/text_composite1.cxx rename to panda/src/text/p3text_composite1.cxx diff --git a/panda/src/text/text_composite2.cxx b/panda/src/text/p3text_composite2.cxx similarity index 100% rename from panda/src/text/text_composite2.cxx rename to panda/src/text/p3text_composite2.cxx diff --git a/panda/src/text/text_composite.cxx b/panda/src/text/text_composite.cxx deleted file mode 100644 index d813c7b317..0000000000 --- a/panda/src/text/text_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "text_composite1.cxx" -#include "text_composite2.cxx" diff --git a/panda/src/tform/Sources.pp b/panda/src/tform/Sources.pp index 4b076b6e66..4758570edc 100644 --- a/panda/src/tform/Sources.pp +++ b/panda/src/tform/Sources.pp @@ -1,11 +1,11 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #begin lib_target - #define TARGET tform + #define TARGET p3tform #define LOCAL_LIBS \ - grutil dgraph pgraph linmath display event putil gobj gsgbase \ - mathutil device + p3grutil p3dgraph p3pgraph p3linmath p3display p3event p3putil p3gobj p3gsgbase \ + p3mathutil p3device #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/tform/tform_composite1.cxx b/panda/src/tform/p3tform_composite1.cxx similarity index 100% rename from panda/src/tform/tform_composite1.cxx rename to panda/src/tform/p3tform_composite1.cxx diff --git a/panda/src/tform/tform_composite2.cxx b/panda/src/tform/p3tform_composite2.cxx similarity index 100% rename from panda/src/tform/tform_composite2.cxx rename to panda/src/tform/p3tform_composite2.cxx diff --git a/panda/src/tform/tform_composite.cxx b/panda/src/tform/tform_composite.cxx deleted file mode 100644 index 89127fe442..0000000000 --- a/panda/src/tform/tform_composite.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "tform_composite1.cxx" -#include "tform_composite2.cxx" diff --git a/panda/src/tinydisplay/Sources.pp b/panda/src/tinydisplay/Sources.pp index c2c164ea7f..352d6e0b3b 100644 --- a/panda/src/tinydisplay/Sources.pp +++ b/panda/src/tinydisplay/Sources.pp @@ -2,8 +2,8 @@ #define BUILDING_DLL BUILDING_TINYDISPLAY #define OSX_SYS_FRAMEWORKS $[if $[not $[BUILD_IPHONE]],ApplicationServices Carbon CoreServices Cocoa ] -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define USE_PACKAGES sdl #if $[UNIX_PLATFORM] @@ -11,10 +11,10 @@ #endif #begin lib_target - #define TARGET tinydisplay + #define TARGET p3tinydisplay #define LOCAL_LIBS \ - gsgbase gobj display \ - putil linmath mathutil pnmimage windisplay x11display + p3gsgbase p3gobj p3display \ + p3putil p3linmath p3mathutil p3pnmimage p3windisplay p3x11display #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx diff --git a/panda/src/tinydisplay/tinydisplay_composite1.cxx b/panda/src/tinydisplay/p3tinydisplay_composite1.cxx similarity index 100% rename from panda/src/tinydisplay/tinydisplay_composite1.cxx rename to panda/src/tinydisplay/p3tinydisplay_composite1.cxx diff --git a/panda/src/tinydisplay/tinydisplay_composite2.cxx b/panda/src/tinydisplay/p3tinydisplay_composite2.cxx similarity index 100% rename from panda/src/tinydisplay/tinydisplay_composite2.cxx rename to panda/src/tinydisplay/p3tinydisplay_composite2.cxx diff --git a/panda/src/vision/Sources.pp b/panda/src/vision/Sources.pp index 5eadfc05aa..df37d8d4f3 100644 --- a/panda/src/vision/Sources.pp +++ b/panda/src/vision/Sources.pp @@ -1,5 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m prc:c +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c #define USE_PACKAGES opencv artoolkit jpeg @@ -8,9 +8,9 @@ #begin lib_target #define TARGET p3vision #define LOCAL_LIBS \ - display text pgraph gobj linmath putil audio movies + p3display p3text p3pgraph p3gobj p3linmath p3putil p3audio p3movies - #define COMBINED_SOURCES vision_composite1.cxx + #define COMBINED_SOURCES p3vision_composite1.cxx #define SOURCES \ arToolKit.I arToolKit.h \ diff --git a/panda/src/vision/vision_composite1.cxx b/panda/src/vision/p3vision_composite1.cxx similarity index 100% rename from panda/src/vision/vision_composite1.cxx rename to panda/src/vision/p3vision_composite1.cxx diff --git a/panda/src/vrpn/Sources.pp b/panda/src/vrpn/Sources.pp index 9279d46b71..7fc6d544fc 100644 --- a/panda/src/vrpn/Sources.pp +++ b/panda/src/vrpn/Sources.pp @@ -1,12 +1,12 @@ #define BUILD_DIRECTORY $[HAVE_VRPN] -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #begin lib_target - #define TARGET pvrpn + #define TARGET p3vrpn #define LOCAL_LIBS \ - device dgraph + p3device p3dgraph #define USE_PACKAGES vrpn #define SOURCES \ diff --git a/panda/src/vrpn/vrpn_composite1.cxx b/panda/src/vrpn/p3vrpn_composite1.cxx similarity index 100% rename from panda/src/vrpn/vrpn_composite1.cxx rename to panda/src/vrpn/p3vrpn_composite1.cxx diff --git a/panda/src/vrpn/vrpn_composite.cxx b/panda/src/vrpn/vrpn_composite.cxx deleted file mode 100644 index 7cb20251f8..0000000000 --- a/panda/src/vrpn/vrpn_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "vrpn_composite1.cxx" diff --git a/panda/src/wgldisplay/Sources.pp b/panda/src/wgldisplay/Sources.pp index 218ca6076d..4ae2a07bff 100644 --- a/panda/src/wgldisplay/Sources.pp +++ b/panda/src/wgldisplay/Sources.pp @@ -3,13 +3,13 @@ #define USE_PACKAGES gl cg -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #begin lib_target - #define TARGET wgldisplay + #define TARGET p3wgldisplay #define LOCAL_LIBS \ - display putil windisplay glgsg + p3display p3putil p3windisplay p3glgsg #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/panda/src/wgldisplay/wgldisplay_composite1.cxx b/panda/src/wgldisplay/p3wgldisplay_composite1.cxx similarity index 100% rename from panda/src/wgldisplay/wgldisplay_composite1.cxx rename to panda/src/wgldisplay/p3wgldisplay_composite1.cxx diff --git a/panda/src/wgldisplay/wgldisplay_composite.cxx b/panda/src/wgldisplay/wgldisplay_composite.cxx deleted file mode 100644 index 57df59a257..0000000000 --- a/panda/src/wgldisplay/wgldisplay_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "wgldisplay_composite1.cxx" diff --git a/panda/src/windisplay/Sources.pp b/panda/src/windisplay/Sources.pp index a780f6811b..2496806250 100644 --- a/panda/src/windisplay/Sources.pp +++ b/panda/src/windisplay/Sources.pp @@ -1,7 +1,7 @@ #define BUILD_DIRECTORY $[WINDOWS_PLATFORM] -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define WIN_SYS_LIBS Imm32.lib #define BUILDING_DLL BUILDING_PANDAWIN @@ -9,9 +9,9 @@ #define USE_PACKAGES dx8 dx9 #begin lib_target - #define TARGET windisplay + #define TARGET p3windisplay #define LOCAL_LIBS \ - display putil + p3display p3putil #define COMBINED_SOURCES $[TARGET]_composite1.cxx winDetectDx9.cxx winDetectDx8.cxx diff --git a/panda/src/windisplay/windisplay_composite1.cxx b/panda/src/windisplay/p3windisplay_composite1.cxx similarity index 100% rename from panda/src/windisplay/windisplay_composite1.cxx rename to panda/src/windisplay/p3windisplay_composite1.cxx diff --git a/panda/src/windisplay/windisplay_composite.cxx b/panda/src/windisplay/windisplay_composite.cxx deleted file mode 100644 index 51a4d8fbaf..0000000000 --- a/panda/src/windisplay/windisplay_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "windisplay_composite1.cxx" diff --git a/panda/src/x11display/Sources.pp b/panda/src/x11display/Sources.pp index 401b7f6277..34303420aa 100644 --- a/panda/src/x11display/Sources.pp +++ b/panda/src/x11display/Sources.pp @@ -1,12 +1,12 @@ #define BUILD_DIRECTORY $[HAVE_X11] -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define USE_PACKAGES x11 xf86dga xrandr xcursor #begin lib_target - #define TARGET x11display - #define LOCAL_LIBS display + #define TARGET p3x11display + #define LOCAL_LIBS p3display #define SOURCES \ config_x11display.cxx config_x11display.h \ diff --git a/panda/src/x11display/x11display_composite1.cxx b/panda/src/x11display/p3x11display_composite1.cxx similarity index 100% rename from panda/src/x11display/x11display_composite1.cxx rename to panda/src/x11display/p3x11display_composite1.cxx diff --git a/panda/src/x11display/x11display_composite.cxx b/panda/src/x11display/x11display_composite.cxx deleted file mode 100644 index 062ed4581d..0000000000 --- a/panda/src/x11display/x11display_composite.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "x11display_composite1.cxx" diff --git a/pandatool/Sources.pp b/pandatool/Sources.pp index 1c4bbdb313..f002841f0c 100644 --- a/pandatool/Sources.pp +++ b/pandatool/Sources.pp @@ -4,7 +4,7 @@ #define DIR_TYPE toplevel #define SAMPLE_SOURCE_FILE src/pandatoolbase/pandatoolbase.cxx -#define REQUIRED_TREES dtool panda +#define REQUIRED_TREES p3dtool panda #define EXTRA_DIST \ Config.Irix.pp Config.Linux.pp Config.Win32.pp Package.pp diff --git a/pandatool/src/assimp/Sources.pp b/pandatool/src/assimp/Sources.pp index abbb6f0606..43a9f28ca0 100644 --- a/pandatool/src/assimp/Sources.pp +++ b/pandatool/src/assimp/Sources.pp @@ -4,22 +4,22 @@ #define TARGET p3assimp #define BUILDING_DLL BUILDING_ASSIMP #define LOCAL_LIBS \ - pandatoolbase - #define USE_PACKAGES assimp + p3pandatoolbase + #define USE_PACKAGES p3assimp #define OTHER_LIBS \ - egg2pg:c egg:c pandaegg:m \ - pstatclient:c mathutil:c linmath:c putil:c \ - gobj:c chan:c parametrics:c pgraph:c pgraphnodes: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 \ - event:c gsgbase:c lerp:c movies:c \ + p3egg2pg:c p3egg:c pandaegg:m \ + p3pstatclient:c p3mathutil:c p3linmath:c p3putil:c \ + p3gobj:c p3chan:c p3parametrics:c p3pgraph:c p3pgraphnodes:c \ + p3pnmimage:c p3grutil:c p3collide:c p3tform:c p3text:c \ + p3char:c p3dgraph:c p3display:c p3device:c p3cull:c \ + p3downloader:c p3pipeline:c \ + p3event:c p3gsgbase:c p3lerp:c p3movies:c \ panda:m \ - pandabase:c express:c pandaexpress:m \ - interrogatedb:c prc:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m \ - assimp:c + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + p3assimp:c #define SOURCES \ assimpLoader.cxx assimpLoader.h \ diff --git a/pandatool/src/bam/Sources.pp b/pandatool/src/bam/Sources.pp index b794d32056..818fdc404f 100644 --- a/pandatool/src/bam/Sources.pp +++ b/pandatool/src/bam/Sources.pp @@ -1,24 +1,24 @@ #define USE_PACKAGES fftw cg #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 pgraphnodes: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 \ - 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] \ + p3egg2pg:c p3egg:c pandaegg:m \ + p3pipeline:c p3recorder:c p3parametrics:c p3collide:c p3chan:c p3char:c \ + p3dgraph:c p3downloader:c p3recorder:c \ + p3pnmimagetypes:c p3pnmimage:c p3pgraph:c p3pgraphnodes:c p3gobj:c p3putil:c \ + p3lerp:c p3mathutil:c p3linmath:c p3event:c p3pstatclient:c \ + p3gsgbase:c p3grutil:c p3display:c p3text:c p3cull:c \ + p3tform:c p3device:c p3movies:c \ + $[if $[HAVE_FREETYPE],p3pnmtext:c] \ + $[if $[HAVE_NET],p3net:c] $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[HAVE_AUDIO],p3audio:c] \ panda:m \ - pandabase:c express:c pandaexpress:m \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c \ - dtoolconfig:m dtool:m pystub + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c \ + p3dtoolconfig:m p3dtool:m p3pystub #begin bin_target #define TARGET bam-info #define LOCAL_LIBS \ - progbase + p3progbase #define SOURCES \ bamInfo.cxx bamInfo.h @@ -29,7 +29,7 @@ #begin bin_target #define TARGET egg2bam #define LOCAL_LIBS \ - eggbase progbase + p3eggbase p3progbase #define SOURCES \ eggToBam.cxx eggToBam.h @@ -39,7 +39,7 @@ #begin bin_target #define TARGET bam2egg #define LOCAL_LIBS \ - converter eggbase progbase + p3converter p3eggbase p3progbase #define SOURCES \ bamToEgg.cxx bamToEgg.h diff --git a/pandatool/src/configfiles/pandatool.prc.pp b/pandatool/src/configfiles/pandatool.prc.pp index 78f16ff853..695f6afea0 100644 --- a/pandatool/src/configfiles/pandatool.prc.pp +++ b/pandatool/src/configfiles/pandatool.prc.pp @@ -16,6 +16,6 @@ # into Panda, for instance via the loadModel() call or on the pview # command line. -load-file-type ptloader +load-file-type p3ptloader #end 30_pandatool.prc diff --git a/pandatool/src/converter/Sources.pp b/pandatool/src/converter/Sources.pp index b23ca019b0..8aa9268885 100644 --- a/pandatool/src/converter/Sources.pp +++ b/pandatool/src/converter/Sources.pp @@ -1,13 +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 + p3egg:c pandaegg:m \ + p3pipeline:c p3event:c panda:m \ + p3mathutil:c p3linmath:c p3putil:c p3express:c p3pandabase:c \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #begin ss_lib_target - #define TARGET converter - #define LOCAL_LIBS pandatoolbase + #define TARGET p3converter + #define LOCAL_LIBS p3pandatoolbase #define UNIX_SYS_LIBS \ m diff --git a/pandatool/src/cvscopy/Sources.pp b/pandatool/src/cvscopy/Sources.pp index c0bd419d22..087ab92904 100644 --- a/pandatool/src/cvscopy/Sources.pp +++ b/pandatool/src/cvscopy/Sources.pp @@ -1,15 +1,15 @@ #begin ss_lib_target - #define TARGET cvscopy + #define TARGET p3cvscopy #define LOCAL_LIBS \ - progbase pandatoolbase + p3progbase p3pandatoolbase #define OTHER_LIBS \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ - 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] + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c p3express:c \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] #define COMBINED_SOURCES $[TARGET]_composite1.cxx @@ -26,10 +26,10 @@ #begin test_bin_target #define TARGET testcopy - #define LOCAL_LIBS cvscopy + #define LOCAL_LIBS p3cvscopy #define OTHER_LIBS \ - prc:c dconfig:c dtool:m pystub + p3prc:c p3dconfig:c p3dtool:m p3pystub #define SOURCES \ testCopy.cxx testCopy.h diff --git a/pandatool/src/cvscopy/cvscopy_composite1.cxx b/pandatool/src/cvscopy/p3cvscopy_composite1.cxx similarity index 100% rename from pandatool/src/cvscopy/cvscopy_composite1.cxx rename to pandatool/src/cvscopy/p3cvscopy_composite1.cxx diff --git a/pandatool/src/daeegg/Sources.pp b/pandatool/src/daeegg/Sources.pp index 9a8d3c781f..e3557e65f1 100755 --- a/pandatool/src/daeegg/Sources.pp +++ b/pandatool/src/daeegg/Sources.pp @@ -2,15 +2,15 @@ #begin ss_lib_target #define USE_PACKAGES fcollada - #define TARGET daeegg - #define LOCAL_LIBS converter pandatoolbase + #define TARGET p3daeegg + #define LOCAL_LIBS p3converter p3pandatoolbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - pandabase:c express:c pandaexpress:m \ - pipeline:c mathutil:c linmath:c putil:c event:c \ + p3egg:c pandaegg:m \ + p3pandabase:c p3express:c pandaexpress:m \ + p3pipeline:c p3mathutil:c p3linmath:c p3putil:c p3event:c \ panda:m \ - interrogatedb:c prc:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define SOURCES \ config_daeegg.cxx config_daeegg.h \ diff --git a/pandatool/src/daeegg/daeegg_composite1.cxx b/pandatool/src/daeegg/p3daeegg_composite1.cxx similarity index 100% rename from pandatool/src/daeegg/daeegg_composite1.cxx rename to pandatool/src/daeegg/p3daeegg_composite1.cxx diff --git a/pandatool/src/daeprogs/Sources.pp b/pandatool/src/daeprogs/Sources.pp index ec88058416..b994b66017 100755 --- a/pandatool/src/daeprogs/Sources.pp +++ b/pandatool/src/daeprogs/Sources.pp @@ -1,14 +1,14 @@ #define BUILD_DIRECTORY $[HAVE_FCOLLADA] #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 + p3egg:c pandaegg:m \ + p3pipeline:c p3pnmimage:c p3putil:c p3event:c p3mathutil:c p3linmath:c panda:m \ + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m p3pystub #begin bin_target #define TARGET dae2egg - #define LOCAL_LIBS daeegg eggbase progbase + #define LOCAL_LIBS p3daeegg p3eggbase p3progbase #define SOURCES \ daeToEgg.cxx daeToEgg.h @@ -17,7 +17,7 @@ //#begin bin_target // #define TARGET egg2dae -// #define LOCAL_LIBS daeegg eggbase progbase +// #define LOCAL_LIBS p3daeegg p3eggbase p3progbase // // #define SOURCES \ // eggToDAE.cxx eggToDAE.h diff --git a/pandatool/src/dxf/Sources.pp b/pandatool/src/dxf/Sources.pp index 0fe4159abd..868383958d 100644 --- a/pandatool/src/dxf/Sources.pp +++ b/pandatool/src/dxf/Sources.pp @@ -1,12 +1,12 @@ #begin ss_lib_target - #define TARGET dxf - #define LOCAL_LIBS pandatoolbase + #define TARGET p3dxf + #define LOCAL_LIBS p3pandatoolbase #define OTHER_LIBS \ - pipeline:c event:c putil:c mathutil:c linmath:c \ + p3pipeline:c p3event:c p3putil:c p3mathutil:c p3linmath:c \ panda:m \ - pandabase:c express:c pandaexpress:m \ - dtoolutil:c dconfig:c prc:c interrogatedb:c dtoolbase:c dtool:m + p3pandabase:c p3express:c pandaexpress:m \ + p3dtoolutil:c p3dconfig:c p3prc:c p3interrogatedb:c p3dtoolbase:c p3dtool:m #define SOURCES \ dxfFile.cxx dxfFile.h dxfLayer.h dxfLayer.cxx \ diff --git a/pandatool/src/dxf/dxf_composite1.cxx b/pandatool/src/dxf/p3dxf_composite1.cxx similarity index 100% rename from pandatool/src/dxf/dxf_composite1.cxx rename to pandatool/src/dxf/p3dxf_composite1.cxx diff --git a/pandatool/src/dxfegg/Sources.pp b/pandatool/src/dxfegg/Sources.pp index fb3d12ae28..bb9f1d20df 100644 --- a/pandatool/src/dxfegg/Sources.pp +++ b/pandatool/src/dxfegg/Sources.pp @@ -1,14 +1,14 @@ #begin ss_lib_target - #define TARGET dxfegg - #define LOCAL_LIBS converter dxf pandatoolbase + #define TARGET p3dxfegg + #define LOCAL_LIBS p3converter p3dxf p3pandatoolbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ - 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] + p3egg:c pandaegg:m \ + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c p3express:c \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] #define UNIX_SYS_LIBS \ m diff --git a/pandatool/src/dxfprogs/Sources.pp b/pandatool/src/dxfprogs/Sources.pp index e46f269920..8b083c037c 100644 --- a/pandatool/src/dxfprogs/Sources.pp +++ b/pandatool/src/dxfprogs/Sources.pp @@ -2,20 +2,20 @@ #define USE_PACKAGES fftw #define OTHER_LIBS \ - egg:c pandaegg:m \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ + p3egg:c pandaegg:m \ + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c p3express: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] \ - pystub + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] \ + p3pystub #begin bin_target #define TARGET dxf-points #define LOCAL_LIBS \ - progbase dxf + p3progbase p3dxf #define SOURCES \ dxfPoints.cxx dxfPoints.h @@ -24,7 +24,7 @@ #begin bin_target #define TARGET dxf2egg - #define LOCAL_LIBS dxf dxfegg eggbase progbase + #define LOCAL_LIBS p3dxf p3dxfegg p3eggbase p3progbase #define SOURCES \ dxfToEgg.cxx dxfToEgg.h @@ -33,7 +33,7 @@ #begin bin_target #define TARGET egg2dxf - #define LOCAL_LIBS dxf eggbase progbase + #define LOCAL_LIBS p3dxf p3eggbase p3progbase #define SOURCES \ eggToDXF.cxx eggToDXF.h \ diff --git a/pandatool/src/egg-mkfont/Sources.pp b/pandatool/src/egg-mkfont/Sources.pp index 4e2baf0e2f..d999a22a77 100644 --- a/pandatool/src/egg-mkfont/Sources.pp +++ b/pandatool/src/egg-mkfont/Sources.pp @@ -3,19 +3,19 @@ #define USE_PACKAGES freetype #define LOCAL_LIBS \ - palettizer eggbase progbase + p3palettizer p3eggbase p3progbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c pnmimagetypes:c pnmtext:c \ - mathutil:c linmath:c putil:c express:c \ + p3egg:c pandaegg:m \ + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3pnmimagetypes:c p3pnmtext:c \ + p3mathutil:c p3linmath:c p3putil:c p3express: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] \ - pystub + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] \ + p3pystub #begin bin_target #define TARGET egg-mkfont diff --git a/pandatool/src/egg-optchar/Sources.pp b/pandatool/src/egg-optchar/Sources.pp index e18aaff9aa..e8b69c4584 100644 --- a/pandatool/src/egg-optchar/Sources.pp +++ b/pandatool/src/egg-optchar/Sources.pp @@ -1,12 +1,12 @@ #define LOCAL_LIBS \ - eggcharbase converter eggbase progbase + p3eggcharbase p3converter p3eggbase p3progbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - event:c pipeline:c pstatclient:c downloader:c net:c nativenet:c \ - pnmimagetypes:c pnmimage:c mathutil:c linmath:c putil:c \ + p3egg:c pandaegg:m \ + p3event:c p3pipeline:c p3pstatclient:c p3downloader:c p3net:c p3nativenet:c \ + p3pnmimagetypes:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c \ panda:m \ - pandabase:c express:c pandaexpress:m \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m p3pystub #define UNIX_SYS_LIBS m #begin bin_target diff --git a/pandatool/src/egg-palettize/Sources.pp b/pandatool/src/egg-palettize/Sources.pp index 2396e98b6e..28ee99dd33 100644 --- a/pandatool/src/egg-palettize/Sources.pp +++ b/pandatool/src/egg-palettize/Sources.pp @@ -1,22 +1,22 @@ #define USE_PACKAGES cg // from gobj. #define OTHER_LIBS \ - egg:c pandaegg:m \ - pgraph:c pgraphnodes: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] $[if $[WANT_NATIVE_NET],nativenet:c] \ + p3egg:c pandaegg:m \ + p3pgraph:c p3pgraphnodes:c p3gobj:c p3lerp:c p3linmath:c p3putil:c \ + p3pnmimage:c p3pnmimagetypes:c p3display:c p3pipeline:c \ + p3event:c p3mathutil:c p3cull:c p3gsgbase:c p3pstatclient:c \ + $[if $[HAVE_NET],p3net:c] $[if $[WANT_NATIVE_NET],p3nativenet: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 + p3pandabase:c p3express:c p3downloader:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c \ + p3dtoolconfig:m p3dtool:m #begin bin_target #define TARGET egg-palettize #define LOCAL_LIBS \ - palettizer eggbase progbase + p3palettizer p3eggbase p3progbase - #define OTHER_LIBS $[OTHER_LIBS] pystub + #define OTHER_LIBS $[OTHER_LIBS] p3pystub #define SOURCES \ eggPalettize.h eggPalettize.cxx @@ -24,10 +24,10 @@ #end bin_target #begin lib_target - #define TARGET txafile + #define TARGET p3txafile #define BUILDING_DLL BUILDING_MISC #define LOCAL_LIBS \ - palettizer + p3palettizer #define SOURCES \ txaFileFilter.h txaFileFilter.I txaFileFilter.cxx diff --git a/pandatool/src/egg-qtess/Sources.pp b/pandatool/src/egg-qtess/Sources.pp index d905ba1724..64f0f140bd 100644 --- a/pandatool/src/egg-qtess/Sources.pp +++ b/pandatool/src/egg-qtess/Sources.pp @@ -3,21 +3,21 @@ #begin bin_target #define TARGET egg-qtess #define LOCAL_LIBS \ - eggbase progbase + p3eggbase p3progbase #define OTHER_LIBS \ - 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 \ - parametrics:c pgraph:c pgraphnodes: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] \ + p3egg2pg:c p3egg:c pandaegg:m \ + p3chan:c p3char:c p3downloader:c p3event:c p3lerp:c \ + p3tform:c p3grutil:c p3text:c p3dgraph:c p3display:c p3gsgbase:c \ + p3collide:c p3gobj:c p3cull:c p3device:c \ + p3parametrics:c p3pgraph:c p3pgraphnodes:c p3pipeline:c p3pstatclient:c p3chan:c \ + p3pnmimagetypes:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c \ + p3movies:c \ + $[if $[HAVE_FREETYPE],p3pnmtext:c] \ + $[if $[HAVE_NET],p3net:c] $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[HAVE_AUDIO],p3audio:c] \ panda:m \ - pandabase:c express:c pandaexpress:m \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m p3pystub #define UNIX_SYS_LIBS m #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/eggbase/Sources.pp b/pandatool/src/eggbase/Sources.pp index 743692f6aa..fdddba7cee 100644 --- a/pandatool/src/eggbase/Sources.pp +++ b/pandatool/src/eggbase/Sources.pp @@ -1,14 +1,14 @@ #begin ss_lib_target - #define TARGET eggbase + #define TARGET p3eggbase #define LOCAL_LIBS \ - progbase converter + p3progbase p3converter #define OTHER_LIBS \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ - 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] + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c p3express:c \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/eggbase/eggbase_composite1.cxx b/pandatool/src/eggbase/p3eggbase_composite1.cxx similarity index 100% rename from pandatool/src/eggbase/eggbase_composite1.cxx rename to pandatool/src/eggbase/p3eggbase_composite1.cxx diff --git a/pandatool/src/eggcharbase/Sources.pp b/pandatool/src/eggcharbase/Sources.pp index 212d7e2cb4..34ee69e60e 100644 --- a/pandatool/src/eggcharbase/Sources.pp +++ b/pandatool/src/eggcharbase/Sources.pp @@ -1,15 +1,15 @@ #begin ss_lib_target - #define TARGET eggcharbase + #define TARGET p3eggcharbase #define LOCAL_LIBS \ - eggbase progbase + p3eggbase p3progbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - event:c linmath:c mathutil:c pnmimage:c putil:c \ - pipeline:c pstatclient:c downloader:c net:c nativenet:c \ + p3egg:c pandaegg:m \ + p3event:c p3linmath:c p3mathutil:c p3pnmimage:c p3putil:c \ + p3pipeline:c p3pstatclient:c p3downloader:c p3net:c p3nativenet:c \ panda:m \ - pandabase:c express:c pandaexpress:m \ - interrogatedb:c prc:c dconfig:c dtooolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3prc:c p3dconfig:c dtooolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define USE_PACKAGES zlib #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/eggcharbase/eggcharbase_composite1.cxx b/pandatool/src/eggcharbase/p3eggcharbase_composite1.cxx similarity index 100% rename from pandatool/src/eggcharbase/eggcharbase_composite1.cxx rename to pandatool/src/eggcharbase/p3eggcharbase_composite1.cxx diff --git a/pandatool/src/eggprogs/Sources.pp b/pandatool/src/eggprogs/Sources.pp index 906f9d3175..54754a8ec5 100644 --- a/pandatool/src/eggprogs/Sources.pp +++ b/pandatool/src/eggprogs/Sources.pp @@ -1,12 +1,12 @@ #define LOCAL_LIBS \ - converter eggbase progbase + p3converter p3eggbase p3progbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - event:c pipeline:c pstatclient:c downloader:c net:c nativenet:c \ - pnmimagetypes:c pnmimage:c mathutil:c linmath:c putil:c \ + p3egg:c pandaegg:m \ + p3event:c p3pipeline:c p3pstatclient:c p3downloader:c p3net:c p3nativenet:c \ + p3pnmimagetypes:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c \ panda:m \ - pandabase:c express:c pandaexpress:m \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m p3pystub #define UNIX_SYS_LIBS m #begin bin_target @@ -50,7 +50,7 @@ #end bin_target #begin bin_target - #define LOCAL_LIBS eggcharbase $[LOCAL_LIBS] + #define LOCAL_LIBS p3eggcharbase $[LOCAL_LIBS] #define TARGET egg-topstrip #define SOURCES \ @@ -59,7 +59,7 @@ #end bin_target #begin bin_target - #define LOCAL_LIBS eggcharbase $[LOCAL_LIBS] + #define LOCAL_LIBS p3eggcharbase $[LOCAL_LIBS] #define TARGET egg-retarget-anim #define SOURCES \ diff --git a/pandatool/src/flt/Sources.pp b/pandatool/src/flt/Sources.pp index b3621375e1..03a8fe8889 100644 --- a/pandatool/src/flt/Sources.pp +++ b/pandatool/src/flt/Sources.pp @@ -1,16 +1,16 @@ #define USE_PACKAGES zlib #begin ss_lib_target - #define TARGET flt - #define LOCAL_LIBS converter pandatoolbase + #define TARGET p3flt + #define LOCAL_LIBS p3converter p3pandatoolbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - pipeline:c pstatclient:c downloader:c net:c nativenet:c \ - mathutil:c linmath:c putil:c event:c express:c \ + p3egg:c pandaegg:m \ + p3pipeline:c p3pstatclient:c p3downloader:c p3net:c p3nativenet:c \ + p3mathutil:c p3linmath:c p3putil:c p3event:c p3express:c \ panda:m \ - pandabase:c pandaexpress:m \ - interrogatedb:c prc:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + p3pandabase:c pandaexpress:m \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define UNIX_SYS_LIBS m #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/flt/flt_composite1.cxx b/pandatool/src/flt/p3flt_composite1.cxx similarity index 100% rename from pandatool/src/flt/flt_composite1.cxx rename to pandatool/src/flt/p3flt_composite1.cxx diff --git a/pandatool/src/fltegg/Sources.pp b/pandatool/src/fltegg/Sources.pp index b670d7c133..441bb4fabc 100644 --- a/pandatool/src/fltegg/Sources.pp +++ b/pandatool/src/fltegg/Sources.pp @@ -1,14 +1,14 @@ #begin ss_lib_target - #define TARGET fltegg - #define LOCAL_LIBS converter flt pandatoolbase + #define TARGET p3fltegg + #define LOCAL_LIBS p3converter p3flt p3pandatoolbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - mathutil:c linmath:c putil:c event:c pipeline:c \ - pstatclient:c downloader:c net:c nativenet:c \ + p3egg:c pandaegg:m \ + p3mathutil:c p3linmath:c p3putil:c p3event:c p3pipeline:c \ + p3pstatclient:c p3downloader:c p3net:c p3nativenet:c \ panda:m \ - pandabase:c express:c pandaexpress:m \ - interrogatedb:c prc:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define UNIX_SYS_LIBS \ m diff --git a/pandatool/src/fltprogs/Sources.pp b/pandatool/src/fltprogs/Sources.pp index 233a85e81c..92504e4886 100644 --- a/pandatool/src/fltprogs/Sources.pp +++ b/pandatool/src/fltprogs/Sources.pp @@ -1,16 +1,16 @@ #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 pstatclient:c downloader:c net:c nativenet:c \ + p3egg:c pandaegg:m \ + p3linmath:c p3pnmimagetypes:c p3pnmimage:c p3event:c \ + p3putil:c p3mathutil:c p3pipeline:c p3pstatclient:c p3downloader:c p3net:c p3nativenet:c \ panda:m \ - pandabase:c express:c pandaexpress:m \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m p3pystub #begin bin_target #define TARGET fltcopy - #define LOCAL_LIBS cvscopy flt + #define LOCAL_LIBS p3cvscopy p3flt #define SOURCES \ fltCopy.cxx fltCopy.h @@ -20,7 +20,7 @@ #begin bin_target #define TARGET flt-trans #define LOCAL_LIBS \ - progbase flt + p3progbase p3flt #define SOURCES \ fltTrans.cxx fltTrans.h @@ -30,7 +30,7 @@ #begin bin_target #define TARGET flt-info #define LOCAL_LIBS \ - progbase flt + p3progbase p3flt #define SOURCES \ fltInfo.cxx fltInfo.h @@ -39,7 +39,7 @@ #begin bin_target #define TARGET flt2egg - #define LOCAL_LIBS flt fltegg eggbase progbase + #define LOCAL_LIBS p3flt p3fltegg p3eggbase p3progbase #define SOURCES \ fltToEgg.cxx fltToEgg.h @@ -48,7 +48,7 @@ #begin bin_target #define TARGET egg2flt - #define LOCAL_LIBS flt eggbase progbase + #define LOCAL_LIBS p3flt p3eggbase p3progbase #define SOURCES \ eggToFlt.cxx eggToFlt.h diff --git a/pandatool/src/gtk-stats/Sources.pp b/pandatool/src/gtk-stats/Sources.pp index 113ea96365..ed9ee03496 100644 --- a/pandatool/src/gtk-stats/Sources.pp +++ b/pandatool/src/gtk-stats/Sources.pp @@ -1,5 +1,5 @@ #define BUILD_DIRECTORY $[and $[HAVE_GTK],$[HAVE_NET]] -#define USE_PACKAGES net gtk +#define USE_PACKAGES p3net gtk #begin bin_target // We suspect gtk will not be built universal on OSX. Don't try. @@ -9,13 +9,13 @@ // with Windows-native pstats. #define TARGET $[if $[WINDOWS_PLATFORM],pstats-gtk,pstats] #define LOCAL_LIBS \ - progbase pstatserver + p3progbase p3pstatserver #define OTHER_LIBS \ - $[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] \ - pandabase:c pnmimage:c event:c pstatclient:c \ - linmath:c putil:c pipeline:c express:c pandaexpress:m panda:m \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m \ - pystub + $[if $[HAVE_NET],p3net:c] $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + p3pandabase:c p3pnmimage:c p3event:c p3pstatclient:c \ + p3linmath:c p3putil:c p3pipeline:c p3express:c pandaexpress:m panda:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m \ + p3pystub #define SOURCES \ gtkStats.cxx \ diff --git a/pandatool/src/imagebase/Sources.pp b/pandatool/src/imagebase/Sources.pp index 10946512aa..0cca137f21 100644 --- a/pandatool/src/imagebase/Sources.pp +++ b/pandatool/src/imagebase/Sources.pp @@ -1,15 +1,15 @@ #begin ss_lib_target - #define TARGET imagebase + #define TARGET p3imagebase #define LOCAL_LIBS \ - progbase + p3progbase #define OTHER_LIBS \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ - 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] + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c p3express:c \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/imagebase/imagebase_composite1.cxx b/pandatool/src/imagebase/p3imagebase_composite1.cxx similarity index 100% rename from pandatool/src/imagebase/imagebase_composite1.cxx rename to pandatool/src/imagebase/p3imagebase_composite1.cxx diff --git a/pandatool/src/imageprogs/Sources.pp b/pandatool/src/imageprogs/Sources.pp index 626d2198a3..94d01c8bdc 100644 --- a/pandatool/src/imageprogs/Sources.pp +++ b/pandatool/src/imageprogs/Sources.pp @@ -1,16 +1,16 @@ #define LOCAL_LIBS \ - imagebase progbase + p3imagebase p3progbase #define OTHER_LIBS \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c pnmimagetypes:c \ - mathutil:c linmath:c putil:c express:c \ + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3pnmimagetypes:c \ + p3mathutil:c p3linmath:c p3putil:c p3express: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] \ - pystub + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] \ + p3pystub #begin bin_target #define TARGET image-trans diff --git a/pandatool/src/lwo/Sources.pp b/pandatool/src/lwo/Sources.pp index 4ff3b08a27..62bf8bf355 100644 --- a/pandatool/src/lwo/Sources.pp +++ b/pandatool/src/lwo/Sources.pp @@ -1,14 +1,14 @@ -#define LOCAL_LIBS pandatoolbase +#define LOCAL_LIBS p3pandatoolbase #define OTHER_LIBS \ - mathutil:c linmath:c putil:c pipeline:c event:c \ + p3mathutil:c p3linmath:c p3putil:c p3pipeline:c p3event:c \ panda:m \ - pandabase:c express:c pandaexpress:m \ - interrogatedb:c prc:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define UNIX_SYS_LIBS m #begin ss_lib_target - #define TARGET lwo + #define TARGET p3lwo #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/lwo/lwo_composite1.cxx b/pandatool/src/lwo/p3lwo_composite1.cxx similarity index 100% rename from pandatool/src/lwo/lwo_composite1.cxx rename to pandatool/src/lwo/p3lwo_composite1.cxx diff --git a/pandatool/src/lwoegg/Sources.pp b/pandatool/src/lwoegg/Sources.pp index bc2c4c6aeb..7fbc50b614 100644 --- a/pandatool/src/lwoegg/Sources.pp +++ b/pandatool/src/lwoegg/Sources.pp @@ -1,13 +1,13 @@ #begin ss_lib_target - #define TARGET lwoegg - #define LOCAL_LIBS converter lwo pandatoolbase + #define TARGET p3lwoegg + #define LOCAL_LIBS p3converter p3lwo p3pandatoolbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - mathutil:c linmath:c putil:c pipeline:c event:c \ + p3egg:c pandaegg:m \ + p3mathutil:c p3linmath:c p3putil:c p3pipeline:c p3event:c \ panda:m \ - pandabase:c express:c pandaexpress:m \ - interrogatedb:c prc:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define UNIX_SYS_LIBS m #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/lwoegg/lwoegg_composite1.cxx b/pandatool/src/lwoegg/p3lwoegg_composite1.cxx similarity index 100% rename from pandatool/src/lwoegg/lwoegg_composite1.cxx rename to pandatool/src/lwoegg/p3lwoegg_composite1.cxx diff --git a/pandatool/src/lwoprogs/Sources.pp b/pandatool/src/lwoprogs/Sources.pp index 71b8a6e642..425e2ac0dc 100644 --- a/pandatool/src/lwoprogs/Sources.pp +++ b/pandatool/src/lwoprogs/Sources.pp @@ -1,18 +1,18 @@ #define OTHER_LIBS \ - egg:c pandaegg:m \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ + p3egg:c pandaegg:m \ + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c p3express: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] \ - pystub + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] \ + p3pystub #begin bin_target #define TARGET lwo2egg - #define LOCAL_LIBS lwo lwoegg eggbase progbase + #define LOCAL_LIBS p3lwo p3lwoegg p3eggbase p3progbase #define SOURCES \ lwoToEgg.cxx lwoToEgg.h @@ -21,7 +21,7 @@ #begin bin_target #define TARGET lwo-scan - #define LOCAL_LIBS lwo progbase + #define LOCAL_LIBS p3lwo p3progbase #define SOURCES \ lwoScan.cxx lwoScan.h diff --git a/pandatool/src/maxegg/maxegg_composite1.cxx b/pandatool/src/maxegg/p3maxegg_composite1.cxx similarity index 100% rename from pandatool/src/maxegg/maxegg_composite1.cxx rename to pandatool/src/maxegg/p3maxegg_composite1.cxx diff --git a/pandatool/src/maya/Sources.pp b/pandatool/src/maya/Sources.pp index f3d51a968c..2008f13c98 100644 --- a/pandatool/src/maya/Sources.pp +++ b/pandatool/src/maya/Sources.pp @@ -1,15 +1,15 @@ #define BUILD_DIRECTORY $[HAVE_MAYA] #begin ss_lib_target - #define USE_PACKAGES maya + #define USE_PACKAGES p3maya #define TARGET mayabase #define LOCAL_LIBS \ - converter pandatoolbase + p3converter p3pandatoolbase #define OTHER_LIBS \ - putil:c panda:m \ - express:c pandaexpress:m \ - dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m \ - pipeline:c interrogatedb:c + p3putil:c panda:m \ + p3express:c pandaexpress:m \ + p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m \ + p3pipeline:c p3interrogatedb:c #define SOURCES \ config_maya.cxx config_maya.h \ diff --git a/pandatool/src/maya/maya_composite1.cxx b/pandatool/src/maya/p3maya_composite1.cxx similarity index 100% rename from pandatool/src/maya/maya_composite1.cxx rename to pandatool/src/maya/p3maya_composite1.cxx diff --git a/pandatool/src/mayaegg/Sources.pp b/pandatool/src/mayaegg/Sources.pp index 257adcc65b..6080aecfcb 100644 --- a/pandatool/src/mayaegg/Sources.pp +++ b/pandatool/src/mayaegg/Sources.pp @@ -1,16 +1,16 @@ #define BUILD_DIRECTORY $[HAVE_MAYA] #begin ss_lib_target - #define USE_PACKAGES maya - #define TARGET mayaegg + #define USE_PACKAGES p3maya + #define TARGET p3mayaegg #define LOCAL_LIBS \ - mayabase converter pandatoolbase + mayabase p3converter p3pandatoolbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - linmath:c putil:c panda:m \ - express:c pandaexpress:m \ - dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub \ - pipeline:c interrogatedb:c gobj:c + p3egg:c pandaegg:m \ + p3linmath:c p3putil:c panda:m \ + p3express:c pandaexpress:m \ + p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m p3pystub \ + p3pipeline:c p3interrogatedb:c p3gobj:c #define UNIX_SYS_LIBS \ m diff --git a/pandatool/src/mayaegg/mayaegg_composite1.cxx b/pandatool/src/mayaegg/p3mayaegg_composite1.cxx similarity index 100% rename from pandatool/src/mayaegg/mayaegg_composite1.cxx rename to pandatool/src/mayaegg/p3mayaegg_composite1.cxx diff --git a/pandatool/src/mayaprogs/Sources.pp b/pandatool/src/mayaprogs/Sources.pp index aeb90a1aa0..462913de33 100644 --- a/pandatool/src/mayaprogs/Sources.pp +++ b/pandatool/src/mayaprogs/Sources.pp @@ -3,7 +3,7 @@ #begin bin_target #define TARGET maya2egg #define OTHER_LIBS \ - dtoolbase:c dtoolutil:c dtool:m prc:c dtoolconfig:m + p3dtoolbase:c p3dtoolutil:c p3dtool:m p3prc:c p3dtoolconfig:m #define SOURCES \ mayapath.cxx #end bin_target @@ -11,22 +11,22 @@ #begin bin_target #define TARGET maya2egg_server #define OTHER_LIBS \ - dtoolbase:c dtoolutil:c dtool:m prc:c dtoolconfig:m + p3dtoolbase:c p3dtoolutil:c p3dtool:m p3prc:c p3dtoolconfig:m #define SOURCES \ mayapath.cxx #end bin_target #begin bin_target - #define USE_PACKAGES maya + #define USE_PACKAGES p3maya #define TARGET maya2egg_bin #define LOCAL_LIBS \ - mayabase mayaegg eggbase progbase + mayabase p3mayaegg p3eggbase p3progbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - linmath:c putil:c panda:m \ - express:c pandaexpress:m \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m $[if $[WINDOWS_PLATFORM],pystub,] \ - pipeline:c pnmimage:c + p3egg:c pandaegg:m \ + p3linmath:c p3putil:c panda:m \ + p3express:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m $[if $[WINDOWS_PLATFORM],pystub,] \ + p3pipeline:c p3pnmimage:c // Irix requires this to be named explicitly. #define UNIX_SYS_LIBS \ @@ -38,16 +38,16 @@ #end bin_target #begin bin_target - #define USE_PACKAGES maya + #define USE_PACKAGES p3maya #define TARGET maya2egg_server_bin #define LOCAL_LIBS \ - mayabase mayaegg eggbase progbase + mayabase p3mayaegg p3eggbase p3progbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - linmath:c putil:c panda:m \ - express:c pandaexpress:m \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m $[if $[WINDOWS_PLATFORM],pystub,] \ - pipeline:c pnmimage:c + p3egg:c pandaegg:m \ + p3linmath:c p3putil:c panda:m \ + p3express:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m $[if $[WINDOWS_PLATFORM],pystub,] \ + p3pipeline:c p3pnmimage:c // Irix requires this to be named explicitly. #define UNIX_SYS_LIBS \ @@ -59,16 +59,16 @@ #end bin_target #begin bin_target - #define USE_PACKAGES maya + #define USE_PACKAGES p3maya #define TARGET maya2egg_client #define LOCAL_LIBS \ - mayabase mayaegg eggbase progbase + mayabase p3mayaegg p3eggbase p3progbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - linmath:c putil:c panda:m \ - express:c pandaexpress:m \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m $[if $[WINDOWS_PLATFORM],pystub,] \ - pipeline:c pnmimage:c + p3egg:c pandaegg:m \ + p3linmath:c p3putil:c panda:m \ + p3express:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m $[if $[WINDOWS_PLATFORM],pystub,] \ + p3pipeline:c p3pnmimage:c // Irix requires this to be named explicitly. #define UNIX_SYS_LIBS \ @@ -82,22 +82,22 @@ #begin bin_target #define TARGET egg2maya #define OTHER_LIBS \ - dtoolbase:c dtoolutil:c dtool:m prc:c dtoolconfig:m + p3dtoolbase:c p3dtoolutil:c p3dtool:m p3prc:c p3dtoolconfig:m #define SOURCES \ mayapath.cxx #end bin_target #begin bin_target - #define USE_PACKAGES maya + #define USE_PACKAGES p3maya #define TARGET egg2maya_bin #define LOCAL_LIBS \ - mayabase mayaegg eggbase progbase + mayabase p3mayaegg p3eggbase p3progbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - linmath:c putil:c panda:m \ - express:c pandaexpress:m \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m $[if $[WINDOWS_PLATFORM],pystub,] \ - pipeline:c pnmimage:c + p3egg:c pandaegg:m \ + p3linmath:c p3putil:c panda:m \ + p3express:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m $[if $[WINDOWS_PLATFORM],pystub,] \ + p3pipeline:c p3pnmimage:c // Irix requires this to be named explicitly. #define UNIX_SYS_LIBS \ @@ -112,22 +112,22 @@ #begin bin_target #define TARGET mayacopy #define OTHER_LIBS \ - dtoolbase:c dtoolutil:c dtool:m prc:c dtoolconfig:m + p3dtoolbase:c p3dtoolutil:c p3dtool:m p3prc:c p3dtoolconfig:m #define SOURCES \ mayapath.cxx #end bin_target #begin bin_target - #define USE_PACKAGES maya + #define USE_PACKAGES p3maya #define TARGET mayacopy_bin - #define LOCAL_LIBS cvscopy mayabase progbase + #define LOCAL_LIBS p3cvscopy mayabase p3progbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - linmath:c panda:m \ - express:c pandaexpress:m \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m $[if $[WINDOWS_PLATFORM],pystub,] \ - putil:c pipeline:c pnmimage:c + p3egg:c pandaegg:m \ + p3linmath:c panda:m \ + p3express:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m $[if $[WINDOWS_PLATFORM],pystub,] \ + p3putil:c p3pipeline:c p3pnmimage:c // Irix requires this to be named explicitly. #define UNIX_SYS_LIBS \ @@ -141,16 +141,16 @@ #begin lib_target #define BUILD_TARGET $[not $[LINK_ALL_STATIC]] - #define USE_PACKAGES maya + #define USE_PACKAGES p3maya #define TARGET mayapview - #define LOCAL_LIBS mayabase mayaegg + #define LOCAL_LIBS mayabase p3mayaegg #define OTHER_LIBS \ - egg:c pandaegg:m \ - framework:m \ - linmath:c putil:c panda:m \ - express:c pandaexpress:m \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m $[if $[WINDOWS_PLATFORM],pystub,] \ - pipeline:c + p3egg:c pandaegg:m \ + p3framework:m \ + p3linmath:c p3putil:c panda:m \ + p3express:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m $[if $[WINDOWS_PLATFORM],pystub,] \ + p3pipeline:c #define BUILDING_DLL BUILDING_MISC @@ -168,7 +168,7 @@ #begin lib_target #define BUILD_TARGET $[not $[LINK_ALL_STATIC]] - #define USE_PACKAGES maya + #define USE_PACKAGES p3maya #define TARGET mayasavepview #if $[WINDOWS_PLATFORM] @@ -181,16 +181,16 @@ #begin lib_target #define BUILD_TARGET $[not $[LINK_ALL_STATIC]] - #define USE_PACKAGES maya + #define USE_PACKAGES p3maya #define TARGET mayaEggImport - #define LOCAL_LIBS mayabase mayaegg + #define LOCAL_LIBS mayabase p3mayaegg #define OTHER_LIBS \ - egg:c pandaegg:m \ - framework:m \ - linmath:c putil:c panda:m \ - express:c pandaexpress:m \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m $[if $[WINDOWS_PLATFORM],pystub,] \ - pipeline:c + p3egg:c pandaegg:m \ + p3framework:m \ + p3linmath:c p3putil:c panda:m \ + p3express:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m $[if $[WINDOWS_PLATFORM],pystub,] \ + p3pipeline:c #define BUILDING_DLL BUILDING_MISC @@ -204,21 +204,21 @@ #end lib_target #begin lib_target - #define USE_PACKAGES maya + #define USE_PACKAGES p3maya #define TARGET mayaloader #define BUILDING_DLL BUILDING_MISC #define LOCAL_LIBS \ - mayabase mayaegg ptloader converter pandatoolbase + mayabase p3mayaegg p3ptloader p3converter p3pandatoolbase #define OTHER_LIBS \ - egg2pg:c egg:c pandaegg:m \ - mathutil:c linmath:c putil:c panda:m \ - express:c pandaexpress:m \ - dtoolconfig dtool \ - 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 movies:c audio:c \ - $[if $[HAVE_FREETYPE],pnmtext:c] + p3egg2pg:c p3egg:c pandaegg:m \ + p3mathutil:c p3linmath:c p3putil:c panda:m \ + p3express:c pandaexpress:m \ + p3dtoolconfig p3dtool \ + p3event:c p3gobj:c p3chan:c p3pgraph:c p3parametrics:c p3char:c p3prc:c p3dtoolutil:c \ + p3interrogatedb:c p3dtoolbase:c p3collide:c p3pnmimage:c p3dgraph:c p3tform:c \ + p3pipeline:c p3pstatclient:c p3grutil:c p3gsgbase:c p3net:c p3lerp:c p3display:c \ + p3cull:c p3text:c p3nativenet:c p3movies:c p3audio:c \ + $[if $[HAVE_FREETYPE],p3pnmtext:c] #define SOURCES \ config_mayaloader.cxx @@ -226,7 +226,7 @@ #end lib_target #begin test_bin_target - #define USE_PACKAGES maya + #define USE_PACKAGES p3maya #define TARGET normal_test #define SOURCES \ diff --git a/pandatool/src/miscprogs/Sources.pp b/pandatool/src/miscprogs/Sources.pp index e83bfeeb5f..51bdb5bed6 100644 --- a/pandatool/src/miscprogs/Sources.pp +++ b/pandatool/src/miscprogs/Sources.pp @@ -1,15 +1,15 @@ #define LOCAL_LIBS \ - progbase + p3progbase #define OTHER_LIBS \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c p3express: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] \ - pystub + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] \ + p3pystub #define UNIX_SYS_LIBS m diff --git a/pandatool/src/objegg/Sources.pp b/pandatool/src/objegg/Sources.pp index 22dc687d3c..fde6ed7504 100755 --- a/pandatool/src/objegg/Sources.pp +++ b/pandatool/src/objegg/Sources.pp @@ -1,14 +1,14 @@ #begin ss_lib_target - #define TARGET objegg - #define LOCAL_LIBS converter pandatoolbase + #define TARGET p3objegg + #define LOCAL_LIBS p3converter p3pandatoolbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ - 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] + p3egg:c pandaegg:m \ + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c p3express:c \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] #define UNIX_SYS_LIBS \ m diff --git a/pandatool/src/objprogs/Sources.pp b/pandatool/src/objprogs/Sources.pp index f83175d0a8..39db2412a2 100755 --- a/pandatool/src/objprogs/Sources.pp +++ b/pandatool/src/objprogs/Sources.pp @@ -1,19 +1,19 @@ #define UNIX_SYS_LIBS m #define OTHER_LIBS \ - egg:c pandaegg:m \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ + p3egg:c pandaegg:m \ + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c p3express: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] \ - pystub + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] \ + p3pystub #begin bin_target #define TARGET obj2egg - #define LOCAL_LIBS objegg eggbase progbase + #define LOCAL_LIBS p3objegg p3eggbase p3progbase #define SOURCES \ objToEgg.cxx objToEgg.h diff --git a/pandatool/src/palettizer/Sources.pp b/pandatool/src/palettizer/Sources.pp index 7fcd6b5258..57cab79d88 100644 --- a/pandatool/src/palettizer/Sources.pp +++ b/pandatool/src/palettizer/Sources.pp @@ -1,16 +1,16 @@ #begin ss_lib_target - #define TARGET palettizer + #define TARGET p3palettizer #define LOCAL_LIBS \ - pandatoolbase + p3pandatoolbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ - 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] + p3egg:c pandaegg:m \ + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c p3express:c \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/palettizer/palettizer_composite1.cxx b/pandatool/src/palettizer/p3palettizer_composite1.cxx similarity index 100% rename from pandatool/src/palettizer/palettizer_composite1.cxx rename to pandatool/src/palettizer/p3palettizer_composite1.cxx diff --git a/pandatool/src/pandatoolbase/Sources.pp b/pandatool/src/pandatoolbase/Sources.pp index 55f937653b..acd6308c77 100644 --- a/pandatool/src/pandatoolbase/Sources.pp +++ b/pandatool/src/pandatoolbase/Sources.pp @@ -1,11 +1,11 @@ #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 + p3pipeline:c panda:m \ + p3express:c p3putil:c p3pandabase:c pandaexpress:m \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #begin ss_lib_target - #define TARGET pandatoolbase + #define TARGET p3pandatoolbase #define SOURCES \ animationConvert.cxx animationConvert.h \ diff --git a/pandatool/src/pandatoolbase/pandatoolbase_composite1.cxx b/pandatool/src/pandatoolbase/p3pandatoolbase_composite1.cxx similarity index 100% rename from pandatool/src/pandatoolbase/pandatoolbase_composite1.cxx rename to pandatool/src/pandatoolbase/p3pandatoolbase_composite1.cxx diff --git a/pandatool/src/pfmprogs/Sources.pp b/pandatool/src/pfmprogs/Sources.pp index 3615ddb9db..f97089ada7 100755 --- a/pandatool/src/pfmprogs/Sources.pp +++ b/pandatool/src/pfmprogs/Sources.pp @@ -1,17 +1,17 @@ #define OTHER_LIBS \ - egg:c pandaegg:m \ - pipeline:c event:c display:c gobj:c pgraph:c pstatclient:c grutil:c panda:m \ - pandabase:c pnmimage:c pnmimagetypes:c mathutil:c linmath:c putil:c express:c \ + p3egg:c pandaegg:m \ + p3pipeline:c p3event:c p3display:c p3gobj:c p3pgraph:c p3pstatclient:c p3grutil:c panda:m \ + p3pandabase:c p3pnmimage:c p3pnmimagetypes:c p3mathutil:c p3linmath:c p3putil:c p3express: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] \ - pystub + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] \ + p3pystub #begin bin_target #define TARGET pfm-trans - #define LOCAL_LIBS progbase + #define LOCAL_LIBS p3progbase #define SOURCES \ config_pfm.cxx config_pfm.h \ @@ -21,7 +21,7 @@ #begin bin_target #define TARGET pfm-bba - #define LOCAL_LIBS progbase + #define LOCAL_LIBS p3progbase #define SOURCES \ config_pfm.cxx config_pfm.h \ @@ -31,7 +31,7 @@ //#begin bin_target // #define TARGET pfm-wallpaper -// #define LOCAL_LIBS progbase +// #define LOCAL_LIBS p3progbase // // #define SOURCES \ // config_pfm.cxx config_pfm.h \ diff --git a/pandatool/src/progbase/Sources.pp b/pandatool/src/progbase/Sources.pp index d703ed2a72..6d1ec85da2 100644 --- a/pandatool/src/progbase/Sources.pp +++ b/pandatool/src/progbase/Sources.pp @@ -1,16 +1,16 @@ #define USE_PACKAGES zlib #begin ss_lib_target - #define TARGET progbase + #define TARGET p3progbase #define LOCAL_LIBS \ - pandatoolbase + p3pandatoolbase #define OTHER_LIBS \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ - 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] + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c p3express:c \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] #define COMBINED_SOURCES $[TARGET]_composite1.cxx @@ -35,8 +35,8 @@ #begin test_bin_target #define TARGET test_prog #define LOCAL_LIBS \ - progbase - #define OTHER_LIBS pystub + p3progbase + #define OTHER_LIBS p3pystub #define SOURCES \ test_prog.cxx diff --git a/pandatool/src/progbase/progbase_composite1.cxx b/pandatool/src/progbase/p3progbase_composite1.cxx similarity index 100% rename from pandatool/src/progbase/progbase_composite1.cxx rename to pandatool/src/progbase/p3progbase_composite1.cxx diff --git a/pandatool/src/pstatserver/Sources.pp b/pandatool/src/pstatserver/Sources.pp index 235f7af761..97365e3ed7 100644 --- a/pandatool/src/pstatserver/Sources.pp +++ b/pandatool/src/pstatserver/Sources.pp @@ -1,14 +1,14 @@ #define BUILD_DIRECTORY $[HAVE_NET] #begin ss_lib_target - #define TARGET pstatserver - #define LOCAL_LIBS pandatoolbase + #define TARGET p3pstatserver + #define LOCAL_LIBS p3pandatoolbase #define OTHER_LIBS \ - pstatclient:c downloader:c net:c putil:c pipeline:c \ + p3pstatclient:c p3downloader:c p3net:c p3putil:c p3pipeline:c \ panda:m \ - pandabase:c express:c pandaexpress:m \ - $[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m + p3pandabase:c p3express:c pandaexpress:m \ + $[if $[HAVE_NET],p3net:c] $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m #define SOURCES \ pStatClientData.cxx pStatClientData.h pStatGraph.I pStatGraph.cxx \ diff --git a/pandatool/src/pstatserver/pstatserver_composite1.cxx b/pandatool/src/pstatserver/p3pstatserver_composite1.cxx similarity index 100% rename from pandatool/src/pstatserver/pstatserver_composite1.cxx rename to pandatool/src/pstatserver/p3pstatserver_composite1.cxx diff --git a/pandatool/src/ptloader/Sources.pp b/pandatool/src/ptloader/Sources.pp index 8dadf6713e..8e240843f7 100644 --- a/pandatool/src/ptloader/Sources.pp +++ b/pandatool/src/ptloader/Sources.pp @@ -1,27 +1,27 @@ #define USE_PACKAGES cg // from gobj. #begin lib_target - #define TARGET ptloader + #define TARGET p3ptloader #define BUILDING_DLL BUILDING_PTLOADER #define LOCAL_LIBS \ - fltegg flt lwoegg lwo dxfegg dxf vrmlegg pvrml xfileegg xfile \ - objegg \ - converter pandatoolbase $[if $[HAVE_FCOLLADA],daeegg] + p3fltegg p3flt p3lwoegg p3lwo p3dxfegg p3dxf p3vrmlegg p3vrml p3xfileegg p3xfile \ + p3objegg \ + p3converter p3pandatoolbase $[if $[HAVE_FCOLLADA],p3daeegg] #define OTHER_LIBS \ - egg2pg:c egg:c pandaegg:m \ - pstatclient:c mathutil:c linmath:c putil:c \ - gobj:c chan:c parametrics:c pgraph:c pgraphnodes: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 \ - 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] \ + p3egg2pg:c p3egg:c pandaegg:m \ + p3pstatclient:c p3mathutil:c p3linmath:c p3putil:c \ + p3gobj:c p3chan:c p3parametrics:c p3pgraph:c p3pgraphnodes:c \ + p3pnmimage:c p3grutil:c p3collide:c p3tform:c p3text:c \ + p3char:c p3dgraph:c p3display:c p3device:c p3cull:c \ + p3downloader:c p3pipeline:c \ + p3event:c p3gsgbase:c p3lerp:c p3movies:c \ + $[if $[HAVE_FREETYPE],p3pnmtext:c] \ + $[if $[HAVE_NET],p3net:c] $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[HAVE_AUDIO],p3audio:c] \ panda:m \ - pandabase:c express:c pandaexpress:m \ - interrogatedb:c prc:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define UNIX_SYS_LIBS \ m diff --git a/pandatool/src/softegg/Sources.pp b/pandatool/src/softegg/Sources.pp index ebd57a3ad7..56bbd8ee00 100755 --- a/pandatool/src/softegg/Sources.pp +++ b/pandatool/src/softegg/Sources.pp @@ -2,14 +2,14 @@ #begin lib_target #define USE_PACKAGES softimage - #define TARGET softegg + #define TARGET p3softegg #define LOCAL_LIBS \ - converter pandatoolbase + p3converter p3pandatoolbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - linmath:c putil:c panda:m \ - express:c pandaexpress:m \ - dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m + p3egg:c pandaegg:m \ + p3linmath:c p3putil:c panda:m \ + p3express:c pandaexpress:m \ + p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m #define BUILDING_DLL BUILDING_MISC #define UNIX_SYS_LIBS \ diff --git a/pandatool/src/softprogs/Sources.pp b/pandatool/src/softprogs/Sources.pp index 5e94232c75..2933cae69d 100644 --- a/pandatool/src/softprogs/Sources.pp +++ b/pandatool/src/softprogs/Sources.pp @@ -1,18 +1,18 @@ #begin bin_target #define TARGET softcvs - #define LOCAL_LIBS progbase + #define LOCAL_LIBS p3progbase #define USE_PACKAGES openssl #define OTHER_LIBS \ - egg:c pandaegg:m \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ + p3egg:c pandaegg:m \ + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c p3express: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] \ - pystub + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] \ + p3pystub #define SOURCES \ softCVS.cxx softCVS.h softFilename.cxx softFilename.h diff --git a/pandatool/src/text-stats/Sources.pp b/pandatool/src/text-stats/Sources.pp index 4628b57a45..623914c1fd 100644 --- a/pandatool/src/text-stats/Sources.pp +++ b/pandatool/src/text-stats/Sources.pp @@ -3,14 +3,14 @@ #begin bin_target #define TARGET text-stats #define LOCAL_LIBS \ - progbase pstatserver + p3progbase p3pstatserver #define OTHER_LIBS \ - pstatclient:c linmath:c putil:c pipeline:c event:c \ - pnmimage:c mathutil:c \ - downloader:c $[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] \ + p3pstatclient:c p3linmath:c p3putil:c p3pipeline:c p3event:c \ + p3pnmimage:c p3mathutil:c \ + p3downloader:c $[if $[HAVE_NET],p3net:c] $[if $[WANT_NATIVE_NET],p3nativenet:c] \ panda:m \ - pandabase:c express:c pandaexpress:m \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m pystub + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m p3pystub #define SOURCES \ textMonitor.cxx textMonitor.h textMonitor.I \ diff --git a/pandatool/src/vrml/Sources.pp b/pandatool/src/vrml/Sources.pp index e07531d689..4c8084a404 100644 --- a/pandatool/src/vrml/Sources.pp +++ b/pandatool/src/vrml/Sources.pp @@ -1,14 +1,14 @@ #define YACC_PREFIX vrmlyy #begin ss_lib_target - #define TARGET pvrml + #define TARGET p3vrml #define LOCAL_LIBS \ - pandatoolbase + p3pandatoolbase #define OTHER_LIBS \ - mathutil:c linmath:c pipeline:c \ + p3mathutil:c p3linmath:c p3pipeline:c \ panda:m \ - pandabase:c express:c pandaexpress:m \ - interrogatedb:c dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m #define USE_PACKAGES zlib diff --git a/pandatool/src/vrmlegg/Sources.pp b/pandatool/src/vrmlegg/Sources.pp index c9544acfe0..3be1e08eec 100644 --- a/pandatool/src/vrmlegg/Sources.pp +++ b/pandatool/src/vrmlegg/Sources.pp @@ -1,14 +1,14 @@ #begin ss_lib_target - #define TARGET vrmlegg - #define LOCAL_LIBS converter pvrml pandatoolbase + #define TARGET p3vrmlegg + #define LOCAL_LIBS p3converter p3vrml p3pandatoolbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - mathutil:c linmath:c event:c putil:c express:c \ - pipeline:c \ + p3egg:c pandaegg:m \ + p3mathutil:c p3linmath:c p3event:c p3putil:c p3express:c \ + p3pipeline:c \ panda:m \ - pandabase:c pandaexpress:m \ - interrogatedb:c prc:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + p3pandabase:c pandaexpress:m \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define SOURCES \ indexedFaceSet.cxx indexedFaceSet.h \ diff --git a/pandatool/src/vrmlprogs/Sources.pp b/pandatool/src/vrmlprogs/Sources.pp index c248b26c0f..0c521f21cd 100644 --- a/pandatool/src/vrmlprogs/Sources.pp +++ b/pandatool/src/vrmlprogs/Sources.pp @@ -1,17 +1,17 @@ #define OTHER_LIBS \ - egg:c pandaegg:m \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ + p3egg:c pandaegg:m \ + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c p3express: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] \ - pystub + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] \ + p3pystub #begin bin_target #define TARGET vrml2egg - #define LOCAL_LIBS pvrml vrmlegg eggbase progbase + #define LOCAL_LIBS p3vrml p3vrmlegg p3eggbase p3progbase #define SOURCES \ vrmlToEgg.cxx vrmlToEgg.h @@ -21,7 +21,7 @@ #begin bin_target #define TARGET vrml-trans #define LOCAL_LIBS \ - progbase pvrml + p3progbase p3vrml #define SOURCES \ vrmlTrans.cxx vrmlTrans.h diff --git a/pandatool/src/win-stats/Sources.pp b/pandatool/src/win-stats/Sources.pp index 06d43476e4..2b5dc173a3 100644 --- a/pandatool/src/win-stats/Sources.pp +++ b/pandatool/src/win-stats/Sources.pp @@ -1,14 +1,14 @@ #define BUILD_DIRECTORY $[and $[WINDOWS_PLATFORM],$[HAVE_NET]] -#define USE_PACKAGES net +#define USE_PACKAGES p3net #begin bin_target #define TARGET pstats #define LOCAL_LIBS \ - progbase pstatserver + p3progbase p3pstatserver #define OTHER_LIBS \ - pstatclient:c linmath:c putil:c net:c express:c pandaexpress:m panda:m \ - dtoolutil:c dtoolbase:c prc:c dconfig:c dtoolconfig:m dtool:m \ - pystub + p3pstatclient:c p3linmath:c p3putil:c p3net:c p3express:c pandaexpress:m panda:m \ + p3dtoolutil:c p3dtoolbase:c p3prc:c p3dconfig:c p3dtoolconfig:m p3dtool:m \ + p3pystub #define SOURCES \ winStats.cxx \ diff --git a/pandatool/src/xfile/Sources.pp b/pandatool/src/xfile/Sources.pp index 66c9f897ee..fdade521f6 100644 --- a/pandatool/src/xfile/Sources.pp +++ b/pandatool/src/xfile/Sources.pp @@ -4,13 +4,13 @@ #define USE_PACKAGES zlib #begin ss_lib_target - #define TARGET xfile - #define LOCAL_LIBS pandatoolbase + #define TARGET p3xfile + #define LOCAL_LIBS p3pandatoolbase #define OTHER_LIBS \ - event:c putil:c pipeline:c mathutil:c linmath:c panda:m \ - pandabase:c express:c pandaexpress:m \ - interrogatedb:c prc:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + p3event:c p3putil:c p3pipeline:c p3mathutil:c p3linmath:c panda:m \ + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define USE_PACKAGES zlib diff --git a/pandatool/src/xfile/xfile_composite1.cxx b/pandatool/src/xfile/p3xfile_composite1.cxx similarity index 100% rename from pandatool/src/xfile/xfile_composite1.cxx rename to pandatool/src/xfile/p3xfile_composite1.cxx diff --git a/pandatool/src/xfileegg/Sources.pp b/pandatool/src/xfileegg/Sources.pp index 6417d4b8ba..eac0549716 100644 --- a/pandatool/src/xfileegg/Sources.pp +++ b/pandatool/src/xfileegg/Sources.pp @@ -1,14 +1,14 @@ #begin ss_lib_target - #define TARGET xfileegg - #define LOCAL_LIBS xfile eggbase progbase pandatoolbase + #define TARGET p3xfileegg + #define LOCAL_LIBS p3xfile p3eggbase p3progbase p3pandatoolbase #define OTHER_LIBS \ - egg:c pandaegg:m \ - mathutil:c linmath:c putil:c pipeline:c event:c \ - pnmimage:c \ + p3egg:c pandaegg:m \ + p3mathutil:c p3linmath:c p3putil:c p3pipeline:c p3event:c \ + p3pnmimage:c \ panda:m \ - pandabase:c express:c pandaexpress:m \ - interrogatedb:c prc:c dconfig:c dtoolconfig:m \ - dtoolutil:c dtoolbase:c dtool:m + p3pandabase:c p3express:c pandaexpress:m \ + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/pandatool/src/xfileegg/xfileegg_composite1.cxx b/pandatool/src/xfileegg/p3xfileegg_composite1.cxx similarity index 100% rename from pandatool/src/xfileegg/xfileegg_composite1.cxx rename to pandatool/src/xfileegg/p3xfileegg_composite1.cxx diff --git a/pandatool/src/xfileprogs/Sources.pp b/pandatool/src/xfileprogs/Sources.pp index a3842d09e4..1d2ec0e2ad 100644 --- a/pandatool/src/xfileprogs/Sources.pp +++ b/pandatool/src/xfileprogs/Sources.pp @@ -1,17 +1,17 @@ #define OTHER_LIBS \ - egg:c pandaegg:m \ - pipeline:c event:c pstatclient:c panda:m \ - pandabase:c pnmimage:c mathutil:c linmath:c putil:c express:c \ + p3egg:c pandaegg:m \ + p3pipeline:c p3event:c p3pstatclient:c panda:m \ + p3pandabase:c p3pnmimage:c p3mathutil:c p3linmath:c p3putil:c p3express: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] \ - pystub + p3interrogatedb:c p3prc:c p3dconfig:c p3dtoolconfig:m \ + p3dtoolutil:c p3dtoolbase:c p3dtool:m \ + $[if $[WANT_NATIVE_NET],p3nativenet:c] \ + $[if $[and $[HAVE_NET],$[WANT_NATIVE_NET]],p3net:c p3downloader:c] \ + p3pystub #begin bin_target #define TARGET egg2x - #define LOCAL_LIBS xfileegg xfile eggbase progbase pandatoolbase + #define LOCAL_LIBS p3xfileegg p3xfile p3eggbase p3progbase p3pandatoolbase #define SOURCES \ eggToX.cxx eggToX.h @@ -20,7 +20,7 @@ #begin bin_target #define TARGET x2egg - #define LOCAL_LIBS xfileegg xfile converter eggbase progbase pandatoolbase + #define LOCAL_LIBS p3xfileegg p3xfile p3converter p3eggbase p3progbase p3pandatoolbase #define SOURCES \ xFileToEgg.cxx xFileToEgg.h @@ -30,7 +30,7 @@ #begin bin_target #define TARGET x-trans #define LOCAL_LIBS \ - progbase xfile + p3progbase p3xfile #define SOURCES \ xFileTrans.cxx xFileTrans.h