From 26081fd4ba3d671bb22e90f189b8fae3f54dd166 Mon Sep 17 00:00:00 2001 From: David Williams Date: Mon, 27 Dec 2010 11:54:49 +0000 Subject: [PATCH] Got the Vector class working in Python through SWIG. --- library/CMakeLists.txt | 2 +- library/bindings/CMakeLists.txt | 3 ++- library/bindings/PolyVoxCore.i | 6 +++--- library/bindings/Vector.i | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index e544d7f9..e3c888b7 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(PolyVox) -#add_subdirectory(bindings) +add_subdirectory(bindings) add_subdirectory(PolyVoxCore) add_subdirectory(PolyVoxUtil) diff --git a/library/bindings/CMakeLists.txt b/library/bindings/CMakeLists.txt index 2653a94d..dc52cba1 100644 --- a/library/bindings/CMakeLists.txt +++ b/library/bindings/CMakeLists.txt @@ -4,11 +4,12 @@ if(SWIG_FOUND) find_package(PythonLibs) include_directories(${PYTHON_INCLUDE_PATH}) + include_directories(${PolyVoxCore_SOURCE_DIR}/include) set(CMAKE_SWIG_FLAGS "") set_source_files_properties(PolyVoxCore.i PROPERTIES CPLUSPLUS ON) swig_add_module(PolyVoxCore python PolyVoxCore.i) swig_link_libraries(PolyVoxCore ${PYTHON_LIBRARIES} PolyVoxCore) - set_target_properties(${SWIG_MODULE_PolyVoxCore_REAL_NAME} PROPERTIES SUFFIX ".pyd") + #set_target_properties(${SWIG_MODULE_PolyVoxCore_REAL_NAME} PROPERTIES SUFFIX ".pyd") endif() \ No newline at end of file diff --git a/library/bindings/PolyVoxCore.i b/library/bindings/PolyVoxCore.i index e235a305..7fa26327 100644 --- a/library/bindings/PolyVoxCore.i +++ b/library/bindings/PolyVoxCore.i @@ -4,8 +4,8 @@ //%include //%include "TypeDef.i" -%include "Enums.i" -%include "PolyVoxCStdInt.i" -%include "Utility.i" +//%include "Enums.i" +//%include "PolyVoxCStdInt.i" +//%include "Utility.i" //%include "PolyVoxForwardDeclarations.i" //Shouldn't be needed %include "Vector.i" diff --git a/library/bindings/Vector.i b/library/bindings/Vector.i index 493fb918..b2c05b95 100644 --- a/library/bindings/Vector.i +++ b/library/bindings/Vector.i @@ -1,10 +1,10 @@ %module Vector %{ -#include "PolyVoxCore/Vector.h" -//#include "PolyVoxCore/PolyVoxCStdInt.h" +#include "Vector.h" +//#include "PolyVoxCore/include/PolyVoxCStdInt.h" %} -%include "PolyVoxCore/Vector.h" +%include "Vector.h" %template(Vector3DFloat) PolyVox::Vector<3,float>; %template(Vector3DDouble) PolyVox::Vector<3,double>;