Merge pull request capstone-engine#2 from floooh/glfix

2 minor multiplatform fixes (GL renderer and NaCl)
sephiroth99 · Apr 17, 2015 · 57b8c45 · 57b8c45
2 parents 57a21fa + fdeb047
commit 57b8c45
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/src/tb/renderers/tb_renderer_gl.cpp b/src/tb/renderers/tb_renderer_gl.cpp
@@ -5,10 +5,13 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include "tb_types.h"
 #include "tb_renderer_gl.h"
 #include "tb_bitmap_fragment.h"
 #include "tb_system.h"
 
+#if defined(TB_RENDERER_GLES_1) || defined(TB_RENDERER_GL)
+
 namespace tb {
 
 #ifdef TB_RUNTIME_DEBUG_INFO
@@ -162,3 +165,4 @@ void TBRendererGL::SetClipRect(const TBRect &rect)
 }
 
 }; // namespace tb
+#endif // defined(TB_RENDERER_GLES_1) || defined(TB_RENDERER_GL)
diff --git a/src/tb/renderers/tb_renderer_gl.h b/src/tb/renderers/tb_renderer_gl.h
@@ -6,6 +6,9 @@
 #ifndef TB_RENDERER_GL_H
 #define TB_RENDERER_GL_H
 
+#include "renderers/tb_renderer_batcher.h"
+
+#if defined(TB_RENDERER_GLES_1) || defined(TB_RENDERER_GL)
 #ifdef TB_RENDERER_GLES_1
 #include <EGL/egl.h>
 #include <GLES/gl.h>
@@ -20,8 +23,6 @@
 #include <GL/gl.h>
 #endif
 
-#include "renderers/tb_renderer_batcher.h"
-
 namespace tb {
 
 class TBRendererGL;
@@ -62,4 +63,5 @@ class TBRendererGL : public TBRendererBatcher
 
 }; // namespace tb
 
+#endif // defined(TB_RENDERER_GLES_1) || defined(TB_RENDERER_GL)
 #endif // TB_RENDERER_GL_H
diff --git a/src/tb/tb_list.cpp b/src/tb/tb_list.cpp
@@ -7,7 +7,9 @@
 #include "tb_core.h"
 #include <assert.h>
 #include <stdlib.h>
+#if !defined(__native_client__)
 #include <memory.h>
+#endif
 
 namespace tb {
 

diff --git a/src/tb/tb_tempbuffer.cpp b/src/tb/tb_tempbuffer.cpp
@@ -6,7 +6,9 @@
 #include "tb_tempbuffer.h"
 #include <assert.h>
 #include <stdlib.h>
+#if !defined(__native_client__)
 #include <memory.h>
+#endif
 #include <string.h>
 
 namespace tb {