diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-05-18 20:38:12 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-05-18 20:38:12 +0300 |
commit | 4a358a9cd37d87d3efa06d4add22ac40221d28b1 (patch) | |
tree | 1b20308c7214ccc8570194105b27bcdff5a7ae2c | |
parent | 8a60936c31675c60810a880b37e529e3fbcd2846 (diff) | |
download | manaverse-4a358a9cd37d87d3efa06d4add22ac40221d28b1.tar.gz manaverse-4a358a9cd37d87d3efa06d4add22ac40221d28b1.tar.bz2 manaverse-4a358a9cd37d87d3efa06d4add22ac40221d28b1.tar.xz manaverse-4a358a9cd37d87d3efa06d4add22ac40221d28b1.zip |
Move rendertype into separate file.
-rw-r--r-- | src/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/render/renderers.h | 11 | ||||
-rw-r--r-- | src/render/rendertype.h | 35 |
4 files changed, 38 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1440b8925..81c457984 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -823,6 +823,7 @@ SET(SRCS render/renderers.h render/rendererslistsdl.h render/rendererslistsdl2.h + render/rendertype.h particle/particle.cpp particle/particle.h particle/particlecontainer.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 638eaeb25..a845cb34e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -925,6 +925,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ render/renderers.h \ render/rendererslistsdl.h \ render/rendererslistsdl2.h \ + render/rendertype.h \ particle/particle.cpp \ particle/particle.h \ particle/particlecontainer.cpp \ diff --git a/src/render/renderers.h b/src/render/renderers.h index 2f15f7b51..5c06c879a 100644 --- a/src/render/renderers.h +++ b/src/render/renderers.h @@ -21,16 +21,7 @@ #ifndef RENDER_RENDERERS_H #define RENDER_RENDERERS_H -enum RenderType -{ - RENDER_SOFTWARE = 0, - RENDER_NORMAL_OPENGL = 1, - RENDER_SAFE_OPENGL = 2, - RENDER_GLES_OPENGL = 3, - RENDER_SDL2_DEFAULT = 4, - RENDER_NULL = 5, - RENDER_LAST -}; +#include "render/rendertype.h" RenderType intToRenderType(const int mode); diff --git a/src/render/rendertype.h b/src/render/rendertype.h new file mode 100644 index 000000000..cb4150188 --- /dev/null +++ b/src/render/rendertype.h @@ -0,0 +1,35 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef RENDER_RENDERTYPE_H +#define RENDER_RENDERTYPE_H + +enum RenderType +{ + RENDER_SOFTWARE = 0, + RENDER_NORMAL_OPENGL = 1, + RENDER_SAFE_OPENGL = 2, + RENDER_GLES_OPENGL = 3, + RENDER_SDL2_DEFAULT = 4, + RENDER_NULL = 5, + RENDER_LAST +}; + +#endif // RENDER_RENDERTYPE_H |