Fix build for conda feedstock

README.rst

@@ -90,6 +90,11 @@ PyPy as well.
 
 Changelog
 =========
+0.8.11
+------
+
+* fix build for conda feedstock
+
 0.8.10
 ------
 

scrypt/scrypt.py

@@ -10,7 +10,7 @@
                     c_size_t, c_double, c_int, c_uint64, c_uint32,
                     create_string_buffer)
 
-__version__ = '0.8.10'
+__version__ = '0.8.11'
 
 _scrypt = cdll.LoadLibrary(imp.find_module('_scrypt')[1])
 

setup.py

@@ -34,19 +34,25 @@
     if struct.calcsize('P') == 8:
         if os.path.isdir('c:\OpenSSL-v111-Win64') and sys.version_info[0] > 3 and sys.version_info[1] > 4:
             openssl_dir = 'c:\OpenSSL-v111-Win64'
+        elif os.path.isdir('c:\Program Files\OpenSSL'):
+            openssl_dir = 'c:\Program Files\OpenSSL'
         else:
             openssl_dir = 'c:\OpenSSL-Win64'
         library_dirs = [openssl_dir + '\lib']
         includes = [openssl_dir + '\include', 'scrypt-windows-stubs/include']
     else:
         if os.path.isdir('c:\OpenSSL-v111-Win32'):
             openssl_dir = 'c:\OpenSSL-v111-Win32'
+        elif os.path.isdir('c:\Program Files\OpenSSL'):
+            openssl_dir = 'c:\Program Files\OpenSSL'
         else:
             openssl_dir = 'c:\OpenSSL-Win32'
         library_dirs = [openssl_dir + '\lib']
         includes = [openssl_dir + '\include', 'scrypt-windows-stubs/include']
-    if os.path.isfile(library_dirs[0] + '\libcrypto.lib'):
+    if os.path.isfile(library_dirs[0] + '\libcrypto_static.lib'):
         libraries = ['libcrypto_static', 'advapi32', 'user32', 'gdi32']
+    elif os.path.isfile(library_dirs[0] + '\libcrypto.lib'):
+        libraries = ['libcrypto', 'advapi32', 'user32', 'gdi32']	
     else:
         libraries = ['libeay32', 'advapi32']
 
@@ -98,7 +104,7 @@
     libraries=libraries)
 
 setup(name='scrypt',
-      version='0.8.10',
+      version='0.8.11',
       description='Bindings for the scrypt key derivation function library',
       author='Magnus Hallin',
       author_email='[email protected]',