modified CMakeLists and fixed includes

This commit is contained in:
zmertens
2015-03-31 00:02:08 -07:00
parent 18cc43ad85
commit 4a96cd428c
3 changed files with 5 additions and 5 deletions

View File

@@ -16,7 +16,7 @@ using namespace std;
#include <assimp/scene.h>
#include <assimp/postprocess.h>
#include "Mesh.h"
#include <learnopengl/mesh.h>
GLint TextureFromFile(const char* path, string directory);
@@ -208,4 +208,4 @@ GLint TextureFromFile(const char* path, string directory)
glBindTexture(GL_TEXTURE_2D, 0);
SOIL_free_image_data(image);
return textureID;
}
}