mirror of
https://github.com/JoeyDeVries/LearnOpenGL.git
synced 2026-01-02 04:37:54 +08:00
modified CMakeLists and fixed includes
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <vector>
|
||||
|
||||
// GL Includes
|
||||
#include <GL\glew.h>
|
||||
#include <GL/glew.h>
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user