Build with OpenSSL libraries included in appveyor

appveyor.yml

@@ -138,7 +138,9 @@ clone_script:
 
 build_script:
   # Build the compiled extension
-  - "%CMD_IN_ENV% python setup.py build --enable-cuckoo --library-dir=../jansson-%JANSSON_VERSION%/build/lib/Release --include-dir=../jansson-%JANSSON_VERSION%/build/include"
+  - "%CMD_IN_ENV% python setup.py build --enable-cuckoo
+    --library-directories=\"../jansson-%JANSSON_VERSION%/build/lib/Release;c:/OpenSSL-Win%PYTHON_ARCH%/lib\"
+    --include-directories=\"../jansson-%JANSSON_VERSION%/build/include;c:/OpenSSL-Win%PYTHON_ARCH%/include\""
 
 test_script:
   # Run the project tests

setup.py

@@ -36,8 +36,8 @@ OPTIONS = [
    ('enable-cuckoo', None, 'enable "cuckoo" module'),
    ('enable-magic', None, 'enable "magic" module'),
    ('enable-profiling', None, 'enable profiling features'),
-   ('library-dir=', None, 'library directory'),
-   ('include-dir=', None, 'include directory')]
+   ('library-directories=', None, 'additional library directories separated by semicolons'),
+   ('include-directories=', None, 'additional include directories separated by semicolons')]
 
 
 BOOLEAN_OPTIONS = [
@@ -96,8 +96,8 @@ class BuildCommand(build):
     self.enable_magic = None
     self.enable_cuckoo = None
     self.enable_profiling = None
-    self.library_dir = None
-    self.include_dir = None
+    self.library_directories = None
+    self.include_directories = None
 
   def finalize_options(self):
 
@@ -117,8 +117,8 @@ class BuildExtCommand(build_ext):
     self.enable_magic = None
     self.enable_cuckoo = None
     self.enable_profiling = None
-    self.library_dir = None
-    self.include_dir = None
+    self.library_directories = None
+    self.include_directories = None
 
   def finalize_options(self):
 
@@ -132,8 +132,8 @@ class BuildExtCommand(build_ext):
         ('enable_magic', 'enable_magic'),
         ('enable_cuckoo', 'enable_cuckoo'),
         ('enable_profiling', 'enable_profiling'),
-        ('library_dir', 'library_dir'),
-        ('include_dir', 'include_dir'))
+        ('library_directories', 'library_directories'),
+        ('include_directories', 'include_directories'))
 
     if self.enable_magic and self.dynamic_linking:
       raise distutils.errors.DistutilsOptionError(
@@ -153,11 +153,11 @@ class BuildExtCommand(build_ext):
 
     exclusions = []
 
-    if self.library_dir:
-      module.library_dirs.append(self.library_dir)
+    if self.library_directories:
+      module.library_dirs.extend(self.library_directories.split(';'))
 
-    if self.include_dir:
-      module.include_dirs.append(self.include_dir)
+    if self.include_directories:
+      module.include_dirs.extend(self.include_directories.split(';'))
 
     if self.plat_name in ('win32','win-amd64'):
       building_for_windows = True