TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better merge of previous 2 versions' code

Browse Source
This commit is contained in:
Mike Christel 2009-09-08 12:06:49 +00:00
parent bb1bd24b06
commit 3b1c9d2a6b
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandatool/src/mayaprogs/mayaWrapper.cxx
View File

@ -40,6 +40,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <signal.h> #include <signal.h>
#include <limits.h>
#define PATH_MAX 1024 #define PATH_MAX 1024
#ifdef __APPLE__ #ifdef __APPLE__
@ -143,12 +144,20 @@ void getWrapperName(char *prog)
void getMayaLocation(char *ver, char *loc) void getMayaLocation(char *ver, char *loc)
{ {
char mpath[64]; char mpath[64];
#if __WORDSIZE == 64
sprintf(mpath, "/usr/autodesk/maya%s-x64", ver);
#else
sprintf(mpath, "/usr/autodesk/maya%s", ver); sprintf(mpath, "/usr/autodesk/maya%s", ver);
#endif
struct stat st; struct stat st;
if(stat(mpath, &st) == 0) { if(stat(mpath, &st) == 0) {
strcpy(loc, mpath); strcpy(loc, mpath);
} else { } else {
#if __WORDSIZE == 64
sprintf(mpath, "/usr/aw/maya%s-x64", ver);
#else
sprintf(mpath, "/usr/aw/maya%s", ver); sprintf(mpath, "/usr/aw/maya%s", ver);
#endif
if(stat(mpath, &st) == 0) { if(stat(mpath, &st) == 0) {
strcpy(loc, mpath); strcpy(loc, mpath);
} else { } else {
@ -289,6 +298,9 @@ int main(int argc, char **argv)
if (path == 0) path = ""; if (path == 0) path = "";
env1 = (char*)malloc(100 + strlen(loc) + strlen(path)); env1 = (char*)malloc(100 + strlen(loc) + strlen(path));
sprintf(env1, "DYLD_LIBRARY_PATH=%s/MacOS:%s", loc, path); sprintf(env1, "DYLD_LIBRARY_PATH=%s/MacOS:%s", loc, path);
env3 = (char*)malloc(100 + strlen(loc));
sprintf(env3, "PYTHONHOME=%s/Frameworks/Python.framework/Versions/Current", loc);
_putenv(env3);
#else #else
path = getenv("LD_LIBRARY_PATH"); path = getenv("LD_LIBRARY_PATH");
if (path == 0) path = ""; if (path == 0) path = "";
@ -297,12 +309,9 @@ int main(int argc, char **argv)
#endif // __APPLE__ #endif // __APPLE__
env2 = (char*)malloc(100 + strlen(loc)); env2 = (char*)malloc(100 + strlen(loc));
sprintf(env2, "MAYA_LOCATION=%s", loc); sprintf(env2, "MAYA_LOCATION=%s", loc);
env3 = (char*)malloc(100 + strlen(loc));
sprintf(env3, "PYTHONHOME=%s/Frameworks/Python.framework/Versions/Current", loc);
_putenv(env1); _putenv(env1);
_putenv(env2); _putenv(env2);
_putenv(env3);
#endif // _WIN32 #endif // _WIN32
#ifdef _WIN32 #ifdef _WIN32