diff options
| author | Dennis Peeten <dpeeten@onsneteindhoven.nl> | 2008-05-20 12:16:54 (GMT) |
|---|---|---|
| committer | Dennis Peeten <dpeeten@onsneteindhoven.nl> | 2008-05-20 12:16:54 (GMT) |
| commit | 484123add56ac236a9bfb361ab475bf8f3bead6f (patch) | |
| tree | fdb66c64d5083ca28b16b972c9f00b26809e9539 /matchblox/common | |
| parent | 2018e9a939fa79518f6ce020f64714730d5be959 (diff) | |
| download | 2iv55-484123add56ac236a9bfb361ab475bf8f3bead6f.zip 2iv55-484123add56ac236a9bfb361ab475bf8f3bead6f.tar.gz 2iv55-484123add56ac236a9bfb361ab475bf8f3bead6f.tar.bz2 | |
nog een keer!!!
Diffstat (limited to 'matchblox/common')
| -rw-r--r-- | matchblox/common/bitmap.c | 12 | ||||
| -rw-r--r-- | matchblox/common/font.c | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/matchblox/common/bitmap.c b/matchblox/common/bitmap.c index 2d69bc9..3a6171a 100644 --- a/matchblox/common/bitmap.c +++ b/matchblox/common/bitmap.c @@ -6,11 +6,21 @@ #define GL_CLAMP_TO_EDGE 0x812F
#endif
-#include <GL/gl.h>
+#include <GL/glut.h>
#include <GL/glu.h>
#include <stdio.h>
#include <stdlib.h>
+#ifndef GL_CLAMP_TO_EDGE
+#define GL_CLAMP_TO_EDGE 0x812F
+#endif
+#ifndef GL_BGR
+#define GL_BGR 0x80E0
+#endif
+#ifndef GL_BGRA
+#define GL_BGRA 0x80E1
+#endif
+
#include "bitmap.h"
#define BITMAP_FILESIZE 0x02
diff --git a/matchblox/common/font.c b/matchblox/common/font.c index 0332174..2f39d7f 100644 --- a/matchblox/common/font.c +++ b/matchblox/common/font.c @@ -6,7 +6,7 @@ #define TRUE !FALSE
#endif
-#include <GL/gl.h>
+#include <GL/glut.h>
#include <string.h>
#include "font.h"
|