diff --git a/direct/src/distributed/Sources.pp b/direct/src/distributed/Sources.pp index 8625393b3c..676dfe65d3 100644 --- a/direct/src/distributed/Sources.pp +++ b/direct/src/distributed/Sources.pp @@ -2,7 +2,7 @@ #begin lib_target #define BUILD_TARGET $[HAVE_PYTHON] - #define USE_PACKAGES openssl native_net p3net + #define USE_PACKAGES openssl native_net net #define TARGET p3distributed #define LOCAL_LIBS \ diff --git a/panda/metalibs/panda/Sources.pp b/panda/metalibs/panda/Sources.pp index b56cd0d482..a2bac7138c 100644 --- a/panda/metalibs/panda/Sources.pp +++ b/panda/metalibs/panda/Sources.pp @@ -6,7 +6,7 @@ #define DIR_TYPE metalib #define BUILDING_DLL BUILDING_PANDA -#define USE_PACKAGES p3net +#define USE_PACKAGES net #define COMPONENT_LIBS \ p3recorder p3pgraph p3pgraphnodes p3pipeline \ diff --git a/panda/src/awesomium/Sources.pp b/panda/src/awesomium/Sources.pp index 2a65766df7..9f8c512a29 100644 --- a/panda/src/awesomium/Sources.pp +++ b/panda/src/awesomium/Sources.pp @@ -10,7 +10,7 @@ #define LOCAL_LIBS \ p3pgraph p3physics - #define USE_PACKAGES p3awesomium + #define USE_PACKAGES awesomium #define COMBINED_SOURCES $[TARGET]_composite1.cxx diff --git a/panda/src/bullet/Sources.pp b/panda/src/bullet/Sources.pp index 99c1facfb6..ca915d1073 100644 --- a/panda/src/bullet/Sources.pp +++ b/panda/src/bullet/Sources.pp @@ -6,7 +6,7 @@ #begin lib_target #define TARGET p3bullet #define LOCAL_LIBS p3pgraph p3linmath p3grutil - #define USE_PACKAGES p3bullet + #define USE_PACKAGES bullet #define COMBINED_SOURCES $[TARGET]_composite.cxx #define SOURCES \ diff --git a/panda/src/downloader/Sources.pp b/panda/src/downloader/Sources.pp index 186839f5ec..6b624efc19 100644 --- a/panda/src/downloader/Sources.pp +++ b/panda/src/downloader/Sources.pp @@ -1,7 +1,7 @@ #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 +#define USE_PACKAGES zlib net openssl #begin lib_target #define TARGET p3downloader diff --git a/panda/src/net/Sources.pp b/panda/src/net/Sources.pp index 2f4c1a9c2b..4ae92e355c 100644 --- a/panda/src/net/Sources.pp +++ b/panda/src/net/Sources.pp @@ -2,7 +2,7 @@ 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 p3net +#define USE_PACKAGES net #begin lib_target #define TARGET p3net diff --git a/panda/src/physx/Sources.pp b/panda/src/physx/Sources.pp index a2a91c5530..8245c4fdaa 100644 --- a/panda/src/physx/Sources.pp +++ b/panda/src/physx/Sources.pp @@ -7,7 +7,7 @@ #begin lib_target #define TARGET p3physx #define LOCAL_LIBS p3pgraph p3linmath p3grutil - #define USE_PACKAGES p3physx + #define USE_PACKAGES physx #define COMBINED_SOURCES $[TARGET]_composite.cxx #define SOURCES \ diff --git a/panda/src/speedtree/Sources.pp b/panda/src/speedtree/Sources.pp index db318a3958..9980b4219e 100644 --- a/panda/src/speedtree/Sources.pp +++ b/panda/src/speedtree/Sources.pp @@ -3,7 +3,7 @@ #define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \ p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c -#define USE_PACKAGES p3speedtree $[if $[eq $[SPEEDTREE_API],OpenGL],gl cg cggl] $[if $[eq $[SPEEDTREE_API],DirectX9],dx9 cg cgdx9] +#define USE_PACKAGES speedtree $[if $[eq $[SPEEDTREE_API],OpenGL],gl cg cggl] $[if $[eq $[SPEEDTREE_API],DirectX9],dx9 cg cgdx9] #define BUILDING_DLL BUILDING_PANDASPEEDTREE #begin lib_target diff --git a/pandatool/src/assimp/Sources.pp b/pandatool/src/assimp/Sources.pp index 43a9f28ca0..8cc352d824 100644 --- a/pandatool/src/assimp/Sources.pp +++ b/pandatool/src/assimp/Sources.pp @@ -5,7 +5,7 @@ #define BUILDING_DLL BUILDING_ASSIMP #define LOCAL_LIBS \ p3pandatoolbase - #define USE_PACKAGES p3assimp + #define USE_PACKAGES assimp #define OTHER_LIBS \ p3egg2pg:c p3egg:c pandaegg:m \ diff --git a/pandatool/src/gtk-stats/Sources.pp b/pandatool/src/gtk-stats/Sources.pp index ed9ee03496..fb2d922a8f 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 p3net gtk +#define USE_PACKAGES net gtk #begin bin_target // We suspect gtk will not be built universal on OSX. Don't try. diff --git a/pandatool/src/maya/Sources.pp b/pandatool/src/maya/Sources.pp index 2008f13c98..6ecd3dd2d0 100644 --- a/pandatool/src/maya/Sources.pp +++ b/pandatool/src/maya/Sources.pp @@ -1,7 +1,7 @@ #define BUILD_DIRECTORY $[HAVE_MAYA] #begin ss_lib_target - #define USE_PACKAGES p3maya + #define USE_PACKAGES maya #define TARGET mayabase #define LOCAL_LIBS \ p3converter p3pandatoolbase diff --git a/pandatool/src/mayaegg/Sources.pp b/pandatool/src/mayaegg/Sources.pp index 6080aecfcb..de7a2d142d 100644 --- a/pandatool/src/mayaegg/Sources.pp +++ b/pandatool/src/mayaegg/Sources.pp @@ -1,7 +1,7 @@ #define BUILD_DIRECTORY $[HAVE_MAYA] #begin ss_lib_target - #define USE_PACKAGES p3maya + #define USE_PACKAGES maya #define TARGET p3mayaegg #define LOCAL_LIBS \ mayabase p3converter p3pandatoolbase diff --git a/pandatool/src/mayaprogs/Sources.pp b/pandatool/src/mayaprogs/Sources.pp index 462913de33..c71ae53e0f 100644 --- a/pandatool/src/mayaprogs/Sources.pp +++ b/pandatool/src/mayaprogs/Sources.pp @@ -17,7 +17,7 @@ #end bin_target #begin bin_target - #define USE_PACKAGES p3maya + #define USE_PACKAGES maya #define TARGET maya2egg_bin #define LOCAL_LIBS \ mayabase p3mayaegg p3eggbase p3progbase @@ -38,7 +38,7 @@ #end bin_target #begin bin_target - #define USE_PACKAGES p3maya + #define USE_PACKAGES maya #define TARGET maya2egg_server_bin #define LOCAL_LIBS \ mayabase p3mayaegg p3eggbase p3progbase @@ -59,7 +59,7 @@ #end bin_target #begin bin_target - #define USE_PACKAGES p3maya + #define USE_PACKAGES maya #define TARGET maya2egg_client #define LOCAL_LIBS \ mayabase p3mayaegg p3eggbase p3progbase @@ -88,7 +88,7 @@ #end bin_target #begin bin_target - #define USE_PACKAGES p3maya + #define USE_PACKAGES maya #define TARGET egg2maya_bin #define LOCAL_LIBS \ mayabase p3mayaegg p3eggbase p3progbase @@ -118,7 +118,7 @@ #end bin_target #begin bin_target - #define USE_PACKAGES p3maya + #define USE_PACKAGES maya #define TARGET mayacopy_bin #define LOCAL_LIBS p3cvscopy mayabase p3progbase @@ -141,7 +141,7 @@ #begin lib_target #define BUILD_TARGET $[not $[LINK_ALL_STATIC]] - #define USE_PACKAGES p3maya + #define USE_PACKAGES maya #define TARGET mayapview #define LOCAL_LIBS mayabase p3mayaegg #define OTHER_LIBS \ @@ -168,7 +168,7 @@ #begin lib_target #define BUILD_TARGET $[not $[LINK_ALL_STATIC]] - #define USE_PACKAGES p3maya + #define USE_PACKAGES maya #define TARGET mayasavepview #if $[WINDOWS_PLATFORM] @@ -181,7 +181,7 @@ #begin lib_target #define BUILD_TARGET $[not $[LINK_ALL_STATIC]] - #define USE_PACKAGES p3maya + #define USE_PACKAGES maya #define TARGET mayaEggImport #define LOCAL_LIBS mayabase p3mayaegg #define OTHER_LIBS \ @@ -204,7 +204,7 @@ #end lib_target #begin lib_target - #define USE_PACKAGES p3maya + #define USE_PACKAGES maya #define TARGET mayaloader #define BUILDING_DLL BUILDING_MISC #define LOCAL_LIBS \ @@ -226,7 +226,7 @@ #end lib_target #begin test_bin_target - #define USE_PACKAGES p3maya + #define USE_PACKAGES maya #define TARGET normal_test #define SOURCES \ diff --git a/pandatool/src/win-stats/Sources.pp b/pandatool/src/win-stats/Sources.pp index 2b5dc173a3..51c6b47d5c 100644 --- a/pandatool/src/win-stats/Sources.pp +++ b/pandatool/src/win-stats/Sources.pp @@ -1,5 +1,5 @@ #define BUILD_DIRECTORY $[and $[WINDOWS_PLATFORM],$[HAVE_NET]] -#define USE_PACKAGES p3net +#define USE_PACKAGES net #begin bin_target #define TARGET pstats