diff --git a/code/3DSHelper.h b/code/3DSHelper.h index a904abb20..d67a7c14c 100644 --- a/code/3DSHelper.h +++ b/code/3DSHelper.h @@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. namespace Assimp { namespace D3DS { -#include "./../include/assimp/Compiler/pushpack1.h" +#include // --------------------------------------------------------------------------- /** Discreet3DS class: Helper class for loading 3ds files. Defines chunks @@ -363,7 +363,7 @@ struct Texture { int iUVSrc; }; -#include "./../include/assimp/Compiler/poppack1.h" +#include // --------------------------------------------------------------------------- /** Helper structure representing a 3ds material */ diff --git a/code/FBXDocumentUtil.h b/code/FBXDocumentUtil.h index acc8c4a5c..c0435a663 100644 --- a/code/FBXDocumentUtil.h +++ b/code/FBXDocumentUtil.h @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_FBX_DOCUMENT_UTIL_H #define INCLUDED_AI_FBX_DOCUMENT_UTIL_H -#include "../include/assimp/defs.h" +#include #include #include #include "FBXDocument.h" diff --git a/code/HMPFileData.h b/code/HMPFileData.h index a8ad2deb0..962f2f9c7 100644 --- a/code/HMPFileData.h +++ b/code/HMPFileData.h @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. namespace Assimp { namespace HMP { -#include "./../include/assimp/Compiler/pushpack1.h" +#include #include // to make it easier for us, we test the magic word against both "endianesses" @@ -131,7 +131,7 @@ struct Vertex_HMP7 int8_t normal_x,normal_y; } PACK_STRUCT; -#include "./../include/assimp/Compiler/poppack1.h" +#include } //! namespace HMP } //! namespace Assimp diff --git a/code/HalfLifeFileData.h b/code/HalfLifeFileData.h index 930980c80..7c55657d4 100644 --- a/code/HalfLifeFileData.h +++ b/code/HalfLifeFileData.h @@ -51,7 +51,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/assimp/Compiler/pushpack1.h" +#include namespace Assimp { namespace MDL { @@ -141,7 +141,7 @@ struct Header_HL2 { int32_t transitionindex; } /* PACK_STRUCT */; -#include "./../include/assimp/Compiler/poppack1.h" +#include } } // end namespaces diff --git a/code/Importer/IFC/IFCReaderGen_4.cpp b/code/Importer/IFC/IFCReaderGen_4.cpp index 7a312e691..fdefedb18 100644 --- a/code/Importer/IFC/IFCReaderGen_4.cpp +++ b/code/Importer/IFC/IFCReaderGen_4.cpp @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER #include "AssimpPCH.h" -#include "IFCReaderGen4.h" +#include "IFCReaderGen_4.h" namespace Assimp { using namespace IFC; diff --git a/code/MD3FileData.h b/code/MD3FileData.h index 3f9741366..910813fc4 100644 --- a/code/MD3FileData.h +++ b/code/MD3FileData.h @@ -246,7 +246,7 @@ struct Vertex uint16_t NORMAL; } /*PACK_STRUCT*/; -#include "./../include/assimp/Compiler/poppack1.h" +#include // ------------------------------------------------------------------------------- /** @brief Unpack a Q3 16 bit vector to its full float3 representation diff --git a/code/MD4FileData.h b/code/MD4FileData.h index e515808ac..ed3dc65e7 100644 --- a/code/MD4FileData.h +++ b/code/MD4FileData.h @@ -46,9 +46,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "../include/assimp/types.h" -#include "../include/assimp/mesh.h" -#include "../include/assimp/anim.h" +#include +#include +#include #if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__) # pragma pack(push,1) diff --git a/code/MDLFileData.h b/code/MDLFileData.h index 1215b2a80..f9be6761b 100644 --- a/code/MDLFileData.h +++ b/code/MDLFileData.h @@ -709,7 +709,7 @@ struct GroupFrame SimpleFrame *frames; } PACK_STRUCT; -#include "./../include/assimp/Compiler/poppack1.h" +#include // ------------------------------------------------------------------------------------- /** \struct IntFace_MDL7 diff --git a/code/glTF2Asset.h b/code/glTF2Asset.h index d1a70ae0a..0def5b74d 100644 --- a/code/glTF2Asset.h +++ b/code/glTF2Asset.h @@ -170,7 +170,7 @@ namespace glTF2 #include #ifdef ASSIMP_API - #include "./../include/assimp/Compiler/pushpack1.h" + #include #endif //! For binary .glb files @@ -189,7 +189,7 @@ namespace glTF2 } PACK_STRUCT; #ifdef ASSIMP_API - #include "./../include/assimp/Compiler/poppack1.h" + #include #endif diff --git a/code/glTFAsset.h b/code/glTFAsset.h index bc79f72ec..b04692901 100644 --- a/code/glTFAsset.h +++ b/code/glTFAsset.h @@ -170,7 +170,7 @@ namespace glTF #define AI_GLB_MAGIC_NUMBER "glTF" #ifdef ASSIMP_API - #include "./../include/assimp/Compiler/pushpack1.h" + #include #endif //! For the KHR_binary_glTF extension (binary .glb file) @@ -185,7 +185,7 @@ namespace glTF } PACK_STRUCT; #ifdef ASSIMP_API - #include "./../include/assimp/Compiler/poppack1.h" + #include #endif diff --git a/include/assimp/irrXMLWrapper.h b/include/assimp/irrXMLWrapper.h index 70b20ebd3..296f26a32 100644 --- a/include/assimp/irrXMLWrapper.h +++ b/include/assimp/irrXMLWrapper.h @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // some long includes .... #include -#include "./../include/assimp/IOStream.hpp" +#include "IOStream.hpp" #include "BaseImporter.h" #include