From 07ab616644710a431d757cf10503466d4ab1df2c Mon Sep 17 00:00:00 2001 From: Marcel Metz Date: Sun, 11 Mar 2012 22:08:47 +0100 Subject: [PATCH] Fixed building simple opengl texture example with mingw. --- samples/SimpleTexturedOpenGL/CMakeLists.txt | 2 -- .../SimpleTexturedOpenGL/src/model_loading.cpp | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/samples/SimpleTexturedOpenGL/CMakeLists.txt b/samples/SimpleTexturedOpenGL/CMakeLists.txt index 33edd38ce..083e22e6e 100644 --- a/samples/SimpleTexturedOpenGL/CMakeLists.txt +++ b/samples/SimpleTexturedOpenGL/CMakeLists.txt @@ -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 diff --git a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp index 42f468ea1..e0d0a629c 100644 --- a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp +++ b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp @@ -17,9 +17,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include @@ -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"