git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@44 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
@@ -246,7 +246,7 @@ protected:
// -------------------------------------------------------------------
/** Clamp all indices in the file to a valid range
*/
- void Dot3DSImporter::CheckIndices(Dot3DS::Mesh* sMesh);
+ void CheckIndices(Dot3DS::Mesh* sMesh);
protected:
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../include/assimp.h"
#include "../include/assimp.hpp"
-#include "../include/aiassert.h"
+#include "../include/aiAssert.h"
using namespace Assimp;
#if (defined AI_C_THREADSAFE)
@@ -43,7 +43,7 @@ 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"
namespace Assimp
{
@@ -221,9 +221,11 @@ void DefaultLogger::detatchStream( LogStream *pStream, unsigned int severity )
DefaultLogger::DefaultLogger( const std::string &name, LogSeverity severity ) :
m_Severity( severity )
+#ifdef WIN32
m_Streams.push_back( new Win32DebugLogStream() );
if (name.empty())
return;
+#endif
m_Streams.push_back( new FileLogStream( name ) );
}
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/** @file Implementation of the PLY importer class */
-#include "PLYLoader.h"
+#include "PlyLoader.h"
#include "MaterialSystem.h"
#include "../include/IOStream.h"
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/** @file Implementation of the PLY parser class */
#include "fast_atof.h"
#include "../include/DefaultLogger.h"