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

Fixed building simple opengl texture example with mingw.

pull/185/head
Marcel Metz 2012-03-11 22:08:47 +01:00
parent 93fd1133ff
commit 07ab616644
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/SimpleTexturedOpenGL/CMakeLists.txt
View File

@ -22,8 +22,6 @@ INCLUDE_DIRECTORIES(
LINK_DIRECTORIES(
${Assimp_BINARY_DIR}
${Assimp_BINARY_DIR}/lib/
${Assimp_SOURCE_DIR}/samples/glut/
${Assimp_SOURCE_DIR}/samples/DevIL/lib/
)
ADD_EXECUTABLE( assimp_simpletexturedogl WIN32

10
samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
View File

@ -17,9 +17,9 @@
#include <windows.h>
#include <stdio.h>
#include <gl\GL.h>
#include <gl\GLU.h>
#include <IL\il.h>
#include <GL/gl.h>
#include <GL/glu.h>
#include <IL/il.h>
#include <fstream>
@ -30,8 +30,8 @@
// assimp include files. These three are usually needed.
#include "assimp/Importer.hpp" //OO version Header!
#include "assimp/PostProcess.h"
#include "assimp/Scene.h"
#include "assimp/postprocess.h"
#include "assimp/scene.h"
#include "assimp/DefaultLogger.hpp"
#include "assimp/LogStream.hpp"