ecere/gfx/newFonts: Updating to use "gl123es.h" header and added missing namespaces

diff --git a/ecere/src/gfx/newFonts/atlasBuilder.ec b/ecere/src/gfx/newFonts/atlasBuilder.ec
index 2ee8353..183c125 100644 (file)
--- a/ecere/src/gfx/newFonts/atlasBuilder.ec
+++ b/ecere/src/gfx/newFonts/atlasBuilder.ec
@@ -5,6 +5,8 @@
  * *****************************************************************************/
 import "instance"
 
+namespace gfx;
+
 struct AtlasNode { short x, y, width; };
 
 class AtlasBuilder

diff --git a/ecere/src/gfx/newFonts/drawManager.ec b/ecere/src/gfx/newFonts/drawManager.ec
index 4ef28e5..fb71490 100644 (file)
--- a/ecere/src/gfx/newFonts/drawManager.ec
+++ b/ecere/src/gfx/newFonts/drawManager.ec
@@ -1,7 +1,9 @@
 import "OpenGLDisplayDriver"
 import "textureManager"
 
-#include "glHelpers.h"
+#include "gl123es.h"
+
+namespace gfx;
 
 #define _Noreturn
 #include <stdlib.h>

diff --git a/ecere/src/gfx/newFonts/fmFontManager.ec b/ecere/src/gfx/newFonts/fmFontManager.ec
index b153e41..c53a22c 100644 (file)
--- a/ecere/src/gfx/newFonts/fmFontManager.ec
+++ b/ecere/src/gfx/newFonts/fmFontManager.ec
@@ -6,12 +6,14 @@
 import "LinkList"
 import "File"
 import "FontResource"
-import "FontRenderer"
+import "fontRenderer"
 
 import "atlasBuilder"
 import "imgDistMap"
 
-#include "glHelpers.h"
+#include "gl123es.h"
+
+namespace gfx;
 
 #include <math.h>
 

diff --git a/ecere/src/gfx/newFonts/fontRenderer.ec b/ecere/src/gfx/newFonts/fontRenderer.ec
index 8b1efc6..5980c7d 100644 (file)
--- a/ecere/src/gfx/newFonts/fontRenderer.ec
+++ b/ecere/src/gfx/newFonts/fontRenderer.ec
@@ -10,7 +10,9 @@ import "Color"
 #include <math.h>
 #include <stdlib.h>
 
-#include "glHelpers.h"
+#include "gl123es.h"
+
+namespace gfx;
 
 #include "cc.h"
 #include "mm.h"

diff --git a/ecere/src/gfx/newFonts/textureManager.ec b/ecere/src/gfx/newFonts/textureManager.ec
index 64474bf..4ddba83 100644 (file)
--- a/ecere/src/gfx/newFonts/textureManager.ec
+++ b/ecere/src/gfx/newFonts/textureManager.ec
@@ -3,7 +3,9 @@ import "Display"
 #include <stdio.h>
 #include <math.h>
 
-#include "glHelpers.h"
+#include "gl123es.h"
+
+namespace gfx;
 
 #include "cc.h"