v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for Linux build (debian etch, i386 32 bit) 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@44 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
DarkGuru 2008-05-27 18:58:36 +00:00
parent 70f155e515
commit ee3d3835bd
6 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/3DSLoader.h
View File

@ -246,7 +246,7 @@ protected:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
/** Clamp all indices in the file to a valid range /** Clamp all indices in the file to a valid range
*/ */
void Dot3DSImporter::CheckIndices(Dot3DS::Mesh* sMesh); void CheckIndices(Dot3DS::Mesh* sMesh);
protected: protected:

2
code/Assimp.cpp
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../include/assimp.h" #include "../include/assimp.h"
#include "../include/assimp.hpp" #include "../include/assimp.hpp"
#include "../include/aiassert.h" #include "../include/aiAssert.h"
using namespace Assimp; using namespace Assimp;
#if (defined AI_C_THREADSAFE) #if (defined AI_C_THREADSAFE)

2
code/ByteSwap.h
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_BYTESWAP_H_INC #ifndef AI_BYTESWAP_H_INC
#define AI_BYTESWAP_H_INC #define AI_BYTESWAP_H_INC
#include "..\include\aiAssert.h" #include "../include/aiAssert.h"
namespace Assimp namespace Assimp
{ {

2
code/DefaultLogger.cpp
View File

@ -221,9 +221,11 @@ void DefaultLogger::detatchStream( LogStream *pStream, unsigned int severity )
DefaultLogger::DefaultLogger( const std::string &name, LogSeverity severity ) : DefaultLogger::DefaultLogger( const std::string &name, LogSeverity severity ) :
m_Severity( severity ) m_Severity( severity )
{ {
#ifdef WIN32
m_Streams.push_back( new Win32DebugLogStream() ); m_Streams.push_back( new Win32DebugLogStream() );
if (name.empty()) if (name.empty())
return; return;
#endif
m_Streams.push_back( new FileLogStream( name ) ); m_Streams.push_back( new FileLogStream( name ) );
} }

2
code/PlyLoader.cpp
View File

@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/** @file Implementation of the PLY importer class */ /** @file Implementation of the PLY importer class */
#include "PLYLoader.h" #include "PlyLoader.h"
#include "MaterialSystem.h" #include "MaterialSystem.h"
#include "../include/IOStream.h" #include "../include/IOStream.h"

2
code/PlyParser.cpp
View File

@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/** @file Implementation of the PLY parser class */ /** @file Implementation of the PLY parser class */
#include "PLYLoader.h" #include "PlyLoader.h"
#include "MaterialSystem.h" #include "MaterialSystem.h"
#include "fast_atof.h" #include "fast_atof.h"
#include "../include/DefaultLogger.h" #include "../include/DefaultLogger.h"