mirror of
https://github.com/JoeyDeVries/LearnOpenGL.git
synced 2026-01-30 20:13:22 +08:00
Merge pull request #2 from zwookie/single_cmake_linux
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>
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user