diff options
author | chai <chaifix@163.com> | 2018-11-16 00:24:51 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2018-11-16 00:24:51 +0800 |
commit | 831e814ce9bdb84e86c06c4a52008f6bdaaa00d6 (patch) | |
tree | f91fccc7d2628d6e0a39886134b2bb174f5eede4 /src/libjin/Graphics/je_texture.h | |
parent | 6dc75930fe5fe02f1af5489917752d315cf9e48f (diff) |
*合并master到minimal分支
Diffstat (limited to 'src/libjin/Graphics/je_texture.h')
-rw-r--r-- | src/libjin/Graphics/je_texture.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libjin/Graphics/je_texture.h b/src/libjin/Graphics/je_texture.h index ddc8cfc..566ba84 100644 --- a/src/libjin/Graphics/je_texture.h +++ b/src/libjin/Graphics/je_texture.h @@ -1,9 +1,9 @@ -#ifndef __JE_TEXTURE_H -#define __JE_TEXTURE_H +#ifndef __JE_TEXTURE_H__ +#define __JE_TEXTURE_H__ #include "../core/je_configuration.h" #if defined(jin_graphics) -#include "../3rdparty/GLee/GLee.h" +#include "GLee/GLee.h" #include "je_color.h" #include "je_graphic.h" @@ -17,7 +17,8 @@ namespace JinEngine /// /// /// - class Texture: public Graphic + class Texture + : public Graphic { public: /// @@ -53,4 +54,4 @@ namespace JinEngine #endif // jin_graphics -#endif // __JE_TEXTURE_H
\ No newline at end of file +#endif // __JE_TEXTURE_H__
\ No newline at end of file |