From 81062e5e87bc2f34e295e39a95afb1da57d260cf Mon Sep 17 00:00:00 2001 From: krzys-h Date: Sat, 25 Oct 2014 12:44:52 +0200 Subject: Fixed linking convert_model (#332) --- src/graphics/engine/modelfile.cpp | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) (limited to 'src/graphics/engine') diff --git a/src/graphics/engine/modelfile.cpp b/src/graphics/engine/modelfile.cpp index 09c7bbd..c422f18 100644 --- a/src/graphics/engine/modelfile.cpp +++ b/src/graphics/engine/modelfile.cpp @@ -24,7 +24,9 @@ #include "common/logger.h" #include "common/stringutils.h" +#ifndef MODELFILE_NO_ENGINE #include "common/resources/inputstream.h" +#endif #include "graphics/engine/engine.h" @@ -436,13 +438,23 @@ bool CModelFile::ReadModel(const std::string& fileName) { m_triangles.clear(); + #ifndef MODELFILE_NO_ENGINE CInputStream stream; - stream.open(fileName.c_str()); + stream.open(fileName); if (!stream.is_open()) { GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); return false; } + #else + std::ifstream stream; + stream.open(fileName); + if (!stream.good()) + { + GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); + return false; + } + #endif return ReadModel(stream); } @@ -827,13 +839,23 @@ struct NewModelTriangle1 bool CModelFile::ReadTextModel(const std::string& fileName) { + #ifndef MODELFILE_NO_ENGINE CInputStream stream; - stream.open(fileName.c_str()); + stream.open(fileName); if (!stream.is_open()) { GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); return false; } + #else + std::ifstream stream; + stream.open(fileName); + if (!stream.good()) + { + GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); + return false; + } + #endif return ReadTextModel(stream); } @@ -1024,13 +1046,23 @@ bool CModelFile::WriteTextModel(std::ostream& stream) bool CModelFile::ReadBinaryModel(const std::string& fileName) { + #ifndef MODELFILE_NO_ENGINE CInputStream stream; - stream.open(fileName.c_str()); + stream.open(fileName); if (!stream.is_open()) { GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); return false; } + #else + std::ifstream stream; + stream.open(fileName); + if (!stream.good()) + { + GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); + return false; + } + #endif return ReadBinaryModel(stream); } -- cgit v1.2.3-1-g7c22