diff --git a/code/ACLoader.cpp b/code/ACLoader.cpp index 558d2351f..f0791d63c 100644 --- a/code/ACLoader.cpp +++ b/code/ACLoader.cpp @@ -611,7 +611,12 @@ void AC3DImporter::InternReadFile( const std::string& pFile, // print the file format version to the console unsigned int version = HexDigitToDecimal( buffer[4] ); - char msg[3];::_itoa(version,msg,10); + char msg[3]; + #if defined(_MSC_VER) + ::_itoa(version,msg,10); + #else + snprintf(msg, 3, "%d", version); //itoa is not available under linux + #endif DefaultLogger::get()->info(std::string("AC3D file format version: ") + msg); std::vector materials; diff --git a/code/Importer.cpp b/code/Importer.cpp index 5792d210f..2f5888942 100644 --- a/code/Importer.cpp +++ b/code/Importer.cpp @@ -105,10 +105,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # include "NFFLoader.h" #endif #ifndef AI_BUILD_NO_RAW_IMPORTER -# include "RAWLoader.h" +# include "RawLoader.h" #endif #ifndef AI_BUILD_NO_OFF_IMPORTER -# include "OffLoader.h" +# include "OFFLoader.h" #endif #ifndef AI_BUILD_NO_AC_IMPORTER # include "ACLoader.h" diff --git a/code/SortByPTypeProcess.cpp b/code/SortByPTypeProcess.cpp index 7f1fb742f..75e65d914 100644 --- a/code/SortByPTypeProcess.cpp +++ b/code/SortByPTypeProcess.cpp @@ -132,7 +132,11 @@ void DeterminePTypeHelperProcess::Execute( aiScene* pScene) if (deg) { char s[64]; - ::_itoa(deg,s,10); + #if defined(_MSC_VER) + ::_itoa(deg,s,10); + #else + snprintf(s, 64, "%d", deg); //itoa is not available under linux + #endif DefaultLogger::get()->warn(std::string("Found ") + s + " degenerated primitives"); } } diff --git a/code/aiAssert.cpp b/code/aiAssert.cpp index 47c2fa189..f71ec6366 100644 --- a/code/aiAssert.cpp +++ b/code/aiAssert.cpp @@ -1,5 +1,5 @@ -#include "assimpPCH.h" +#include "AssimpPCH.h" #include "../include/aiAssert.h" #ifdef _WIN32