diff options
Diffstat (limited to 'src/libjin/Graphics')
-rw-r--r-- | src/libjin/Graphics/Bitmap.h | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Canvas.cpp | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Canvas.h | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Color.h | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Drawable.cpp | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Drawable.h | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Font/TTF.cpp | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Font/TTF.h | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Graphics.h | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Shader/Shader.cpp | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Shader/Shader.h | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Shapes.cpp | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Shapes.h | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Texture.cpp | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Texture.h | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Window.cpp | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/Window.h | 5 |
17 files changed, 19 insertions, 18 deletions
diff --git a/src/libjin/Graphics/Bitmap.h b/src/libjin/Graphics/Bitmap.h index c983676..bb30bdc 100644 --- a/src/libjin/Graphics/Bitmap.h +++ b/src/libjin/Graphics/Bitmap.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_BITMAP_H #define __LIBJIN_BITMAP_H -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_RENDER #include "../Math/Vector2.hpp" diff --git a/src/libjin/Graphics/Canvas.cpp b/src/libjin/Graphics/Canvas.cpp index 11b2d77..f222721 100644 --- a/src/libjin/Graphics/Canvas.cpp +++ b/src/libjin/Graphics/Canvas.cpp @@ -1,4 +1,4 @@ -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_RENDER #include "../utils/macros.h" diff --git a/src/libjin/Graphics/Canvas.h b/src/libjin/Graphics/Canvas.h index 935a65e..0a261a8 100644 --- a/src/libjin/Graphics/Canvas.h +++ b/src/libjin/Graphics/Canvas.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_CANVAS_H #define __LIBJIN_CANVAS_H -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_RENDER #include "drawable.h" diff --git a/src/libjin/Graphics/Color.h b/src/libjin/Graphics/Color.h index 6c49691..2a6feca 100644 --- a/src/libjin/Graphics/Color.h +++ b/src/libjin/Graphics/Color.h @@ -3,7 +3,7 @@ */ #ifndef __LIBJIN_COLOR_H #define __LIBJIN_COLOR_H -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_RENDER #include "../utils/endian.h" diff --git a/src/libjin/Graphics/Drawable.cpp b/src/libjin/Graphics/Drawable.cpp index 947bb99..80a6cce 100644 --- a/src/libjin/Graphics/Drawable.cpp +++ b/src/libjin/Graphics/Drawable.cpp @@ -1,4 +1,4 @@ -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_RENDER #include "./Shader/Shader.h" diff --git a/src/libjin/Graphics/Drawable.h b/src/libjin/Graphics/Drawable.h index 31ee3c5..95af75e 100644 --- a/src/libjin/Graphics/Drawable.h +++ b/src/libjin/Graphics/Drawable.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_DRAWABLE #define __LIBJIN_DRAWABLE -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_RENDER #include "../math/Quad.h" diff --git a/src/libjin/Graphics/Font/TTF.cpp b/src/libjin/Graphics/Font/TTF.cpp index b90bbba..fe47630 100644 --- a/src/libjin/Graphics/Font/TTF.cpp +++ b/src/libjin/Graphics/Font/TTF.cpp @@ -1,4 +1,4 @@ -#include "../../jin_configuration.h" +#include "../../configuration.h" #if LIBJIN_MODULES_RENDER #include <stdio.h> diff --git a/src/libjin/Graphics/Font/TTF.h b/src/libjin/Graphics/Font/TTF.h index 8e9ed73..88ddfd6 100644 --- a/src/libjin/Graphics/Font/TTF.h +++ b/src/libjin/Graphics/Font/TTF.h @@ -1,6 +1,6 @@ #ifndef __LIBJINTTF_H #define __LIBJIN_TTF_H -#include "../../jin_configuration.h" +#include "../../configuration.h" #if LIBJIN_MODULES_RENDER #include <vector> diff --git a/src/libjin/Graphics/Graphics.h b/src/libjin/Graphics/Graphics.h index a173599..68579e5 100644 --- a/src/libjin/Graphics/Graphics.h +++ b/src/libjin/Graphics/Graphics.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_GRAPHICS_H #define __LIBJIN_GRAPHICS_H -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_RENDER #include "canvas.h" diff --git a/src/libjin/Graphics/Shader/Shader.cpp b/src/libjin/Graphics/Shader/Shader.cpp index 163ba92..877ef5b 100644 --- a/src/libjin/Graphics/Shader/Shader.cpp +++ b/src/libjin/Graphics/Shader/Shader.cpp @@ -1,5 +1,5 @@ #include <regex> -#include "../../jin_configuration.h" +#include "../../configuration.h" #if LIBJIN_MODULES_RENDER #include <iostream> diff --git a/src/libjin/Graphics/Shader/Shader.h b/src/libjin/Graphics/Shader/Shader.h index d1d843a..d91b539 100644 --- a/src/libjin/Graphics/Shader/Shader.h +++ b/src/libjin/Graphics/Shader/Shader.h @@ -1,7 +1,7 @@ #ifndef __LIBJIN_SHADER_H #define __LIBJIN_SHADER_H -#include "../../jin_configuration.h" +#include "../../configuration.h" #if defined(jin_graphics) && defined(jin_graphics_shader) #include <string> diff --git a/src/libjin/Graphics/Shapes.cpp b/src/libjin/Graphics/Shapes.cpp index b99c569..69eda70 100644 --- a/src/libjin/Graphics/Shapes.cpp +++ b/src/libjin/Graphics/Shapes.cpp @@ -1,4 +1,4 @@ -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_RENDER #include "./Shader/Shader.h" diff --git a/src/libjin/Graphics/Shapes.h b/src/libjin/Graphics/Shapes.h index 61efcfe..07e7567 100644 --- a/src/libjin/Graphics/Shapes.h +++ b/src/libjin/Graphics/Shapes.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_GEOMETRY_H #define __LIBJIN_GEOMETRY_H -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_RENDER #include "color.h" diff --git a/src/libjin/Graphics/Texture.cpp b/src/libjin/Graphics/Texture.cpp index 4af29a7..226187d 100644 --- a/src/libjin/Graphics/Texture.cpp +++ b/src/libjin/Graphics/Texture.cpp @@ -1,4 +1,4 @@ -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_RENDER #include <fstream> diff --git a/src/libjin/Graphics/Texture.h b/src/libjin/Graphics/Texture.h index 15fd78e..45f3f34 100644 --- a/src/libjin/Graphics/Texture.h +++ b/src/libjin/Graphics/Texture.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_TEXTURE_H #define __LIBJIN_TEXTURE_H -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_RENDER #include "../3rdparty/GLee/GLee.h" diff --git a/src/libjin/Graphics/Window.cpp b/src/libjin/Graphics/Window.cpp index 7f8f02d..1fd1f90 100644 --- a/src/libjin/Graphics/Window.cpp +++ b/src/libjin/Graphics/Window.cpp @@ -1,4 +1,4 @@ -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_RENDER #include <iostream> diff --git a/src/libjin/Graphics/Window.h b/src/libjin/Graphics/Window.h index 5871562..8d6c4f5 100644 --- a/src/libjin/Graphics/Window.h +++ b/src/libjin/Graphics/Window.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_RENDER_WINDOW #define __LIBJIN_RENDER_WINDOW -#include "../jin_configuration.h" +#include "../configuration.h" #if LIBJIN_MODULES_RENDER #include "SDL2/SDL.h" @@ -34,7 +34,8 @@ namespace jin void swapBuffers(); private: - SINGLETON(Window); + // declare a singleton + singleton(Window); Window() {}; |