From c80e8bd572c95cbbe925ebc62f0569173784c7ca Mon Sep 17 00:00:00 2001 From: Josh Yelon Date: Thu, 4 Aug 2005 02:37:32 +0000 Subject: [PATCH] Added packpanda mode --- direct/src/directbase/ppython.cxx | 35 ++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/direct/src/directbase/ppython.cxx b/direct/src/directbase/ppython.cxx index df72205ada..5c20d92608 100755 --- a/direct/src/directbase/ppython.cxx +++ b/direct/src/directbase/ppython.cxx @@ -25,7 +25,7 @@ #ifdef BUILDING_PPYTHON #define LINK_SOURCE "\\bin\\ppython.exe" #define LINK_TARGET "\\python\\python.exe" -#define GENPYCODE 0 +#define PPYTHON 1 #endif #ifdef BUILDING_GENPYCODE @@ -34,6 +34,12 @@ #define GENPYCODE 1 #endif +#ifdef BUILDING_PACKPANDA +#define LINK_SOURCE "\\bin\\packpanda.exe" +#define LINK_TARGET "\\python\\python.exe" +#define PACKPANDA 1 +#endif + #include #include #include @@ -103,9 +109,15 @@ int main(int argc, char **argv) // Calculate MODCMD - if (GENPYCODE) { - sprintf(modcmd,"python -c \"import direct.ffi.jGenPyCode\" %s",args); - } else sprintf(modcmd,"python %s",args); +#ifdef PPYTHON + sprintf(modcmd,"python %s",args); +#endif +#ifdef GENPYCODE + sprintf(modcmd,"python -c \"import direct.ffi.jGenPyCode\" %s",args); +#endif +#ifdef PACKPANDA + sprintf(modcmd,"python -c \"import direct.directscripts.packpanda\" %s",args); +#endif // Run it. @@ -132,7 +144,7 @@ int main(int argc, char **argv) #ifdef BUILDING_PPYTHON #define LINK_SOURCE "/bin/ppython" -#define GENPYCODE 0 +#define PPYTHON 1 #endif #ifdef BUILDING_GENPYCODE @@ -140,6 +152,11 @@ int main(int argc, char **argv) #define GENPYCODE 1 #endif +#ifdef BUILDING_PACKPANDA +#define LINK_SOURCE "/bin/packpanda" +#define PACKPANDA 1 +#endif + #include #include #include @@ -196,10 +213,14 @@ int main(int argc, char **argv) modargc=0; modargv[modargc++]="python"; - if (GENPYCODE) { +#ifdef GENPYCODE modargv[modargc++] = "-c"; modargv[modargc++] = "import direct.ffi.jGenPyCode"; - } +#endif +#ifdef PACKPANDA + modargv[modargc++] = "-c"; + modargv[modargc++] = "import direct.ffi.packpanda"; +#endif for (int i=1; i