Merge pull request #189 from abakum/patch-1

Add Windows libraries to magic.py

1 files changed, 4 insertions, 2 deletions

diff --git a/magic.py b/magic.py
index bd9d6b4..07f7096 100644
--- a/magic.py
+++ b/magic.py
@@ -160,14 +160,16 @@ libmagic = None
 # Let's try to find magic or magic1
 dll = ctypes.util.find_library('magic') \
     or ctypes.util.find_library('magic1') \
-    or ctypes.util.find_library('cygmagic-1')
+    or ctypes.util.find_library('cygmagic-1') \
+    or ctypes.util.find_library('libmagic-1') \
+    or ctypes.util.find_library('msys-magic-1') #for MSYS2
 
 # necessary because find_library returns None if it doesn't find the library
 if dll:
     libmagic = ctypes.CDLL(dll)
 
 if not libmagic or not libmagic._name:
-    windows_dlls = ['magic1.dll', 'cygmagic-1.dll']
+    windows_dlls = ['magic1.dll', 'cygmagic-1.dll', 'libmagic-1.dll', 'msys-magic-1.dll']
     platform_to_lib = {'darwin': ['/opt/local/lib/libmagic.dylib',
                                   '/usr/local/lib/libmagic.dylib'] +
                        # Assumes there will only be one version installed