X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fpython%2Fsetup.py;h=c1146f1fb257dfce373bbfc0783785c50564ecf6;hb=6be7a7f287a5567361f1dadf41a9d11b828a9101;hp=a4426032074d84e5305271e2da6865a699829d76;hpb=f774095496a5ab9b68ce79503ae7d45f717c0006;p=libsigrok.git diff --git a/bindings/python/setup.py b/bindings/python/setup.py index a4426032..c1146f1f 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -21,8 +21,6 @@ from setuptools import setup, find_packages, Extension import subprocess import os -env = os.environ.copy() - sr_includes, sr_lib_dirs, sr_libs, (sr_version,) = [ subprocess.check_output( ["pkg-config", option, "glib-2.0", "glibmm-2.4", "pygobject-3.0"] @@ -32,11 +30,7 @@ sr_includes, sr_lib_dirs, sr_libs, (sr_version,) = [ includes = ['../../include', '../cxx/include'] + [i[2:] for i in sr_includes] libdirs = ['../../.libs', '../cxx/.libs'] + [l[2:] for l in sr_lib_dirs] -libs = [l[2:] for l in sr_libs] - -extension_options = dict( - include_dirs = includes, - library_dirs = libdirs) +libs = [l[2:] for l in sr_libs] + ['sigrokxx'] setup( name = 'libsigrok', @@ -44,18 +38,15 @@ setup( packages = find_packages(), version = sr_version, description = "libsigrok API wrapper", + zip_safe = False, ext_modules = [ - Extension('sigrok.core._lowlevel', - sources = ['sigrok/core/lowlevel.i'], - swig_opts = ['-threads', '-I../../include'], - libraries = libs + ['sigrok'], - **extension_options), Extension('sigrok.core._classes', sources = ['sigrok/core/classes.i'], swig_opts = ['-c++', '-threads'] + ['-I%s' % i for i in includes], extra_compile_args = ['-std=c++11'], - libraries = libs + ['sigrokxx'], - **extension_options) + include_dirs = includes, + library_dirs = libdirs, + libraries = libs) ], )