From: Peter Schaefer <schaeferpm@gmail.com>
Date: Fri, 3 Apr 2015 15:46:43 +0000 (+0200)
Subject: included old Assimp DLL & LIB
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=0b8d814d6aa1507c71f211d7e07c260d028bb2c4;p=cgue_weave.git

included old Assimp DLL & LIB
---

diff --git a/Weave/Graphix/Model.cpp b/Weave/Graphix/Model.cpp
index fcc705a..d75258e 100644
--- a/Weave/Graphix/Model.cpp
+++ b/Weave/Graphix/Model.cpp
@@ -1,9 +1,9 @@
 #include "Model.h"
 
 #include <GL/glew.h>
-//#include <assimp/Importer.hpp>
-//#include <assimp/scene.h>
-//#include <assimp/postprocess.h>
+#include <assimp/Importer.hpp>
+#include <assimp/scene.h>
+#include <assimp/postprocess.h>
 
 #include "Shader.h"
 #include "../Message.h"
@@ -125,7 +125,7 @@ void Model::bindBuffer(const uint &buffer,const uint index,const uint dim)
 
 bool Model::import(const string& path,uint& numvertices, uint& numfaces, float*& vertex, float*& uvs, float*& normals, uint*& index)
 {
-	//Assimp::Importer importer;
+	Assimp::Importer importer;
 
 	//const aiScene* scene = importer.ReadFile(path, aiProcess_GenUVCoords | aiProcess_Triangulate | aiProcess_JoinIdenticalVertices | aiProcess_SortByPType);
 	//if (!scene)
diff --git a/Weave/Weave.vcxproj b/Weave/Weave.vcxproj
index 58525c7..916439a 100644
--- a/Weave/Weave.vcxproj
+++ b/Weave/Weave.vcxproj
@@ -61,7 +61,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)lib\$(PlatformTarget);$(SolutionDir)lib</AdditionalLibraryDirectories>
       <AdditionalDependencies>OpenGL32.lib;SDL2.lib;SDL2main.lib;freetype.lib;zdll.lib;glew32.lib;FreeImage.lib;assimp.lib</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>msvcrt</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='bin|Win32'">
@@ -82,7 +83,8 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(SolutionDir)lib\$(PlatformTarget);$(SolutionDir)lib</AdditionalLibraryDirectories>
       <AdditionalDependencies>OpenGL32.lib;SDL2.lib;SDL2main.lib;freetype.lib;zdll.lib;glew32.lib;FreeImage.lib;assimp.lib</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>msvcrt</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/bin/Assimp32.dll b/bin/Assimp32.dll
new file mode 100644
index 0000000..216f66e
Binary files /dev/null and b/bin/Assimp32.dll differ
diff --git a/bin/assimp.dll b/bin/assimp.dll
deleted file mode 100644
index ccb9121..0000000
Binary files a/bin/assimp.dll and /dev/null differ
diff --git a/lib/x86/assimp.lib b/lib/x86/assimp.lib
index af50e7c..e67b84b 100644
Binary files a/lib/x86/assimp.lib and b/lib/x86/assimp.lib differ