瀏覽代碼

fix OpenMaya location on Linux

rdb 13 年之前
父節點
當前提交
d67aad1e2a
共有 1 個文件被更改,包括 6 次插入3 次删除
  1. 6 3
      pandatool/src/mayaprogs/mayapath.cxx

+ 6 - 3
pandatool/src/mayaprogs/mayapath.cxx

@@ -51,11 +51,14 @@
 #define QUOTESTR(x) #x
 #define QUOTESTR(x) #x
 #define TOSTRING(x) QUOTESTR(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";
 static const Filename openmaya_filename = "MacOS/libOpenMaya.dylib";
 #else
 #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.
 // Searches for python26.zip or whatever version it is.
 static Filename
 static Filename