ecere/gfx/newFonts: Standardized on _GLES for ES 1.1 and _GLES2 for ES 2.0

diff --git a/ecere/src/gfx/newFonts/drawManager.ec b/ecere/src/gfx/newFonts/drawManager.ec
index 4d81377..6540ab1 100644 (file)
--- a/ecere/src/gfx/newFonts/drawManager.ec
+++ b/ecere/src/gfx/newFonts/drawManager.ec
@@ -6,14 +6,14 @@ import "OpenGLDisplayDriver"
 #include <math.h>
 #include <stdlib.h>
 
-#if defined(_GLES)
-   #define ES1_1
-#else
+#if !defined(_GLES)
    #define SHADERS
 #endif
 
 #if defined(__EMSCRIPTEN__)
-   #define ES2
+#if !defined(_GLES2)
+   #define _GLES2
+#endif
    #include <GLES2/gl2.h>
 #endif
 

diff --git a/ecere/src/gfx/newFonts/fontRenderer.ec b/ecere/src/gfx/newFonts/fontRenderer.ec
index f950afb..458e502 100644 (file)
--- a/ecere/src/gfx/newFonts/fontRenderer.ec
+++ b/ecere/src/gfx/newFonts/fontRenderer.ec
@@ -10,9 +10,7 @@ import "Color"
 #include <math.h>
 #include <stdlib.h>
 
-#if defined(_GLES)
-   #define ES1_1
-#else
+#if !defined(_GLES)
    #define SHADERS
 #endif
 
@@ -26,7 +24,9 @@ import "Color"
 #endif
 
 #if defined(__EMSCRIPTEN__)
-   #define ES2
+#if !defined(_GLES2)
+   #define _GLES2
+#endif
    #include <GLES2/gl2.h>
 #endif
 

diff --git a/ecere/src/gfx/newFonts/textureManager.ec b/ecere/src/gfx/newFonts/textureManager.ec
index d485be9..96676ff 100644 (file)
--- a/ecere/src/gfx/newFonts/textureManager.ec
+++ b/ecere/src/gfx/newFonts/textureManager.ec
@@ -3,9 +3,7 @@ import "instance"
 #include <stdio.h>
 #include <math.h>
 
-#if defined(_GLES)
-   #define ES1_1
-#else
+#if !defined(_GLES)
    #define SHADERS
 #endif
 
@@ -18,7 +16,9 @@ import "instance"
 #endif
 
 #if defined(__EMSCRIPTEN__)
-   #define ES2
+#if !defined(_GLES2)
+   #define _GLES2
+#endif
    #include <GLES2/gl2.h>
 #endif