rename all Panda-built libraries to begin with libp3 or libpanda

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 \

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 \

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

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
 

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
 

direct/src/dcparser/dcparser_composite.cxx

@@ -1,2 +0,0 @@
-#include "dcparser_composite1.cxx"
-#include "dcparser_composite2.cxx"

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
 

direct/src/deadrec/deadrec_composite.cxx

@@ -1 +0,0 @@
-#include "deadrec_composite1.cxx"

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 \

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

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

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 \

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

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  
 

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 \

direct/src/interval/interval_composite.cxx

@@ -1 +0,0 @@
-#include "interval_composite1.cxx"

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 \

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 = """

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 \

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 \

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

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__ = '<frozen>'
             if isPackage:

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

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
 

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

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 \

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

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

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

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

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]

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  
   

dtool/src/cppparser/cppParser_composite.cxx

@@ -1,2 +0,0 @@
-#include "cppParser_composite1.cxx"
-#include "cppParser_composite2.cxx"

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

dtool/src/dconfig/dconfig_composite.cxx

@@ -1 +0,0 @@
-#include "dconfig_composite1.cxx"

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
   

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

dtool/src/dtoolutil/dtoolutil_composite.cxx

@@ -1,2 +0,0 @@
-#include "dtoolutil_composite1.cxx"
-#include "dtoolutil_composite2.cxx"

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

dtool/src/interrogate/interrogate_composite.cxx

@@ -1,2 +0,0 @@
-#include "interrogate_composite1.cxx"
-#include "interrogate_composite2.cxx"

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
   

dtool/src/interrogatedb/interrogatedb_composite.cxx

@@ -1,2 +0,0 @@
-#include "interrogatedb_composite1.cxx"
-#include "interrogatedb_composite2.cxx"

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

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
   

dtool/src/prc/prc_composite.cxx

@@ -1,2 +0,0 @@
-#include "prc_composite1.cxx"
-#include "prc_composite2.cxx"

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]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

panda/src/audio/audio_composite.cxx

@@ -1 +0,0 @@
-#include "audio_composite1.cxx"

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], \

panda/src/audiotraits/fmod_audio_composite.cxx

@@ -1 +0,0 @@
-#include "fmod_audio_composite1.cxx"

panda/src/audiotraits/miles_audio_composite.cxx

@@ -1 +0,0 @@
-#include "miles_audio_composite1.cxx"

panda/src/audiotraits/openal_audio_composite.cxx

@@ -1 +0,0 @@
-#include "openal_audio_composite1.cxx"

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 
 

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 \
 

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
 

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    
 

panda/src/chan/chan_composite.cxx

@@ -1,2 +0,0 @@
-#include "chan_composite1.cxx"
-#include "chan_composite2.cxx"

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    
 

panda/src/char/char_composite.cxx

@@ -1,2 +0,0 @@
-#include "char_composite1.cxx"
-#include "char_composite2.cxx"