Merge pull request #167 from Cyclical-/windows-dll

Fix loading of DLLs on windows by adding a call to find_library()
colinoflynn · Oct 9, 2020 · e47bf20 · e47bf20
2 parents 0a52124 + 3bd6701
commit e47bf20
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 9 deletions.
diff --git a/picoscope/ps2000.py b/picoscope/ps2000.py
@@ -142,7 +142,10 @@ def __init__(self, serialNumber=None, connect=True):
             self.lib = LoadLibraryDarwin("lib" + self.LIBNAME + ".dylib")
         else:
             from ctypes import windll
-            self.lib = windll.LoadLibrary(str(self.LIBNAME + ".dll"))
+            from ctypes.util import find_library
+            self.lib = windll.LoadLibrary(
+                find_library(str(self.LIBNAME + ".dll"))
+            )
 
         super(PS2000, self).__init__(serialNumber, connect)
 

diff --git a/picoscope/ps2000a.py b/picoscope/ps2000a.py
@@ -134,7 +134,10 @@ def __init__(self, serialNumber=None, connect=True):
             self.lib = self.loadLibraryDarwin("lib" + self.LIBNAME + ".dylib")
         else:
             from ctypes import windll
-            self.lib = windll.LoadLibrary(str(self.LIBNAME + ".dll"))
+            from ctypes.util import find_library
+            self.lib = windll.LoadLibrary(
+                find_library(str(self.LIBNAME + ".dll"))
+            )
 
         self.resolution = self.ADC_RESOLUTIONS["8"]
 

diff --git a/picoscope/ps3000.py b/picoscope/ps3000.py
@@ -129,7 +129,10 @@ def __init__(self, serialNumber=None, connect=True):
             self.lib = LoadLibraryDarwin("lib" + self.LIBNAME + ".dylib")
         else:
             from ctypes import windll
-            self.lib = windll.LoadLibrary(str(self.LIBNAME + ".dll"))
+            from ctypes.util import find_library
+            self.lib = windll.LoadLibrary(
+                find_library(str(self.LIBNAME + ".dll"))
+            )
 
         super(PS3000, self).__init__(serialNumber, connect)
 

diff --git a/picoscope/ps3000a.py b/picoscope/ps3000a.py
@@ -142,7 +142,10 @@ def __init__(self, serialNumber=None, connect=True):
             self.lib = LoadLibraryDarwin("lib" + self.LIBNAME + ".dylib")
         else:
             from ctypes import windll
-            self.lib = windll.LoadLibrary(str(self.LIBNAME + ".dll"))
+            from ctypes.util import find_library
+            self.lib = windll.LoadLibrary(
+                find_library(str(self.LIBNAME + ".dll"))
+            )
 
         self.resolution = self.ADC_RESOLUTIONS["8"]
 

diff --git a/picoscope/ps4000.py b/picoscope/ps4000.py
@@ -139,7 +139,10 @@ def __init__(self, serialNumber=None, connect=True):
             self.lib = LoadLibraryDarwin("lib" + self.LIBNAME + ".dylib")
         else:
             from ctypes import windll
-            self.lib = windll.LoadLibrary(str(self.LIBNAME + ".dll"))
+            from ctypes.util import find_library
+            self.lib = windll.LoadLibrary(
+                find_library(str(self.LIBNAME + ".dll"))
+            )
 
         super(PS4000, self).__init__(serialNumber, connect)
         # check to see which model we have and use special functions if needed

diff --git a/picoscope/ps4000a.py b/picoscope/ps4000a.py
@@ -131,7 +131,10 @@ def __init__(self, serialNumber=None, connect=True):
             self.lib = LoadLibraryDarwin("lib" + self.LIBNAME + ".dylib")
         else:
             from ctypes import windll
-            self.lib = windll.LoadLibrary(str(self.LIBNAME + ".dll"))
+            from ctypes.util import find_library
+            self.lib = windll.LoadLibrary(
+                find_library(str(self.LIBNAME + ".dll"))
+            )
 
         self.resolution = self.ADC_RESOLUTIONS["12"]
 

diff --git a/picoscope/ps5000.py b/picoscope/ps5000.py
@@ -146,7 +146,10 @@ def __init__(self, serialNumber=None, connect=True):
             self.lib = LoadLibraryDarwin("lib" + self.LIBNAME + ".dylib")
         else:
             from ctypes import windll
-            self.lib = windll.LoadLibrary(str(self.LIBNAME + ".dll"))
+            from ctypes.util import find_library
+            self.lib = windll.LoadLibrary(
+                find_library(str(self.LIBNAME + ".dll"))
+            )
 
         super(PS5000, self).__init__(serialNumber, connect)
 

diff --git a/picoscope/ps5000a.py b/picoscope/ps5000a.py
@@ -134,7 +134,10 @@ def __init__(self, serialNumber=None, connect=True):
             self.lib = LoadLibraryDarwin("lib" + self.LIBNAME + ".dylib")
         else:
             from ctypes import windll
-            self.lib = windll.LoadLibrary(str(self.LIBNAME + ".dll"))
+            from ctypes.util import find_library
+            self.lib = windll.LoadLibrary(
+                find_library(str(self.LIBNAME + ".dll"))
+            )
 
         self.resolution = self.ADC_RESOLUTIONS["8"]
 

diff --git a/picoscope/ps6000.py b/picoscope/ps6000.py
@@ -147,7 +147,10 @@ def __init__(self, serialNumber=None, connect=True):
             self.lib = LoadLibraryDarwin("lib" + self.LIBNAME + ".dylib")
         else:
             from ctypes import windll
-            self.lib = windll.LoadLibrary(str(self.LIBNAME + ".dll"))
+            from ctypes.util import find_library
+            self.lib = windll.LoadLibrary(
+                find_library(str(self.LIBNAME + ".dll"))
+            )
 
         super(PS6000, self).__init__(serialNumber, connect)