Browse Source

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
DarkGuru 17 years ago
parent
commit
ee3d3835bd
6 changed files with 7 additions and 5 deletions
  1. 1 1
      code/3DSLoader.h
  2. 1 1
      code/Assimp.cpp
  3. 1 1
      code/ByteSwap.h
  4. 2 0
      code/DefaultLogger.cpp
  5. 1 1
      code/PlyLoader.cpp
  6. 1 1
      code/PlyParser.cpp

+ 1 - 1
code/3DSLoader.h

@@ -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:

+ 1 - 1
code/Assimp.cpp

@@ -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)

+ 1 - 1
code/ByteSwap.h

@@ -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"
+#include "../include/aiAssert.h"
 
 namespace Assimp
 {

+ 2 - 0
code/DefaultLogger.cpp

@@ -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 ) );
 }

+ 1 - 1
code/PlyLoader.cpp

@@ -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"

+ 1 - 1
code/PlyParser.cpp

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