From: Daniel Elstner Date: Sat, 15 Aug 2015 14:10:36 +0000 (+0200) Subject: Build: Prefix directory to include of enums.hpp X-Git-Tag: libsigrok-0.4.0~439 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=8b2a184327900fd7d08bb09f58699d62e2578eea;p=libsigrok.git Build: Prefix directory to include of enums.hpp This fixes a build problem due to the reduced include search paths introduced by my recent changes. Also fix a couple of other includes to use angle brackets. --- diff --git a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp index e1e8d7b9..b9395a71 100644 --- a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp +++ b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp @@ -70,7 +70,7 @@ raised, which provides access to the error code and description. #ifndef LIBSIGROKCXX_HPP #define LIBSIGROKCXX_HPP -#include "libsigrok/libsigrok.h" +#include #include #include @@ -1047,7 +1047,7 @@ protected: const string _name; }; -#include "enums.hpp" +#include } diff --git a/bindings/swig/classes.i b/bindings/swig/classes.i index cdb9f0e7..6323fab1 100644 --- a/bindings/swig/classes.i +++ b/bindings/swig/classes.i @@ -20,7 +20,7 @@ #pragma SWIG nowarn=325,401 %{ -#include "libsigrokcxx/libsigrokcxx.hpp" +#include using namespace std; %} @@ -271,10 +271,10 @@ typedef std::map %attribute(sigrok::Analog, const sigrok::Unit *, unit, unit); %attributevector(Analog, std::vector, mq_flags, mq_flags); -%include "libsigrokcxx/libsigrokcxx.hpp" +%include %include "enums.i" namespace sigrok { -%include "libsigrokcxx/enums.hpp" +%include }