From 4a96cd428cd09d332713e74b8ef9fa9254b55797 Mon Sep 17 00:00:00 2001 From: zmertens Date: Tue, 31 Mar 2015 00:02:08 -0700 Subject: [PATCH] modified CMakeLists and fixed includes --- CMakeLists.txt | 2 +- includes/learnopengl/camera.h | 4 ++-- includes/learnopengl/model.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0c649a..8048b56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ list(APPEND CMAKE_CXX_FLAGS "-std=c++11") if(WIN32) set(LIBS glfw3 opengl32 glew32s SOIL assimp) elseif (UNIX) -set(LIBS gl X11 rt dl) +set(LIBS GL X11 glfw GLEW SOIL assimp rt dl) else() set(LIBS ) endif() diff --git a/includes/learnopengl/camera.h b/includes/learnopengl/camera.h index fb33122..0201154 100644 --- a/includes/learnopengl/camera.h +++ b/includes/learnopengl/camera.h @@ -4,7 +4,7 @@ #include // GL Includes -#include +#include #include #include @@ -130,4 +130,4 @@ private: this->Right = glm::normalize(glm::cross(this->Front, this->WorldUp)); // Normalize the vectors, because their length gets closer to 0 the more you look up or down which results in slower movement. this->Up = glm::normalize(glm::cross(this->Right, this->Front)); } -}; \ No newline at end of file +}; diff --git a/includes/learnopengl/model.h b/includes/learnopengl/model.h index d2c52b2..952f688 100644 --- a/includes/learnopengl/model.h +++ b/includes/learnopengl/model.h @@ -16,7 +16,7 @@ using namespace std; #include #include -#include "Mesh.h" +#include 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; -} \ No newline at end of file +}