From ff89107e846bfc92ba8fb25f4fd9306727aee901 Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 22 Nov 2008 08:52:44 +0000 Subject: [PATCH] Maya changes for linux --- pandatool/src/mayaprogs/mayaToEgg.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pandatool/src/mayaprogs/mayaToEgg.cxx b/pandatool/src/mayaprogs/mayaToEgg.cxx index eee73fb5c9..e2444fdf8f 100644 --- a/pandatool/src/mayaprogs/mayaToEgg.cxx +++ b/pandatool/src/mayaprogs/mayaToEgg.cxx @@ -17,7 +17,9 @@ #include "config_mayaegg.h" #include "config_maya.h" // for maya_cat #include "globPattern.h" -#include "pystub.h" +#ifdef _WIN32 + #include "pystub.h" +#endif //////////////////////////////////////////////////////////////////// // Function: MayaToEgg::Constructor @@ -282,11 +284,15 @@ dispatch_transform_type(const string &opt, const string &arg, void *var) { } int main(int argc, char *argv[]) { + // We don't want pystub on linux, since it gives problems with Maya's python. +#ifdef _WIN32 // A call to pystub() to force libpystub.so to be linked in. pystub(); +#endif MayaToEgg prog; prog.parse_command_line(argc, argv); prog.run(); return 0; } +