python vs modules

packages/python/swig/setup.py.in

@@ -6,7 +6,7 @@
 from __future__ import print_function
 
 from setuptools import setup
-from  setuptools.extension import Extension
+from setuptools.extension import Extension
 from codecs import open
 from os import path, makedirs, walk
 from shutil import copytree, rmtree, copy2, move
@@ -54,31 +54,38 @@ pkg_root = pjoin(here, name)
 my_extra_link_args = []
 if platform.system() == 'Darwin':
     my_extra_link_args = ['-Wl,-rpath', '-Wl,${_ABS_PYTHON_MODULE_PATH}']
+    win_libs = []
+    local_libs = ['YAP++','Py4YAP']
 # or dll in glob('yap/dlls/*'):
 #    move(  dll ,'lib' )
 elif platform.system() == 'Windows':
+    local_libs = []
+    win_libs = ['wsock32','ws2_32']
     my_extra_link_args = ['-Wl,-export-all-symbols']
 
 cplus = ['']
-bpy2yap = \
+bpy2yap = []
 native_sources = ['yap.i']
 here = path.abspath(path.dirname(__file__))
 
 # Get the long description from the README file
 
+
+
 extensions = [Extension('_yap', native_sources,
                         define_macros=[('MAJOR_VERSION', '1'),
                                        ('MINOR_VERSION', '0'),
                                        ('_YAP_NOT_INSTALLED_', '1'),
+                                       ('YAP_PYTHON', '1'),
                                        ('_GNU_SOURCE', '1')],
                         runtime_library_dirs=['yap4py', '${libdir}', '${bindir}'],
                         swig_opts=['-modern', '-c++', '-py3',
                                    '-DX_API', '-I${CMAKE_SOURCE_DIR}/CXX', '-I${CMAKE_SOURCE_DIR}/include',
                                    '-I${CMAKE_SOURCE_DIR}/H', '-I${CMAKE_SOURCE_DIR}/H/generated',
                                    '-I${CMAKE_SOURCE_DIR}/os', '-I${CMAKE_SOURCE_DIR}/OPTYap', '-I../../..'],
-                        library_dirs=['../../..', '../../../CXX', '../../packages/python', "${dlls}", "${bindir}", '.'],
+                        library_dirs=['../../..', '../../../CXX', '..', "${dlls}", "${bindir}", '.'],
                         extra_link_args=my_extra_link_args,
-                        libraries=['Yap','${PYTHON_LIBRARIES}','${GMP_LIBRARIES}','wsock32','ws2_32'],
+                        libraries=['Yap','${PYTHON_LIBRARIES}','${GMP_LIBRARIES}']+win_libs+local_libs,
                         include_dirs=['../../..',
                                       '${GMP_INCLUDE_DIRS}',
                                       '${CMAKE_SOURCE_DIR}/H',