font

Makefile

@@ -20,7 +20,7 @@ $(OBJDIR)/%.bmp.o: $(IMGDIR)/%.bmp
 
 ## Compile fonts
 $(OBJDIR)/%.bmp.o: $(FONTDIR)/%.bmp
-	fxconv $< -o $@ --font  -n  $(patsubst %.bmp,font_%,$(notdir $<))
+	fxconv $< -o $@ -n $(basename $(notdir $<)) --font
 
 ## Make an object file out of an ASM source file
 $(OBJDIR)/%.s.o: $(SRCDIR)/%.s

Makefile.config

@@ -41,10 +41,4 @@ SRC = $(notdir $(wildcard $(SRCDIR)/*.[cs]))
 # INCLUDES
 INC = $(notdir $(wildcard $(INCDIR)/*.h))
 
-# SPRITES
-IMG = $(notdir $(wildcard $(IMGDIR)/*.bmp))
-
-# FONTS
-FONT = $(notdir $(wildcard $(FONTDIR)/*.bmp))
-
 # END OF FILE

src/periodiq.c

@@ -14,6 +14,7 @@
 #include "stdio.h"
 #include "ctype.h"
 #include "keyboard.h"
+#include "tales.h"
 
 
 //#include <stdlib.h>
@@ -197,9 +198,6 @@ char *etat[9]={
 	{"inconnu"}, //3
 };
 
-extern Font font_modern;
-
-
 
 int main()
 {
@@ -221,14 +219,13 @@ void Mini(char* chaine,  int n ) // fonc defini le numero de la fonction
 
 int tableauElement(int chang)
 {
+    extern Font modern;
 
     short decalx = 0, decaly = 0;
     unsigned char x = 1, y = 1;
     unsigned char i;
 
-
-text_configure(font_modern,  color_black);
-
+text_configure(&modern, color_black);
 
     while(1)
 	{