Browse Source

1.9: change to support .whl distribution (putting panda DLLs in panda3d/ dir)

rdb 9 years ago
parent
commit
4a8f1839ea
1 changed files with 11 additions and 2 deletions
  1. 11 2
      direct/src/extensions_native/extension_native_helpers.py

+ 11 - 2
direct/src/extensions_native/extension_native_helpers.py

@@ -50,9 +50,18 @@ if sys.platform == "win32":
     filename = "libpandaexpress%s%s" % (dll_suffix, dll_ext)
     for dir in sys.path + [sys.prefix]:
         lib = os.path.join(dir, filename)
-        if (os.path.exists(lib)):
+        if os.path.exists(lib):
             target = dir
-    if target == None:
+
+    # Perhaps it is in the same directory as panda3d/core.pyd ?
+    if target is None:
+        for dir in sys.path:
+            lib = os.path.join(dir, 'panda3d', filename)
+            if os.path.exists(lib):
+                target = os.path.join(dir, 'panda3d')
+                break
+
+    if target is None:
         message = "Cannot find %s" % (filename)
         raise ImportError(message)