- move include/ to include/assimp/ to have consistent header locations between installed and trunk version.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1148 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

code/3DSHelper.h

@@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace Assimp	{
 namespace D3DS	{
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 // ---------------------------------------------------------------------------
 /** Discreet3DS class: Helper class for loading 3ds files. Defines chunks
@@ -352,7 +352,7 @@ struct Texture
 	int iUVSrc;
 };
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 // ---------------------------------------------------------------------------
 /** Helper structure representing a 3ds material */

code/3DSLoader.h

@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_3DSIMPORTER_H_INC
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiNode;
 #include "3DSHelper.h"

code/ACLoader.h

@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp	{
 

code/ASELoader.h

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_ASELOADER_H_INCLUDED
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiNode;
 #include "ASEParser.h"

code/ASEParser.h

@@ -49,9 +49,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <list>
 
 // public ASSIMP headers
-#include "../include/aiTypes.h"
-#include "../include/aiMesh.h"
-#include "../include/aiAnim.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiAnim.h"
 
 // for some helper routines like IsSpace()
 #include "ParsingUtils.h"

code/Assimp.cpp

@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "AssimpPCH.h"
-#include "../include/assimp.h"
+#include "../include/assimp/assimp.h"
 
 #include "GenericProperty.h"
 #include "CInterfaceIOWrapper.h"

code/AssimpPCH.cpp

@@ -2,7 +2,7 @@
 // Actually just a dummy, used by the compiler to build the precompiled header.
 
 #include "AssimpPCH.h"
-#include "./../include/aiVersion.h"
+#include "./../include/assimp/aiVersion.h"
 
 // --------------------------------------------------------------------------------
 // Legal information string - dont't remove this.

code/AssimpPCH.h

@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * using exactly the same settings in aiDefines.h. Settings in AssimpPCH.h may differ,
  * they won't affect the public API.
  */
-#include "../include/aiDefines.h"
+#include "../include/assimp/aiDefines.h"
 
 // Include our stdint.h replacement header for MSVC, take the global header for gcc/mingw
 #if defined( _MSC_VER) && (_MSC_VER < 1600)
@@ -132,13 +132,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/lexical_cast.hpp>
 
 // Public ASSIMP headers
-#include "../include/DefaultLogger.h"
-#include "../include/IOStream.h"
-#include "../include/IOSystem.h"
-#include "../include/aiScene.h"
-#include "../include/aiPostProcess.h"
-#include "../include/assimp.hpp"
-#include "../include/export.hpp"
+#include "../include/assimp/DefaultLogger.h"
+#include "../include/assimp/IOStream.h"
+#include "../include/assimp/IOSystem.h"
+#include "../include/assimp/aiScene.h"
+#include "../include/assimp/aiPostProcess.h"
+#include "../include/assimp/assimp.hpp"
+#include "../include/assimp/export.hpp"
 
 // Internal utility headers
 #include "BaseImporter.h"

code/B3DImporter.h

@@ -44,9 +44,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_B3DIMPORTER_H_INC
 #define AI_B3DIMPORTER_H_INC
 
-#include "../include/aiTypes.h"
-#include "../include/aiMesh.h"
-#include "../include/aiMaterial.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiMaterial.h"
 
 #include <string>
 #include <vector>

code/BaseImporter.h

@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <map>
 #include <vector>
-#include "./../include/aiTypes.h"
+#include "./../include/assimp/aiTypes.h"
 
 struct aiScene;
 

code/BaseProcess.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <map>
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include "GenericProperty.h"
 
 struct aiScene;

code/ByteSwap.h

@@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_BYTESWAP_H_INC
 #define AI_BYTESWAP_H_INC
 
-#include "../include/aiAssert.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiAssert.h"
+#include "../include/assimp/aiTypes.h"
 
 #if _MSC_VER >= 1400 
 #include <stdlib.h>

code/CInterfaceIOWrapper.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_CIOSYSTEM_H_INCLUDED
 #define AI_CIOSYSTEM_H_INCLUDED
 
-#include "../include/aiFileIO.h"
+#include "../include/assimp/aiFileIO.h"
 
 namespace Assimp	{
 	

code/CMakeLists.txt

@@ -8,7 +8,7 @@ SET( LIBRARY_SOVERSION "2" )
 # 3) Add libassimp using the file lists (eliminates duplication of file names between
 #    source groups and library command)
 #
-SET( HEADER_PATH ../include )
+SET( HEADER_PATH ../include/assimp )
 
 SET( COMPILER_HEADERS
 	${HEADER_PATH}/Compiler/pushpack1.h

code/ColladaExporter.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_COLLADAEXPORTER_H_INC
 #define AI_COLLADAEXPORTER_H_INC
 
-#include "../include/aiAssert.h"
+#include "../include/assimp/aiAssert.h"
 #include <sstream>
 
 struct aiScene;

code/ColladaLoader.cpp

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "AssimpPCH.h"
 #ifndef ASSIMP_BUILD_NO_DAE_IMPORTER
 
-#include "../include/aiAnim.h"
+#include "../include/assimp/aiAnim.h"
 #include "ColladaLoader.h"
 #include "ColladaParser.h"
 

code/ComputeUVMappingProcess.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_COMPUTEUVMAPPING_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 class ComputeUVMappingTest;
 namespace Assimp

code/ConvertToLHProcess.h

@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_CONVERTTOLHPROCESS_H_INC
 #define AI_CONVERTTOLHPROCESS_H_INC
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include "BaseProcess.h"
 
 struct aiMesh;

code/DeboneProcess.h

@@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <utility>
 #include "BaseProcess.h"
 
-#include "../include/aiMesh.h"
-#include "../include/aiScene.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiScene.h"
 
 class DeboneTest;
 

code/DefaultIOStream.h

@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_DEFAULTIOSTREAM_H_INC
 
 #include <stdio.h>
-#include "../include/IOStream.h"
+#include "../include/assimp/IOStream.h"
 
 namespace Assimp	{
 

code/DefaultIOSystem.h

@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_DEFAULTIOSYSTEM_H_INC
 #define AI_DEFAULTIOSYSTEM_H_INC
 
-#include "../include/IOSystem.h"
+#include "../include/assimp/IOSystem.h"
 
 namespace Assimp	{
 

code/DefaultProgressHandler.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_DEFAULTPROGRESSHANDLER_H
 #define INCLUDED_AI_DEFAULTPROGRESSHANDLER_H
 
-#include "../include/ProgressHandler.h"
+#include "../include/assimp/ProgressHandler.h"
 namespace Assimp	{
 
 // ------------------------------------------------------------------------------------

code/FileLogStream.h

@@ -1,8 +1,8 @@
 #ifndef ASSIMP_FILELOGSTREAM_H_INC
 #define ASSIMP_FILELOGSTREAM_H_INC
 
-#include "../include/LogStream.h"
-#include "../include/IOStream.h"
+#include "../include/assimp/LogStream.h"
+#include "../include/assimp/IOStream.h"
 
 namespace Assimp	{
 

code/FileSystemFilter.h

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_FILESYSTEMFILTER_H_INC
 #define AI_FILESYSTEMFILTER_H_INC
 
-#include "../include/IOSystem.h"
+#include "../include/assimp/IOSystem.h"
 #include "fast_atof.h"
 #include "ParsingUtils.h"
 namespace Assimp	{

code/FindDegenerates.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_FINDDEGENERATESPROCESS_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 class FindDegeneratesProcessTest;
 namespace Assimp	{

code/FindInvalidDataProcess.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_FINDINVALIDDATA_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiMesh;
 class FindInvalidDataProcessTest;

code/GenFaceNormalsProcess.h

@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_GENFACENORMALPROCESS_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 namespace Assimp
 {

code/GenVertexNormalsProcess.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_GENVERTEXNORMALPROCESS_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 class GenNormalsTest;
 

code/GenericProperty.h

@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_GENERIC_PROPERTY_H_INCLUDED
 #define AI_GENERIC_PROPERTY_H_INCLUDED
 
-#include "./../include/assimp.hpp"
+#include "./../include/assimp/assimp.hpp"
 #include "Hash.h"
 
 // ------------------------------------------------------------------------------------------------

code/HMPFileData.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace Assimp	{
 namespace HMP	{
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 // to make it easier for us, we test the magic word against both "endianesses"
 #define AI_HMP_MAGIC_NUMBER_BE_4	AI_MAKE_MAGIC("HMP4")
@@ -128,7 +128,7 @@ struct Vertex_HMP7
 	int8_t normal_x,normal_y;
 } PACK_STRUCT;
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 } //! namespace HMP
 } //! namespace Assimp

code/HMPLoader.h

@@ -45,9 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_HMPLOADER_H_INCLUDED
 
 // public ASSIMP headers
-#include "../include/aiTypes.h"
-#include "../include/aiTexture.h"
-#include "../include/aiMaterial.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiTexture.h"
+#include "../include/assimp/aiMaterial.h"
 
 // internal headers
 #include "BaseImporter.h"

code/HalfLifeFileData.h

@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_MDLFILEHELPER2_H_INC
 #define AI_MDLFILEHELPER2_H_INC
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 #include "MDLFileData.h"
 
@@ -142,7 +142,7 @@ struct Header_HL2
 	int32_t			transitionindex;
 } PACK_STRUCT;
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 }
 } // end namespaces

code/IFF.h

@@ -12,7 +12,7 @@
 namespace Assimp	{
 namespace IFF		{
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 /////////////////////////////////////////////////////////////////////////////////
 //! Describes an IFF chunk header
@@ -39,7 +39,7 @@ struct SubChunkHeader
 	uint16_t length;
 } PACK_STRUCT;
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 
 #define AI_IFF_FOURCC(a,b,c,d) ((uint32_t) (((uint8_t)a << 24u) | \

code/Importer.cpp

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "AssimpPCH.h"
-#include "../include/aiVersion.h"
+#include "../include/assimp/aiVersion.h"
 
 // ------------------------------------------------------------------------------------------------
 /* Uncomment this line to prevent Assimp from catching unknown exceptions.

code/ImproveCacheLocality.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_IMPROVECACHELOCALITY_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiMesh;
 

code/JoinVerticesProcess.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_JOINVERTICESPROCESS_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp
 {

code/LWOFileData.h

@@ -52,7 +52,7 @@ The chunks are taken from the official LightWave SDK headers.
 #include <list>
 
 // public ASSIMP headers
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 // internal headers
 #include "IFF.h"

code/LWOLoader.h

@@ -42,8 +42,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_LWOLOADER_H_INCLUDED
 #define AI_LWOLOADER_H_INCLUDED
 
-#include "../include/aiTypes.h"
-#include "../include/DefaultLogger.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/DefaultLogger.h"
 
 #include "LWOFileData.h"
 #include "BaseImporter.h"

code/MD2FileData.h

@@ -45,11 +45,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_MD2FILEHELPER_H_INC
 #define AI_MD2FILEHELPER_H_INC
 
-#include "../include/aiTypes.h"
-#include "../include/aiMesh.h"
-#include "../include/aiAnim.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiAnim.h"
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 namespace Assimp	{
 namespace MD2	{
@@ -146,7 +146,7 @@ struct Skin
 	char name[AI_MD2_MAXQPATH];              /* texture file name */
 } PACK_STRUCT;
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 
 // ---------------------------------------------------------------------------

code/MD2Loader.h

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_MD2LOADER_H_INCLUDED
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiNode;
 #include "MD2FileData.h"

code/MD3FileData.h

@@ -50,11 +50,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include <sstream>
 
-#include "../include/aiTypes.h"
-#include "../include/aiMesh.h"
-#include "../include/aiAnim.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiAnim.h"
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 namespace Assimp	{
 namespace MD3	{
@@ -246,7 +246,7 @@ struct Vertex
 	uint16_t  NORMAL;
 } PACK_STRUCT;
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 // -------------------------------------------------------------------------------
 /**	@brief Unpack a Q3 16 bit vector to its full float3 representation

code/MD3Loader.h

@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 #include "ByteSwap.h"
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 #include "MD3FileData.h"
 namespace Assimp	{

code/MD5Loader.h

@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 #include "MD5Parser.h"
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp	{
 

code/MD5Parser.h

@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_MD5PARSER_H_INCLUDED
 #define AI_MD5PARSER_H_INCLUDED
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include "ParsingUtils.h"
 
 struct aiFace;

code/MDCFileData.h

@@ -49,11 +49,11 @@ http://themdcfile.planetwolfenstein.gamespy.com/MDC_File_Format.pdf
 #ifndef AI_MDCFILEHELPER_H_INC
 #define AI_MDCFILEHELPER_H_INC
 
-#include "../include/aiTypes.h"
-#include "../include/aiMesh.h"
-#include "../include/aiAnim.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiAnim.h"
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 
 namespace Assimp {
@@ -183,7 +183,7 @@ struct Shader
 
 } PACK_STRUCT;
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 
 // ---------------------------------------------------------------------------

code/MDCLoader.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_MDCLOADER_H_INCLUDED
 #define AI_MDCLOADER_H_INCLUDED
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 #include "BaseImporter.h"
 #include "MDCFileData.h"

code/MDLFileData.h

@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_MDLFILEHELPER_H_INC
 #define AI_MDLFILEHELPER_H_INC
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 namespace Assimp	{
 namespace MDL	{
@@ -724,7 +724,7 @@ struct GroupFrame
 	SimpleFrame *frames; 
 } PACK_STRUCT;
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 // -------------------------------------------------------------------------------------
 /** \struct IntFace_MDL7

code/NFFLoader.h

@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 #include <vector>
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp	{
 

code/OFFLoader.h

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_OFFLOADER_H_INCLUDED
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include <vector>
 
 namespace Assimp	{

code/ObjExporter.cpp

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_OBJ_EXPORTER
 
 #include "ObjExporter.h"
-#include "../include/aiVersion.h"
+#include "../include/assimp/aiVersion.h"
 
 using namespace Assimp;
 namespace Assimp	{

code/ObjFileData.h

@@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <vector>
 #include <map>
-#include "../include/aiTypes.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiMesh.h"
 
 namespace Assimp
 {

code/ObjFileParser.cpp

@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ObjTools.h"
 #include "ObjFileData.h"
 #include "ParsingUtils.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include "DefaultIOSystem.h"
 
 namespace Assimp	

code/OptimizeGraph.h

@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseProcess.h"
 #include "ProcessHelper.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiMesh;
 class OptimizeGraphProcessTest;

code/OptimizeMeshes.h

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_OPTIMIZEMESHESPROCESS_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiMesh;
 class OptimizeMeshesProcessTest;

code/PlyLoader.h

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_PLYLOADER_H_INCLUDED
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiNode;
 

code/PretransformVertices.h

@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_PRETRANSFORMVERTICES_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 class PretransformVerticesTest;
 namespace Assimp	{

code/ProcessHelper.h

@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_PROCESS_HELPER_H_INCLUDED
 #define AI_PROCESS_HELPER_H_INCLUDED
 
-#include "../include/aiPostProcess.h"
+#include "../include/assimp/aiPostProcess.h"
 
 #include "SpatialSort.h"
 #include "BaseProcess.h"

code/Profiler.h

@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "boost/timer.hpp"
 
-#include "../include/DefaultLogger.h"
+#include "../include/assimp/DefaultLogger.h"
 #include "TinyFormatter.h"
 
 namespace Assimp {

code/Q3BSPFileImporter.cpp

@@ -53,8 +53,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #	include "../contrib/zlib/zlib.h"
 #endif
 
-#include "../include/aiTypes.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiMesh.h"
 #include <vector>
 
 namespace Assimp

code/Q3BSPZipArchive.h

@@ -41,8 +41,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_Q3BSP_ZIPARCHIVE_H_INC
 
 #include "../contrib/unzip/unzip.h"
-#include "../include/IOStream.h"
-#include "../include/IOSystem.h"
+#include "../include/assimp/IOStream.h"
+#include "../include/assimp/IOSystem.h"
 #include <string>
 #include <vector>
 #include <map>

code/Q3DLoader.h

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_Q3DLOADER_H_INCLUDED
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include <vector>
 
 namespace Assimp	{

code/RawLoader.h

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_RAWLOADER_H_INCLUDED
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include <vector>
 
 namespace Assimp	{

code/RemoveComments.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_REMOVE_COMMENTS_H_INC
 #define AI_REMOVE_COMMENTS_H_INC
 
-#include "../include/aiAssert.h"
+#include "../include/assimp/aiAssert.h"
 
 namespace Assimp	{
 

code/RemoveRedundantMaterials.h

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_REMOVEREDUNDANTMATERIALS_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 class RemoveRedundantMatsTest;
 namespace Assimp	{

code/RemoveVCProcess.h

@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_REMOVEVCPROCESS_H_INCLUDED
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 class RemoveVCProcessTest;
 namespace Assimp	{

code/SGSpatialSort.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_D3DSSPATIALSORT_H_INC
 
 #include <vector>
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp	{
 

code/SMDLoader.h

@@ -50,10 +50,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ParsingUtils.h"
 
 // public Assimp headers
-#include "../include/aiTypes.h"
-#include "../include/aiTexture.h"
-#include "../include/aiAnim.h"
-#include "../include/aiMaterial.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiTexture.h"
+#include "../include/assimp/aiAnim.h"
+#include "../include/assimp/aiMaterial.h"
 struct aiNode;
 
 // STL headers

code/STLExporter.cpp

@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #if !defined(ASSIMP_BUILD_NO_EXPORT) && !defined(ASSIMP_BUILD_NO_STL_EXPORTER)
 
 #include "STLExporter.h"
-#include "../include/aiVersion.h"
+#include "../include/assimp/aiVersion.h"
 
 using namespace Assimp;
 namespace Assimp	{

code/STLLoader.h

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_STLLOADER_H_INCLUDED
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp	{
 

code/SceneCombiner.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_SCENE_COMBINER_H_INC
 #define AI_SCENE_COMBINER_H_INC
 
-#include "../include/aiAssert.h"
+#include "../include/assimp/aiAssert.h"
 
 namespace Assimp	{
 

code/SkeletonMeshBuilder.cpp

@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "AssimpPCH.h"
-#include "../include/aiScene.h"
+#include "../include/assimp/aiScene.h"
 #include "SkeletonMeshBuilder.h"
 
 using namespace Assimp;

code/SkeletonMeshBuilder.h

@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_SKELETONMESHBUILDER_H_INC
 
 #include <vector>
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 struct aiScene;
 struct aiNode;

code/SortByPTypeProcess.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_SORTBYPTYPEPROCESS_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 class SortByPTypeProcessTest;
 namespace Assimp	{

code/SpatialSort.h

@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_SPATIALSORT_H_INC
 
 #include <vector>
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp
 {

code/SplitByBoneCountProcess.h

@@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include "BaseProcess.h"
 
-#include "../include/aiMesh.h"
-#include "../include/aiScene.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiScene.h"
 
 namespace Assimp
 {

code/SplitLargeMeshes.h

@@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include "BaseProcess.h"
 
-#include "../include/aiMesh.h"
-#include "../include/aiScene.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiScene.h"
 
 class SplitLargeMeshesTest;
 namespace Assimp

code/StdOStreamLogStream.h

@@ -1,7 +1,7 @@
 #ifndef AI_STROSTREAMLOGSTREAM_H_INC
 #define AI_STROSTREAMLOGSTREAM_H_INC
 
-#include "../include/LogStream.h"
+#include "../include/assimp/LogStream.h"
 #include <ostream>
 
 namespace Assimp	{

code/ValidateDataStructure.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_VALIDATEPROCESS_H_INC
 #define AI_VALIDATEPROCESS_H_INC
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include "BaseProcess.h"
 
 struct aiBone;

code/VertexTriangleAdjacency.h

@@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_VTADJACENCY_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiTypes.h"
-#include "../include/aiAssert.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiAssert.h"
 
 struct aiMesh;
 namespace Assimp	{

code/Win32DebugLogStream.h

@@ -3,7 +3,7 @@
 
 #ifdef WIN32
 
-#include "../include/LogStream.h"
+#include "../include/assimp/LogStream.h"
 #include "windows.h"
 
 namespace Assimp	{

code/XFileHelper.h

@@ -46,10 +46,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 
-#include "../include/aiTypes.h"
-#include "../include/aiQuaternion.h"
-#include "../include/aiMesh.h"
-#include "../include/aiAnim.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiQuaternion.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiAnim.h"
 
 namespace Assimp
 {

code/XFileImporter.h

@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "XFileHelper.h"
 #include "BaseImporter.h"
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiNode;
 

code/XFileParser.h

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp
 {

code/irrXMLWrapper.h

@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // some long includes ....
 #include "./../contrib/irrXML/irrXML.h"
-#include "./../include/IOStream.h"
+#include "./../include/assimp/IOStream.h"
 namespace Assimp	{
 
 // ---------------------------------------------------------------------------------