V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Showing only changes of commit a0da175d45 - Show all commits

View File

@ -439,7 +439,7 @@ def loadOpenSSL():
path.join(environ['RESOURCEPATH'], '..', 'Frameworks','libcrypto.dylib'),
path.join(environ['RESOURCEPATH'], '..', 'Frameworks','libcrypto.1.0.0.dylib')
])
elif 'win32' in sys.platform or win64:
elif 'win32' in sys.platform or 'win64' in sys.platform:
lib.append(path.join(sys._MEIPASS, 'libeay32.dll'))
else:
libdir.extend([