Update includes locations

Open-Transactions · Sep 2, 2014 · 94806eb · 94806eb
1 parent 40b0973
commit 94806eb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/wrappers/CMakeLists.txt b/wrappers/CMakeLists.txt
@@ -5,8 +5,9 @@ set(SWIG_INCLUDE_DIRS
   ${CMAKE_CURRENT_SOURCE_DIR}/../include/
   ${CMAKE_CURRENT_SOURCE_DIR}/../include/opentxs
   ${CMAKE_CURRENT_SOURCE_DIR}/../include/opentxs/core
+  ${CMAKE_CURRENT_SOURCE_DIR}/../include/opentxs/core/crypto
   ${CMAKE_CURRENT_SOURCE_DIR}/../include/opentxs/ext
-  ${CMAKE_CURRENT_SOURCE_DIR}/../include/opentxs/api
+  ${CMAKE_CURRENT_SOURCE_DIR}/../include/opentxs/client
 )
 
 if(PYTHON)

diff --git a/wrappers/opentxs.i b/wrappers/opentxs.i
@@ -28,13 +28,13 @@
 #include <vector>
 #include <map>
 
-#include "../../include/opentxs/core/OTPassword.hpp"
-#include "../../include/opentxs/api/OTAPI.hpp"
-#include "../../include/opentxs/api/OT_ME.hpp"
+#include "../../include/opentxs/core/crypto/OTPassword.hpp"
+#include "../../include/opentxs/core/crypto/OTAsymmetricKey.hpp"
 #include "../../include/opentxs/core/OTStorage.hpp"
-#include "../../include/opentxs/core/OTAsymmetricKey.hpp"
-#include "../../include/opentxs/api/OTRecord.hpp"
-#include "../../include/opentxs/api/OTRecordList.hpp"
+#include "../../include/opentxs/client/OTAPI.hpp"
+#include "../../include/opentxs/client/OT_ME.hpp"
+#include "../../include/opentxs/client/OTRecord.hpp"
+#include "../../include/opentxs/client/OTRecordList.hpp"
 
 %}
 
@@ -89,12 +89,13 @@ namespace std {
 #define EXPORT
 #endif
 
-%include "../../include/opentxs/core/OTPassword.hpp"
-%include "../../include/opentxs/api/OTAPI.hpp"
-%include "../../include/opentxs/api/OT_ME.hpp"
+%include "../../include/opentxs/core/crypto/OTPassword.hpp"
+%include "../../include/opentxs/core/crypto/OTAsymmetricKey.hpp"
 %include "../../include/opentxs/core/OTStorage.hpp"
-%include "../../include/opentxs/api/OTRecord.hpp"
-%include "../../include/opentxs/api/OTRecordList.hpp"
+%include "../../include/opentxs/client/OTAPI.hpp"
+%include "../../include/opentxs/client/OT_ME.hpp"
+%include "../../include/opentxs/client/OTRecord.hpp"
+%include "../../include/opentxs/client/OTRecordList.hpp"
 
 
 bool opentxs::OT_API_Set_PasswordCallback(OTCaller & theCaller);