summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-08-08 10:12:09 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-08-08 10:12:09 (GMT)
commit28762c945033c0d75ca64d57a06d659caa9e19ed (patch)
tree091a52b75b2af76374a081dc258d2fe34a5a8f3d
parentfd1a05943fbfbc678ed55c7fa83f2eac3881eba1 (diff)
downloadpowder-28762c945033c0d75ca64d57a06d659caa9e19ed.zip
powder-28762c945033c0d75ca64d57a06d659caa9e19ed.tar.gz
Fix packer and unpacker
-rw-r--r--font/packer.c7
-rw-r--r--font/unpacker.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/font/packer.c b/font/packer.c
index b30e6d3..4ecf8a7 100644
--- a/font/packer.c
+++ b/font/packer.c
@@ -77,7 +77,12 @@ int main(int argc, char *argv[])
fread(font, CELLW*CELLH, 256, f);
fclose(f);
+ printf("#ifndef FONT_H_CHECK\n");
+ printf("#define FONT_H_CHECK\n");
+
printf("#define FONT_H %d\n", ysize);
+
+ printf("#ifdef INCLUDE_FONTDATA\n");
printf("char font_data[] = {\n");
for(c=0; c<256; c++) {
@@ -97,6 +102,8 @@ int main(int argc, char *argv[])
printf(" ");
}
printf("};\n");
+
+ printf("#endif\n#endif\n");
return 0;
}
diff --git a/font/unpacker.c b/font/unpacker.c
index a2a4cc6..95fbf0c 100644
--- a/font/unpacker.c
+++ b/font/unpacker.c
@@ -3,6 +3,8 @@
#include <string.h>
#include <math.h>
+#define INCLUDE_FONTDATA
+
#include "font.h"
#define CELLW 12