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 b7e24fab4a - Show all commits

View File

@ -87,7 +87,7 @@ def check_openssl():
paths = ['libeay32.dll'] paths = ['libeay32.dll']
if getattr(sys, 'frozen', False): if getattr(sys, 'frozen', False):
import os.path import os.path
paths.append(os.path.join(sys._MEIPASS, 'libeay32.dll')) paths.insert(0, os.path.join(sys._MEIPASS, 'libeay32.dll'))
else: else:
paths = ['libcrypto.so'] paths = ['libcrypto.so']
if sys.platform == 'darwin': if sys.platform == 'darwin':