assimp includes now referenced with "assimp/"

Makefile

@@ -48,7 +48,7 @@ endif
 #-------------------------------------------------------------------------------
 ifeq ("$(BUILD)","Debug")
 DEFINES		:= -DDEBUG -DDEBUG_ASSERT_BREAK
-CFLAGS		:= $(DEFINES) -g -Wall -I/usr/include/assimp
+CFLAGS		:= $(DEFINES) -g -Wall
 CXXFLAGS	:= $(CFLAGS)
 LDFLAGS		:= $(PLATFORM_LD_FLAGS)
 LIBS		:= -g -lassimp
@@ -56,7 +56,7 @@ endif
 #-------------------------------------------------------------------------------
 ifeq ("$(BUILD)","Release")
 DEFINES		:= 
-CFLAGS		:= $(DEFINES) -O2 -Wall -I/usr/include/assimp
+CFLAGS		:= $(DEFINES) -O2 -Wall
 CXXFLAGS	:= $(CFLAGS)
 LDFLAGS		:= -O2 $(PLATFORM_LD_FLAGS)
 LIBS		:= -lassimp

src/assimputils/types.h

@@ -1,7 +1,7 @@
 #ifndef __ASSIMPUTILS_TYPES_H_INCLUDED__
 #define __ASSIMPUTILS_TYPES_H_INCLUDED__
 
-#include <aiTypes.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.hpp>
-#include <aiScene.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 <aiScene.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 <aiTypes.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 <aiVector3D.h>
-#include <aiQuaternion.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 <aiMaterial.h>
+#include <assimp/aiMaterial.h>
 
 struct MeshMaterial
 {

src/main.cpp

@@ -2,9 +2,9 @@
 #include <string>
 #include <exception>
 
-#include <assimp.hpp>
-#include <aiScene.h>
-#include <aiPostProcess.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 <aiScene.h>
+#include <assimp/aiScene.h>
 #include <string>
 
 void Walk(const aiScene *scene, const std::string &filename);