Fix linux build

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@115 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
kimmi 2008-08-17 15:04:10 +00:00
parent 0ccf2dd60b
commit 51bfc46c1d
20 changed files with 49 additions and 38 deletions

View File

@ -556,6 +556,7 @@ public:
}; };
};}; } // Namespace ASE
} // Namespace ASSIMP
#endif // !! include guard #endif // !! include guard

View File

@ -136,7 +136,8 @@ public:
Swap8(fOut); Swap8(fOut);
} }
}; };
};
} // Namespace Assimp
// byteswap macros for BigEndian/LittleEndian support // byteswap macros for BigEndian/LittleEndian support
#if (defined AI_BUILD_BIG_ENDIAN) #if (defined AI_BUILD_BIG_ENDIAN)

View File

@ -45,7 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/aiMesh.h" #include "../include/aiMesh.h"
class GenNormalsTest; class GenNormalsTest;
namespace Assimp { namespace Assimp {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@ -102,6 +104,6 @@ private:
float configMaxAngle; float configMaxAngle;
}; };
}; // end of namespace Assimp } // end of namespace Assimp
#endif // !!AI_GENVERTEXNORMALPROCESS_H_INC #endif // !!AI_GENVERTEXNORMALPROCESS_H_INC

View File

@ -152,8 +152,8 @@ protected:
private: private:
}; };
}; // end of namespace Assimp
} // end of namespace Assimp
#endif // AI_HMPIMPORTER_H_INC #endif // AI_HMPIMPORTER_H_INC

View File

@ -142,5 +142,7 @@ struct Header_HL2
#include "./Compiler/poppack1.h" #include "./Compiler/poppack1.h"
};}; // end namespaces }
} // end namespaces
#endif // ! AI_MDLFILEHELPER2_H_INC #endif // ! AI_MDLFILEHELPER2_H_INC

View File

@ -81,6 +81,7 @@ public:
private: private:
bool KillMeshNormals (aiMesh* pcMesh); bool KillMeshNormals (aiMesh* pcMesh);
}; };
}; // end of namespace Assimp
} // end of namespace Assimp
#endif // !!AI_KILLNORMALPROCESS_H_INC #endif // !!AI_KILLNORMALPROCESS_H_INC

View File

@ -163,7 +163,7 @@ struct Skin
void LookupNormalIndex(uint8_t index,aiVector3D& vOut); void LookupNormalIndex(uint8_t index,aiVector3D& vOut);
}; }
}; }
#endif // !! include guard #endif // !! include guard

View File

@ -294,7 +294,7 @@ inline void Vec3NormalToLatLng( const aiVector3D& p_vIn, uint16_t& p_iOut )
} }
} }
}; }
}; }
#endif // !! AI_MD3FILEHELPER_H_INC #endif // !! AI_MD3FILEHELPER_H_INC

View File

@ -959,6 +959,7 @@ struct IntSplittedGroupData_MDL7
}; };
};}; // end namespaces }
} // end namespaces
#endif // !! AI_MDLFILEHELPER_H_INC #endif // !! AI_MDLFILEHELPER_H_INC

View File

@ -461,6 +461,7 @@ protected:
*/ */
unsigned int iFileSize; unsigned int iFileSize;
}; };
}; // end of namespace Assimp
} // end of namespace Assimp
#endif // AI_3DSIMPORTER_H_INC #endif // AI_3DSIMPORTER_H_INC

View File

@ -551,8 +551,8 @@ TYPE PLY::PropertyInstance::ConvertTo(
}; };
return (TYPE)0; return (TYPE)0;
} }
};
}; } // Namespace PLY
} // Namespace AssImp
#endif // !! include guard #endif // !! include guard

View File

@ -80,6 +80,7 @@ public:
*/ */
void Execute( aiScene* pScene); void Execute( aiScene* pScene);
}; };
}; // end of namespace Assimp
} // end of namespace Assimp
#endif // !!AI_REMOVEREDUNDANTMATERIALS_H_INC #endif // !!AI_REMOVEREDUNDANTMATERIALS_H_INC

View File

@ -166,7 +166,7 @@ struct Bone
bool bIsUsed; bool bIsUsed;
}; };
}; //! namespace SMD } //! namespace SMD
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/** Used to load Half-life 1 and 2 SMD models /** Used to load Half-life 1 and 2 SMD models
@ -416,6 +416,7 @@ private:
unsigned int iLineNumber; unsigned int iLineNumber;
}; };
}; // end of namespace Assimp
} // end of namespace Assimp
#endif // AI_SMDIMPORTER_H_INC #endif // AI_SMDIMPORTER_H_INC

View File

@ -97,7 +97,7 @@ protected:
Entry() { /** intentionally not initialized.*/ } Entry() { /** intentionally not initialized.*/ }
Entry( unsigned int pIndex, const aiVector3D& pPosition, float pDistance) Entry( unsigned int pIndex, const aiVector3D& pPosition, float pDistance)
: mPosition( pPosition), mIndex( pIndex), mDistance( pDistance) : mIndex( pIndex), mPosition( pPosition), mDistance( pDistance)
{ } { }
bool operator < (const Entry& e) const { return mDistance < e.mDistance; } bool operator < (const Entry& e) const { return mDistance < e.mDistance; }

View File

@ -202,6 +202,6 @@ public:
const Dot3DS::Material* pcMatIn); const Dot3DS::Material* pcMatIn);
}; };
}; }
#endif //! AI_TEXTURE_TRANSFORM_H_INCLUDED #endif //! AI_TEXTURE_TRANSFORM_H_INCLUDED

View File

@ -76,7 +76,7 @@ enum aiPropertyTypeInfo
/** Simple binary buffer /** Simple binary buffer
*/ */
aiPTI_Buffer = 0x5, aiPTI_Buffer = 0x5
}; };
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

View File

@ -173,7 +173,7 @@ enum aiPostProcessSteps
* The step inverts all infacing normals. Generally it is recommended * The step inverts all infacing normals. Generally it is recommended
* to enable this step. * to enable this step.
*/ */
aiProcess_FixInfacingNormals = 0x2000, aiProcess_FixInfacingNormals = 0x2000
}; };

View File

@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace Assimp namespace Assimp
{ {
class Importer; class Importer;
}; }
// internal ASSIMP headers - for plugin development // internal ASSIMP headers - for plugin development
#include "./../code/BaseImporter.h" #include "./../code/BaseImporter.h"