Merge branch 'progguide-updates' into progguide-richard

python/lammps.py

@@ -203,6 +203,8 @@ class lammps(object):
     # determine module file location
 
     modpath = dirname(abspath(getsourcefile(lambda:0)))
+    # for windows installers the shared library is in a different folder
+    winpath = abspath(os.path.join(modpath,'..','bin'))
     self.lib = None
     self.lmp = None
 
@@ -231,6 +233,10 @@ class lammps(object):
     elif any([f.startswith('liblammps') and f.endswith('.dll')
               for f in os.listdir(modpath)]):
       lib_ext = ".dll"
+    elif os.path.exists(winpath) and any([f.startswith('liblammps') and f.endswith('.dll')
+                  for f in os.listdir(winpath)]):
+      lib_ext = ".dll"
+      modpath = winpath
     else:
       lib_ext = ".so"