summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/Makefile.am6
-rw-r--r--src/render/graphics.cpp4
-rw-r--r--src/render/nacl/naclfunctions.h (renamed from src/render/naclfunctions.h)6
-rw-r--r--src/render/nacl/naclgles.cpp (renamed from src/render/naclgles.cpp)2
-rw-r--r--src/render/nacl/naclgles.h (renamed from src/render/naclgles.h)6
6 files changed, 15 insertions, 15 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d4dc28821..89e3cb267 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1034,9 +1034,9 @@ SET(SRCS
render/mobileopenglgraphics.h
render/modernopenglgraphics.cpp
render/modernopenglgraphics.h
- render/naclfunctions.h
- render/naclgles.cpp
- render/naclgles.h
+ render/nacl/naclfunctions.h
+ render/nacl/naclgles.cpp
+ render/nacl/naclgles.h
input/mouseinput.h
mumblemanager.cpp
mumblemanager.h
diff --git a/src/Makefile.am b/src/Makefile.am
index a69806946..8a26916fb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -539,9 +539,9 @@ SRC += events/actionevent.h \
render/mobileopenglgraphics.h \
render/modernopenglgraphics.cpp \
render/modernopenglgraphics.h \
- render/naclfunctions.h \
- render/naclgles.cpp \
- render/naclgles.h \
+ render/nacl/naclfunctions.h \
+ render/nacl/naclgles.cpp \
+ render/nacl/naclgles.h \
render/opengl/naclglfunctions.h \
render/normalopenglgraphics.cpp \
render/normalopenglgraphics.h \
diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp
index 127a54bc4..a879d96a4 100644
--- a/src/render/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -81,8 +81,8 @@
#include "resources/safeopenglimagehelper.h"
#endif // ANDROID
#ifdef __native_client__
-#include "render/naclfunctions.h"
-#include "render/naclgles.h"
+#include "render/nacl/naclfunctions.h"
+#include "render/nacl/naclgles.h"
#endif // __native_client__
#endif // USE_OPENGL
diff --git a/src/render/naclfunctions.h b/src/render/nacl/naclfunctions.h
index 940d02015..212970776 100644
--- a/src/render/naclfunctions.h
+++ b/src/render/nacl/naclfunctions.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RENDER_NACLFUNCTIONS_H
-#define RENDER_NACLFUNCTIONS_H
+#ifndef RENDER_NACL_NACLFUNCTIONS_H
+#define RENDER_NACL_NACLFUNCTIONS_H
#if defined(__native_client__) && defined(USE_OPENGL)
@@ -32,4 +32,4 @@ extern PP_Resource gles2Context;
graphics3dInterface->ResizeBuffers(gles2Context, __VA_ARGS__)
#endif // defined(__native_client__) && defined(USE_OPENGL)
-#endif // RENDER_NACLFUNCTIONS_H
+#endif // RENDER_NACL_NACLFUNCTIONS_H
diff --git a/src/render/naclgles.cpp b/src/render/nacl/naclgles.cpp
index be8ebc184..44020386d 100644
--- a/src/render/naclgles.cpp
+++ b/src/render/nacl/naclgles.cpp
@@ -20,7 +20,7 @@
#if defined(__native_client__) && defined(USE_OPENGL)
-#include "render/naclgles.h"
+#include "render/nacl/naclgles.h"
#include "logger.h"
diff --git a/src/render/naclgles.h b/src/render/nacl/naclgles.h
index aaa4459d2..cba5d1403 100644
--- a/src/render/naclgles.h
+++ b/src/render/nacl/naclgles.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RENDER_NACLGLES_H
-#define RENDER_NACLGLES_H
+#ifndef RENDER_NACL_NACLGLES_H
+#define RENDER_NACL_NACLGLES_H
#if defined(__native_client__) && defined(USE_OPENGL)
@@ -29,4 +29,4 @@ namespace NaclGles
} // namespace NaclGles
#endif // defined(__native_client__) && defined(USE_OPENGL)
-#endif // RENDER_NACLGLES_H
+#endif // RENDER_NACL_NACLGLES_H