summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-20 16:39:30 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-20 16:39:30 +0300
commitd34ed15b68108f92ce368c7878defc72ec046ee0 (patch)
tree89438b93b4e6bbb8e721601db55dd9267e19f741
parentdcd7364559e20e7d89ffeee0740b60a65c8d5362 (diff)
downloadmv-d34ed15b68108f92ce368c7878defc72ec046ee0.tar.gz
mv-d34ed15b68108f92ce368c7878defc72ec046ee0.tar.bz2
mv-d34ed15b68108f92ce368c7878defc72ec046ee0.tar.xz
mv-d34ed15b68108f92ce368c7878defc72ec046ee0.zip
Move OpenGLX related files into openglx directory.
-rw-r--r--src/CMakeLists.txt12
-rw-r--r--src/Makefile.am12
-rw-r--r--src/render/graphics.cpp2
-rw-r--r--src/render/openglx/mglx.cpp (renamed from src/render/mglx.cpp)4
-rw-r--r--src/render/openglx/mglx.h (renamed from src/render/mglx.h)10
-rw-r--r--src/render/openglx/mglx.hpp (renamed from src/render/mglx.hpp)0
-rw-r--r--src/render/openglx/mglxinit.cpp (renamed from src/render/mglxinit.cpp)8
-rw-r--r--src/render/openglx/mglxinit.h (renamed from src/render/mglxinit.h)6
-rw-r--r--src/render/openglx/mglxtypes.h (renamed from src/render/mglxtypes.h)6
-rw-r--r--src/utils/glxhelper.cpp6
10 files changed, 33 insertions, 33 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 020a54100..d4dc28821 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1022,12 +1022,12 @@ SET(SRCS
render/opengl/mglemu.h
render/opengl/mglfunctions.h
render/opengl/mgltypes.h
- render/mglx.cpp
- render/mglx.h
- render/mglx.hpp
- render/mglxinit.cpp
- render/mglxinit.h
- render/mglxtypes.h
+ render/openglx/mglx.cpp
+ render/openglx/mglx.h
+ render/openglx/mglx.hpp
+ render/openglx/mglxinit.cpp
+ render/openglx/mglxinit.h
+ render/openglx/mglxtypes.h
render/mobileopengl2graphics.cpp
render/mobileopengl2graphics.h
render/mobileopenglgraphics.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 0a4ae4081..a69806946 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -527,12 +527,12 @@ SRC += events/actionevent.h \
render/opengl/mglemu.h \
render/opengl/mglfunctions.h \
render/opengl/mgltypes.h \
- render/mglx.cpp \
- render/mglx.h \
- render/mglx.hpp \
- render/mglxinit.cpp \
- render/mglxinit.h \
- render/mglxtypes.h \
+ render/openglx/mglx.cpp \
+ render/openglx/mglx.h \
+ render/openglx/mglx.hpp \
+ render/openglx/mglxinit.cpp \
+ render/openglx/mglxinit.h \
+ render/openglx/mglxtypes.h \
render/mobileopengl2graphics.cpp \
render/mobileopengl2graphics.h \
render/mobileopenglgraphics.cpp \
diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp
index d43c8bdc8..127a54bc4 100644
--- a/src/render/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -71,7 +71,7 @@
#endif
#if defined(USE_OPENGL) && defined(USE_X11)
-#include "render/mglxinit.h"
+#include "render/openglx/mglxinit.h"
#endif
#include "resources/imagehelper.h"
diff --git a/src/render/mglx.cpp b/src/render/openglx/mglx.cpp
index 38821152a..773192423 100644
--- a/src/render/mglx.cpp
+++ b/src/render/openglx/mglx.cpp
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "render/mglx.h"
+#include "render/openglx/mglx.h"
#if defined(USE_OPENGL) && defined(USE_X11)
@@ -27,6 +27,6 @@
#define defName(name) name##_t m##name = nullptr
// include function defines
-#include "render/mglx.hpp"
+#include "render/openglx/mglx.hpp"
#endif
diff --git a/src/render/mglx.h b/src/render/openglx/mglx.h
index 575041a94..591626bca 100644
--- a/src/render/mglx.h
+++ b/src/render/openglx/mglx.h
@@ -18,18 +18,18 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RENDER_MGLX_H
-#define RENDER_MGLX_H
+#ifndef RENDER_OPENGLX_MGLX_H
+#define RENDER_OPENGLX_MGLX_H
#include "main.h"
#if defined(USE_OPENGL) && defined(USE_X11)
-#include "render/mglxtypes.h"
+#include "render/openglx/mglxtypes.h"
#define defName(name) extern name##_t m##name
-#include "render/mglx.hpp"
+#include "render/openglx/mglx.hpp"
#undef defName
#endif // defined(USE_OPENGL) && defined(USE_X11)
-#endif // RENDER_MGLX_H
+#endif // RENDER_OPENGLX_MGLX_H
diff --git a/src/render/mglx.hpp b/src/render/openglx/mglx.hpp
index b62dd25f4..b62dd25f4 100644
--- a/src/render/mglx.hpp
+++ b/src/render/openglx/mglx.hpp
diff --git a/src/render/mglxinit.cpp b/src/render/openglx/mglxinit.cpp
index 86d8b8d69..09ab8d4fe 100644
--- a/src/render/mglxinit.cpp
+++ b/src/render/openglx/mglxinit.cpp
@@ -18,15 +18,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "render/mglxinit.h"
+#include "render/openglx/mglxinit.h"
#if defined(USE_OPENGL) && defined(USE_X11)
-#include "render/mglx.h"
-#include "render/mglxtypes.h"
-
#include "render/opengl/mglfunctions.h"
+#include "render/openglx/mglx.h"
+#include "render/openglx/mglxtypes.h"
+
#include "debug.h"
void Glx::initFunctions()
diff --git a/src/render/mglxinit.h b/src/render/openglx/mglxinit.h
index 7d9503299..512efdf7e 100644
--- a/src/render/mglxinit.h
+++ b/src/render/openglx/mglxinit.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RENDER_MGLXINIT_H
-#define RENDER_MGLXINIT_H
+#ifndef RENDER_OPENGLX_MGLXINIT_H
+#define RENDER_OPENGLX_MGLXINIT_H
#include "main.h"
#if defined(USE_OPENGL) && defined(USE_X11)
@@ -30,4 +30,4 @@ namespace Glx
} // namespace Glx
#endif // defined(USE_OPENGL) && defined(USE_X11)
-#endif // RENDER_MGLXINIT_H
+#endif // RENDER_OPENGLX_MGLXINIT_H
diff --git a/src/render/mglxtypes.h b/src/render/openglx/mglxtypes.h
index c639a7d80..79b4afd7a 100644
--- a/src/render/mglxtypes.h
+++ b/src/render/openglx/mglxtypes.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RENDER_MGLXTYPES_H
-#define RENDER_MGLXTYPES_H
+#ifndef RENDER_OPENGLX_MGLXTYPES_H
+#define RENDER_OPENGLX_MGLXTYPES_H
#include "main.h"
@@ -48,4 +48,4 @@ typedef bool (*glXMakeCurrent_t) (Display *dpy,
typedef void (*glXSwapBuffers_t) (Display *dpy, GLXDrawable drawable);
#endif // USE_OPENGL
-#endif // RENDER_MGLXTYPES_H
+#endif // RENDER_OPENGLX_MGLXTYPES_H
diff --git a/src/utils/glxhelper.cpp b/src/utils/glxhelper.cpp
index 685f01760..c5fb54d86 100644
--- a/src/utils/glxhelper.cpp
+++ b/src/utils/glxhelper.cpp
@@ -24,12 +24,12 @@
#include "logger.h"
-#include "render/mglx.h"
-#include "render/mglxtypes.h"
-
#include "render/opengl/mglcheck.h"
#include "render/opengl/mgldefines.h"
+#include "render/openglx/mglx.h"
+#include "render/openglx/mglxtypes.h"
+
#include "utils/stringutils.h"
#include "debug.h"