fix for gcc-4.5 on cygwin

[meshio/meshio.git] / swig / pmd.i

diff --git a/swig/pmd.i b/swig/pmd.i
index 6bdfd28..bc2ec4e 100644 (file)
--- a/swig/pmd.i
+++ b/swig/pmd.i
@@ -1,16 +1,17 @@
 %module pmd
+
 %{
 #include <pmd.h>
-using namespace meshio;
-using namespace pmd;
 %}
-%include "std_vector.i"
-%include "../include/color.h"
-%include "../include/la.h"
-%include "../include/pmd.h"
+%include "../../src/pmd.h"
+%include "../../src/color.h"
+%include "../../src/la.h"
+%include "../../src/text.h"
 
+%include "std_pair.i"
+%include "std_vector.i"
 %template(VertexVector) std::vector<meshio::pmd::Vertex>;
-%template(MaterialVector) std::vector<meshio::pmd::Material*>;
+%template(MaterialVector) std::vector<meshio::pmd::Material>;
 %template(BoneVector) std::vector<meshio::pmd::Bone>;
 %template(IKVector) std::vector<meshio::pmd::IK>;
 %template(MorphVector) std::vector<meshio::pmd::Morph>;
@@ -18,6 +19,10 @@ using namespace pmd;
 %template(ConstraintVector) std::vector<meshio::pmd::Constraint>;
 %template(UintVector) std::vector<unsigned int>;
 %template(UshortVector) std::vector<unsigned short>;
-%template(Vector3Vector) std::vector<meshio::pmd::Vector3>;
+%template(Vector3Vector) std::vector<meshio::Vector3>;
 %template(PBoneVector) std::vector<meshio::pmd::Bone*>;
+%template(BoneGroupVector) std::vector<meshio::pmd::BoneGroup>;
+%template(DisplayPair) std::pair<unsigned short, unsigned char>;
+%template(BoneDisplayVector) std::vector<std::pair<unsigned short, unsigned char> >;
+%template(fixed_string_20) meshio::fixed_string<20>;