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

Fix compile errors and warnings with mayapath.cxx

Browse Source
This commit is contained in:
rdb 2015-04-01 00:22:03 +02:00
parent 426fdf0842
commit b7840fed06
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
makepanda/makepanda.py
View File

@ -5973,19 +5973,19 @@ for VER in MAYAVERSIONS:
TargetAdd('mayapath'+VNUM+'.obj', opts=OPTS, input='mayapath.cxx') TargetAdd('mayapath'+VNUM+'.obj', opts=OPTS, input='mayapath.cxx')
TargetAdd('maya2egg'+VNUM+'.exe', input='mayapath'+VNUM+'.obj') TargetAdd('maya2egg'+VNUM+'.exe', input='mayapath'+VNUM+'.obj')
TargetAdd('maya2egg'+VNUM+'.exe', opts=['ADVAPI'])
TargetAdd('maya2egg'+VNUM+'.exe', input=COMMON_DTOOL_LIBS)
TargetAdd('maya2egg'+VNUM+'.exe', input='libpandaexpress.dll') TargetAdd('maya2egg'+VNUM+'.exe', input='libpandaexpress.dll')
TargetAdd('maya2egg'+VNUM+'.exe', input=COMMON_DTOOL_LIBS)
TargetAdd('maya2egg'+VNUM+'.exe', opts=['ADVAPI']+VER_OPTS)
TargetAdd('egg2maya'+VNUM+'.exe', input='mayapath'+VNUM+'.obj') TargetAdd('egg2maya'+VNUM+'.exe', input='mayapath'+VNUM+'.obj')
TargetAdd('egg2maya'+VNUM+'.exe', opts=['ADVAPI'])
TargetAdd('egg2maya'+VNUM+'.exe', input=COMMON_DTOOL_LIBS)
TargetAdd('egg2maya'+VNUM+'.exe', input='libpandaexpress.dll') TargetAdd('egg2maya'+VNUM+'.exe', input='libpandaexpress.dll')
TargetAdd('egg2maya'+VNUM+'.exe', input=COMMON_DTOOL_LIBS)
TargetAdd('egg2maya'+VNUM+'.exe', opts=['ADVAPI']+VER_OPTS)
TargetAdd('mayacopy'+VNUM+'.exe', input='mayapath'+VNUM+'.obj') TargetAdd('mayacopy'+VNUM+'.exe', input='mayapath'+VNUM+'.obj')
TargetAdd('mayacopy'+VNUM+'.exe', opts=['ADVAPI'])
TargetAdd('mayacopy'+VNUM+'.exe', input=COMMON_DTOOL_LIBS)
TargetAdd('mayacopy'+VNUM+'.exe', input='libpandaexpress.dll') TargetAdd('mayacopy'+VNUM+'.exe', input='libpandaexpress.dll')
TargetAdd('mayacopy'+VNUM+'.exe', input=COMMON_DTOOL_LIBS)
TargetAdd('mayacopy'+VNUM+'.exe', opts=['ADVAPI']+VER_OPTS)
# #
# DIRECTORY: contrib/src/ai/ # DIRECTORY: contrib/src/ai/

18
pandatool/src/mayaprogs/mayapath.cxx
View File

@ -78,7 +78,11 @@ find_pyzip(const Filename &maya_location) {
return Filename(); return Filename();
} }
struct { char *ver, *key; } maya_versions[] = { struct MayaVerInfo {
const char *ver, *key;
};
struct MayaVerInfo maya_versions[] = {
{ "MAYA6", "6.0" }, { "MAYA6", "6.0" },
{ "MAYA65", "6.5" }, { "MAYA65", "6.5" },
{ "MAYA7", "7.0" }, { "MAYA7", "7.0" },
@ -96,9 +100,9 @@ struct { char *ver, *key; } maya_versions[] = {
{ 0, 0 }, { 0, 0 },
}; };
static char * static const char *
get_version_number(const char *ver) { get_version_number(const char *ver) {
for (int i=0; maya_versions[i].ver != 0; i++) { for (int i = 0; maya_versions[i].ver != 0; ++i) {
if (strcmp(maya_versions[i].ver, ver) == 0) { if (strcmp(maya_versions[i].ver, ver) == 0) {
return maya_versions[i].key; return maya_versions[i].key;
} }
@ -376,7 +380,7 @@ main(int argc, char *argv[]) {
// Also put the Maya bin directory on the PATH. // Also put the Maya bin directory on the PATH.
Filename bin = Filename(maya_location, "bin"); Filename bin = Filename(maya_location, "bin");
if (bin.is_directory()) { if (bin.is_directory()) {
char *path = getenv("PATH"); const char *path = getenv("PATH");
if (path == NULL) { if (path == NULL) {
path = ""; path = "";
} }
@ -388,7 +392,7 @@ main(int argc, char *argv[]) {
#ifdef IS_OSX #ifdef IS_OSX
// And on DYLD_LIBRARY_PATH. // And on DYLD_LIBRARY_PATH.
if (bin.is_directory()) { if (bin.is_directory()) {
char *path = getenv("DYLD_LIBRARY_PATH"); const char *path = getenv("DYLD_LIBRARY_PATH");
if (path == NULL) { if (path == NULL) {
path = ""; path = "";
} }
@ -401,7 +405,7 @@ main(int argc, char *argv[]) {
#elif !defined(_WIN32) #elif !defined(_WIN32)
// Linux (or other non-Windows OS) gets it added to LD_LIBRARY_PATH. // Linux (or other non-Windows OS) gets it added to LD_LIBRARY_PATH.
if (bin.is_directory()) { if (bin.is_directory()) {
char *path = getenv("LD_LIBRARY_PATH"); const char *path = getenv("LD_LIBRARY_PATH");
if (path == NULL) { if (path == NULL) {
path = ""; path = "";
} }
@ -416,7 +420,7 @@ main(int argc, char *argv[]) {
// When this is set, Panda3D will try not to use any functions from the // When this is set, Panda3D will try not to use any functions from the
// CPython API. This is necessary because Maya links with its own copy // CPython API. This is necessary because Maya links with its own copy
// of Python, which may be incompatible with ours. // of Python, which may be incompatible with ours.
putenv("PANDA_INCOMPATIBLE_PYTHON=1"); putenv((char *)"PANDA_INCOMPATIBLE_PYTHON=1");
// Now that we have set up the environment variables properly, chain // Now that we have set up the environment variables properly, chain
// to the actual maya2egg_bin (or whichever) executable. // to the actual maya2egg_bin (or whichever) executable.