From d67aad1e2a9fed62314fa56ca8aa0010370ffe35 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 28 Aug 2012 14:07:58 +0000 Subject: [PATCH] fix OpenMaya location on Linux --- pandatool/src/mayaprogs/mayapath.cxx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pandatool/src/mayaprogs/mayapath.cxx b/pandatool/src/mayaprogs/mayapath.cxx index 87a1234ef2..4848c97509 100755 --- a/pandatool/src/mayaprogs/mayapath.cxx +++ b/pandatool/src/mayaprogs/mayapath.cxx @@ -51,11 +51,14 @@ #define QUOTESTR(x) #x #define TOSTRING(x) QUOTESTR(x) -#ifdef IS_OSX +#if defined(_WIN32) +// Filename::dso_filename changes .so to .dll automatically. +static const Filename openmaya_filename = "bin/OpenMaya.so"; +#elif defined(IS_OSX) static const Filename openmaya_filename = "MacOS/libOpenMaya.dylib"; #else -static const Filename openmaya_filename = "bin/OpenMaya.so"; -#endif // IS_OSX +static const Filename openmaya_filename = "lib/libOpenMaya.so"; +#endif // _WIN32 // Searches for python26.zip or whatever version it is. static Filename