revert back to Assimp 2.x for all builds, since there seems to be some issues building 3.x on OSX (and 3.x isn't in Homebrew yet either)

src/assimputils/types.h

@@ -1,7 +1,7 @@
 #ifndef __ASSIMPUTILS_TYPES_H_INCLUDED__
 #define __ASSIMPUTILS_TYPES_H_INCLUDED__
 
-#include <assimp/types.h>
+#include <assimp/aiTypes.h>
 #include <vector>
 #include <map>
 

src/assimputils/utils.h

@@ -1,8 +1,8 @@
 #ifndef __ASSIMPUTILS_UTILS_H_INCLUDED__
 #define __ASSIMPUTILS_UTILS_H_INCLUDED__
 
-#include <assimp/Importer.hpp>
-#include <assimp/scene.h>
+#include <assimp/assimp.hpp>
+#include <assimp/aiScene.h>
 
 #include <map>
 #include <vector>

src/convert/convert.h

@@ -2,7 +2,7 @@
 #define __CONVERT_CONVERT_H_INCLUDED__
 
 #include <string>
-#include <assimp/scene.h>
+#include <assimp/aiScene.h>
 
 void ConvertStatic(const std::string &outfile, const aiScene *scene);
 void ConvertSkeletalAnimated(const std::string &outfile, const aiScene *scene);

src/convert/mesh.h

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <vector>
-#include <assimp/types.h>
+#include <assimp/aiTypes.h>
 #include "../assimputils/types.h"
 #include "meshmaterial.h"
 #include "meshtriangle.h"

src/convert/meshjoint.h

@@ -3,8 +3,8 @@
 
 #include <stdint.h>
 #include <string>
-#include <assimp/vector3.h>
-#include <assimp/quaternion.h>
+#include <assimp/aiVector3D.h>
+#include <assimp/aiQuaternion.h>
 #include <vector>
 
 struct MeshJoint

src/convert/meshmaterial.h

@@ -2,7 +2,7 @@
 #define __CONVERT_MESHMATERIAL_H_INCLUDED__
 
 #include <string>
-#include <assimp/material.h>
+#include <assimp/aiMaterial.h>
 
 struct MeshMaterial
 {

src/main.cpp

@@ -2,9 +2,9 @@
 #include <string>
 #include <stdexcept>
 
-#include <assimp/Importer.hpp>
-#include <assimp/scene.h>
-#include <assimp/postprocess.h>
+#include <assimp/assimp.hpp>
+#include <assimp/aiScene.h>
+#include <assimp/aiPostProcess.h>
 
 #include "utils/utils.h"
 #include "assimputils/utils.h"

src/nodetree/nodetree.h

@@ -1,7 +1,7 @@
 #ifndef __NODETREE_NODETREE_H_INCLUDED__
 #define __NODETREE_NODETREE_H_INCLUDED__
 
-#include <assimp/scene.h>
+#include <assimp/aiScene.h>
 #include <string>
 
 void Walk(const aiScene *scene, const std::string &filename);