setup.py: Do VPATH search for swig/enums.i

[libsigrok.git] / bindings / swig / classes.i

diff --git a/bindings/swig/classes.i b/bindings/swig/classes.i
index 4fb37315821d6d4d7004c7906f02bd9fddd5aaa1..b6ddbbcad261d131c657d309f88c14add22f25e7 100644 (file)
--- a/bindings/swig/classes.i
+++ b/bindings/swig/classes.i
@@ -20,7 +20,7 @@
 #pragma SWIG nowarn=325,401
 
 %{
-#include "libsigrok/libsigrok.hpp"
+#include <libsigrokcxx/libsigrokcxx.hpp>
 using namespace std;
 %}
 
@@ -84,6 +84,7 @@ template< class T > class enable_shared_from_this;
 %shared_ptr(sigrok::Trigger);
 %shared_ptr(sigrok::TriggerStage);
 %shared_ptr(sigrok::TriggerMatch);
+%shared_ptr(sigrok::UserDevice);
 
 %template(StringMap) std::map<std::string, std::string>;
 
@@ -263,15 +264,17 @@ typedef std::map<const sigrok::ConfigKey *, Glib::VariantBase>
 
 %attributemap(Meta, map_ConfigKey_Variant, config, config);
 
+%attributevector(Analog,
+    std::vector<std::shared_ptr<sigrok::Channel> >, channels, channels);
 %attribute(sigrok::Analog, int, num_samples, num_samples);
 %attribute(sigrok::Analog, const sigrok::Quantity *, mq, mq);
 %attribute(sigrok::Analog, const sigrok::Unit *, unit, unit);
 %attributevector(Analog, std::vector<const sigrok::QuantityFlag *>, mq_flags, mq_flags);
 
-%include "libsigrok/libsigrok.hpp"
+%include <libsigrokcxx/libsigrokcxx.hpp>
 
-%include "enums.i"
+%include "swig/enums.i"
 
 namespace sigrok {
-%include "libsigrok/enums.hpp"
+%include <libsigrokcxx/enums.hpp>
 }