From ee3975406e6d7ab0b5f7016184960bc2e833cecb Mon Sep 17 00:00:00 2001
From: gered <gered+github@blarg.ca>
Date: Tue, 7 Jun 2011 10:48:53 -0400
Subject: [PATCH] assimp includes now referenced with "assimp/"

---
 Makefile                   | 4 ++--
 src/assimputils/types.h    | 2 +-
 src/assimputils/utils.h    | 4 ++--
 src/convert/convert.h      | 2 +-
 src/convert/mesh.h         | 2 +-
 src/convert/meshjoint.h    | 4 ++--
 src/convert/meshmaterial.h | 2 +-
 src/main.cpp               | 6 +++---
 src/nodetree/nodetree.h    | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 9cabc86..40881b8 100644
--- a/Makefile
+++ b/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
diff --git a/src/assimputils/types.h b/src/assimputils/types.h
index f26a8fa..e9beef7 100644
--- a/src/assimputils/types.h
+++ b/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>
 
diff --git a/src/assimputils/utils.h b/src/assimputils/utils.h
index c85fd94..d4387ee 100644
--- a/src/assimputils/utils.h
+++ b/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>
diff --git a/src/convert/convert.h b/src/convert/convert.h
index 6fa8250..39b9f30 100644
--- a/src/convert/convert.h
+++ b/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);
diff --git a/src/convert/mesh.h b/src/convert/mesh.h
index f959287..16575ae 100644
--- a/src/convert/mesh.h
+++ b/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"
diff --git a/src/convert/meshjoint.h b/src/convert/meshjoint.h
index 16820c3..e708dba 100644
--- a/src/convert/meshjoint.h
+++ b/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
diff --git a/src/convert/meshmaterial.h b/src/convert/meshmaterial.h
index 7846aaa..f22977e 100644
--- a/src/convert/meshmaterial.h
+++ b/src/convert/meshmaterial.h
@@ -2,7 +2,7 @@
 #define __CONVERT_MESHMATERIAL_H_INCLUDED__
 
 #include <string>
-#include <aiMaterial.h>
+#include <assimp/aiMaterial.h>
 
 struct MeshMaterial
 {
diff --git a/src/main.cpp b/src/main.cpp
index 6eb4884..86ab7a3 100644
--- a/src/main.cpp
+++ b/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"
diff --git a/src/nodetree/nodetree.h b/src/nodetree/nodetree.h
index aa08a6c..81605b1 100644
--- a/src/nodetree/nodetree.h
+++ b/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);