X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fpython%2Fsetup.py;h=c1146f1fb257dfce373bbfc0783785c50564ecf6;hb=6be7a7f287a5567361f1dadf41a9d11b828a9101;hp=7b7c961e531acd7691801c56fa5fdbe290185af8;hpb=91bea31f6bff799f90fc21201312505d37441981;p=libsigrok.git

diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 7b7c961e..c1146f1f 100644
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -1,5 +1,5 @@
 ##
-## This file is part of the sigrok project.
+## This file is part of the libsigrok project.
 ##
 ## Copyright (C) 2013 Martin Ling <martin-sigrok@earth.li>
 ##
@@ -19,26 +19,34 @@
 
 from setuptools import setup, find_packages, Extension
 import subprocess
+import os
 
 sr_includes, sr_lib_dirs, sr_libs, (sr_version,) = [
     subprocess.check_output(
-        ["pkg-config", option, "libsigrok"]).decode().rstrip().split(' ')
+            ["pkg-config", option, "glib-2.0", "glibmm-2.4", "pygobject-3.0"]
+        ).decode().rstrip().split(' ')
     for option in
         ("--cflags-only-I", "--libs-only-L", "--libs-only-l", "--modversion")]
 
+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] + ['sigrokxx']
+
 setup(
     name = 'libsigrok',
     namespace_packages = ['sigrok'],
     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'] + sr_includes,
-            include_dirs = [i[2:] for i in sr_includes],
-            library_dirs = [l[2:] for l in sr_lib_dirs],
-            libraries = [l[2:] for l in sr_libs]
-        )
+        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'],
+            include_dirs = includes,
+            library_dirs = libdirs,
+            libraries = libs)
     ],
 )