glide: Rename some glitch source files for clarity.

main.h -> glitchmain.h glState.cpp -> OGLESwrappers.h
mupen64plus-ae · Jan 7, 2015 · 12af19b · 12af19b
1 parent 6c2cc67
commit 12af19b
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 9 deletions.
diff --git a/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLEScombiner.cpp b/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLEScombiner.cpp
@@ -27,7 +27,7 @@
 #include <math.h>
 #include <stdio.h>
 #include "glide.h"
-#include "main.h"
+#include "glitchmain.h"
 
 #include "../Glide64/winlnxdefs.h"
 #include "../Glide64/rdp.h" // for settings

diff --git a/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLESgeometry.cpp b/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLESgeometry.cpp
@@ -24,7 +24,7 @@
 #include <windows.h>
 #endif // _WIN32
 #include "glide.h"
-#include "main.h"
+#include "glitchmain.h"
 #include "../Glide64/winlnxdefs.h"
 #include "../Glide64/rdp.h"
 

diff --git a/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLESglitchmain.cpp b/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLESglitchmain.cpp
@@ -36,7 +36,7 @@
 #include <math.h>
 #include "glide.h"
 #include "g3ext.h"
-#include "main.h"
+#include "glitchmain.h"
 #include "m64p.h"
 
 #define OPENGL_CHECK_ERRORS { const GLenum errcode = glGetError(); if (errcode != GL_NO_ERROR) LOG("OpenGL Error code %i in '%s' line %i\n", errcode, __FILE__, __LINE__-1); }

diff --git a/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLEStextures.cpp b/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLEStextures.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #endif // _WIN32
 #include "glide.h"
-#include "main.h"
+#include "glitchmain.h"
 #include <stdio.h>
 
 /* Napalm extensions to GrTextureFormat_t */

diff --git a/...video-glide64mk2/src/Glitch64/glState.cpp → ...o-glide64mk2/src/Glitch64/OGLESwrappers.h b/...video-glide64mk2/src/Glitch64/glState.cpp → ...o-glide64mk2/src/Glitch64/OGLESwrappers.h
diff --git a/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLcombiner.cpp b/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLcombiner.cpp
@@ -27,7 +27,7 @@
 #include <math.h>
 #include <stdio.h>
 #include "glide.h"
-#include "main.h"
+#include "glitchmain.h"
 
 static int fct[4], source0[4], operand0[4], source1[4], operand1[4], source2[4], operand2[4];
 static int fcta[4],sourcea0[4],operanda0[4],sourcea1[4],operanda1[4],sourcea2[4],operanda2[4];

diff --git a/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLgeometry.cpp b/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLgeometry.cpp
@@ -23,7 +23,7 @@
 #include <windows.h>
 #endif // _WIN32
 #include "glide.h"
-#include "main.h"
+#include "glitchmain.h"
 #include "../Glide64/winlnxdefs.h"
 #include "../Glide64/rdp.h"
 

diff --git a/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLglitchmain.cpp b/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLglitchmain.cpp
@@ -36,7 +36,7 @@
 #include <math.h>
 #include "glide.h"
 #include "g3ext.h"
-#include "main.h"
+#include "glitchmain.h"
 #include "m64p.h"
 
 #ifdef VPDEBUG

diff --git a/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLtextures.cpp b/jni/mupen64plus-video-glide64mk2/src/Glitch64/OGLtextures.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #endif // _WIN32
 #include "glide.h"
-#include "main.h"
+#include "glitchmain.h"
 #include <stdio.h>
 
 /* Napalm extensions to GrTextureFormat_t */

diff --git a/...plus-video-glide64mk2/src/Glitch64/main.h → ...ideo-glide64mk2/src/Glitch64/glitchmain.h b/...plus-video-glide64mk2/src/Glitch64/main.h → ...ideo-glide64mk2/src/Glitch64/glitchmain.h
@@ -116,6 +116,7 @@ extern "C" {
 #error SDL is not build with OpenGL ES2 support. Try USE_GLES=0
 #endif
 #include <SDL_opengles2.h>
+#include "OGLESwrappers.h"
 #else
 #ifndef SDL_VIDEO_OPENGL
 #error SDL is not build with OpenGL support. Try USE_GLES=1
@@ -124,7 +125,6 @@ extern "C" {
 #endif
 #endif // _WIN32
 #include "glide.h"
-#include "glState.cpp"
 
 void display_warning(const unsigned char *text, ...);
 void display_warning(const char *text, ...);