From b7d42d470f49339ccb5af5afeee5f069eaca5d3c Mon Sep 17 00:00:00 2001 From: Brendan Le Foll Date: Thu, 10 Apr 2014 11:05:40 +0100 Subject: [PATCH] maa.i: remove dependancy on -includeall and specifiy which headers to include in maa.i --- src/javascript/CMakeLists.txt | 2 -- src/maa.i | 18 ++---------------- src/python/CMakeLists.txt | 1 - src/python/pymaa.i | 2 +- 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/javascript/CMakeLists.txt b/src/javascript/CMakeLists.txt index c894bcf..4f4f8df 100644 --- a/src/javascript/CMakeLists.txt +++ b/src/javascript/CMakeLists.txt @@ -14,8 +14,6 @@ include_directories( ) SET_SOURCE_FILES_PROPERTIES(maajs.i PROPERTIES CPLUSPLUS ON) -SET_SOURCE_FILES_PROPERTIES(maajs.i PROPERTIES SWIG_FLAGS "-includeall") -#SET_SOURCE_FILES_PROPERTIES(../maa.i PROPERTIES SWIG_FLAGS "-no-moduleobject") SET_SOURCE_FILES_PROPERTIES(maajs.i PROPERTIES SWIG_FLAGS "-node") SWIG_ADD_MODULE(maajs javascript maajs.i ../maa.cxx ../i2c/i2c.cxx) diff --git a/src/maa.i b/src/maa.i index ca1ca0c..19741bb 100644 --- a/src/maa.i +++ b/src/maa.i @@ -1,16 +1,2 @@ -// Now list ANSI C/C++ declarations -int get_version(); - -namespace maa { -class I2C { -public: - I2C(unsigned int sda, unsigned int scl); - void frequency(int hz); - int read(int address, char *data, int length, bool repeated = false); - int read(int ack); - int write(int address, const char *data, int length, bool repeated = false); - int write(int data); - void start(void); - void stop(void); -}; -}; +%include "maa.h" +%include "i2c/i2c.h" diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index 4c4ac91..6085528 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -7,7 +7,6 @@ include_directories( ) SET_SOURCE_FILES_PROPERTIES(pymaa.i PROPERTIES CPLUSPLUS ON) -SET_SOURCE_FILES_PROPERTIES(pymaa.i PROPERTIES SWIG_FLAGS "-includeall") SWIG_ADD_MODULE(pymaa python pymaa.i ../maa.cxx ../i2c/i2c.cxx) SWIG_LINK_LIBRARIES(pymaa ${PYTHON_LIBRARIES}) diff --git a/src/python/pymaa.i b/src/python/pymaa.i index 4111175..63838f3 100644 --- a/src/python/pymaa.i +++ b/src/python/pymaa.i @@ -3,4 +3,4 @@ #include "maa.h" %} -%include ../maa.h +%include ../maa.i -- 2.7.4