diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2017-09-21 23:42:30 +0100 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-09-21 23:42:30 +0100 |
| commit | 8a78e678b7df0bf8221280f0058e2db0381b3ffa (patch) | |
| tree | b51ff90408c1644ea703046a30a1bcbaf985e9a0 /yage | |
| parent | 3115da468b465238b5d5c09cc30352dcb3b00370 (diff) | |
| download | YAGE-8a78e678b7df0bf8221280f0058e2db0381b3ffa.tar.gz YAGE-8a78e678b7df0bf8221280f0058e2db0381b3ffa.zip | |
#11: Building, #10: Added GLFW
Diffstat (limited to 'yage')
| -rw-r--r-- | yage/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | yage/base/camera2d.cpp | 2 | ||||
| -rw-r--r-- | yage/base/glslprogram.cpp | 2 | ||||
| -rw-r--r-- | yage/base/glslprogram.h | 2 | ||||
| -rw-r--r-- | yage/base/sprite.h | 2 | ||||
| -rw-r--r-- | yage/base/spritebatch.h | 5 | ||||
| -rw-r--r-- | yage/base/texture.h | 2 | ||||
| -rw-r--r-- | yage/base/vertex.h | 2 |
8 files changed, 13 insertions, 11 deletions
diff --git a/yage/CMakeLists.txt b/yage/CMakeLists.txt index e274fca5..e9d4071b 100644 --- a/yage/CMakeLists.txt +++ b/yage/CMakeLists.txt @@ -22,10 +22,9 @@ add_library(${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - ${OPENGL_INCLUDE_DIR} - ${GLEW_INCLUDE_DIR}) + ${OPENGL_INCLUDE_DIR}) target_link_libraries(${PROJECT_NAME} ${OPENGL_gl_LIBRARY} - ${GLEW_LIBRARIES} - glfw) + glfw + glad) diff --git a/yage/base/camera2d.cpp b/yage/base/camera2d.cpp index e23b75fa..9eda38ee 100644 --- a/yage/base/camera2d.cpp +++ b/yage/base/camera2d.cpp @@ -8,7 +8,7 @@ #include "camera2d.h" -#include <GL/glew.h> +#include <glad/glad.h> namespace yage { diff --git a/yage/base/glslprogram.cpp b/yage/base/glslprogram.cpp index 131a1a28..cff84e40 100644 --- a/yage/base/glslprogram.cpp +++ b/yage/base/glslprogram.cpp @@ -6,7 +6,7 @@ * ---------------------------------------------------------------------------- */ -#include <yage/base/glslprogram.h> +#include "glslprogram.h" #include <fstream> #include <stdexcept> diff --git a/yage/base/glslprogram.h b/yage/base/glslprogram.h index fbe5ac5c..545dbe54 100644 --- a/yage/base/glslprogram.h +++ b/yage/base/glslprogram.h @@ -9,7 +9,7 @@ #ifndef GLSL_PROGRAM_H #define GLSL_PROGRAM_H -#include <GL/glew.h> +#include <glad/glad.h> #include <string> diff --git a/yage/base/sprite.h b/yage/base/sprite.h index ff893b53..725d2160 100644 --- a/yage/base/sprite.h +++ b/yage/base/sprite.h @@ -14,7 +14,7 @@ #include "texture.h" -#include <GL/glew.h> +#include <glad/glad.h> #include <string> diff --git a/yage/base/spritebatch.h b/yage/base/spritebatch.h index 7235bd25..3b4aca76 100644 --- a/yage/base/spritebatch.h +++ b/yage/base/spritebatch.h @@ -6,12 +6,15 @@ * ---------------------------------------------------------------------------- */ +/** @file + */ + #ifndef YAGE_SPRITE_BATCH_H #define YAGE_SPRITE_BATCH_H #include "vertex.h" -#include <GL/glew.h> +#include <glad/glad.h> #include <glm/glm.hpp> #include <vector> diff --git a/yage/base/texture.h b/yage/base/texture.h index 3688bf04..cc9dc857 100644 --- a/yage/base/texture.h +++ b/yage/base/texture.h @@ -9,7 +9,7 @@ #ifndef GL_TEXTURE_H #define GL_TEXTURE_H -#include <GL/glew.h> +#include <glad/glad.h> namespace yage { diff --git a/yage/base/vertex.h b/yage/base/vertex.h index 15b46ed9..586e8190 100644 --- a/yage/base/vertex.h +++ b/yage/base/vertex.h @@ -9,7 +9,7 @@ #ifndef VERTEX_H #define VERTEX_H -#include <GL/glew.h> +#include <glad/glad.h> namespace yage { |