From 748f31e91fa9591f8bd7ac0f04f45322320e1b04 Mon Sep 17 00:00:00 2001 From: flo Date: Tue, 11 Apr 2017 18:41:47 +0200 Subject: [PATCH] font --- Makefile | 2 +- Makefile.config | 6 ------ font/modern.bmp | Bin 0 -> 24698 bytes font/system.bmp | 0 modern.bmp | Bin 0 -> 24698 bytes obj/modern.bmp.o | Bin 0 -> 924 bytes obj/periodiq.c.o | Bin 0 -> 7276 bytes src/periodiq.c | 9 +++------ 8 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 font/system.bmp create mode 100644 modern.bmp create mode 100644 obj/modern.bmp.o create mode 100644 obj/periodiq.c.o diff --git a/Makefile b/Makefile index 6c642ef..209de3c 100755 --- a/Makefile +++ b/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 diff --git a/Makefile.config b/Makefile.config index 9d50496..89aaf2e 100755 --- a/Makefile.config +++ b/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 diff --git a/font/modern.bmp b/font/modern.bmp index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0340f76caa3294d8fa52e91b46611365384cad91 100644 GIT binary patch literal 24698 zcmeH~J(d(l5QJB9G3DqudN^1(Ispg3lZVAAxGuy@s6S$}x@vls?wQ%8>b)%@A|rn) z^%}A7KYsc2bUt5nf7Z`e{rsb!Kc4>9t@G*W>92SGIdfg_Km7aOg17$pXEA=CXKr9_ zU~XV;U~XV;U~XV;U~XV;U~XV;U~b?y*noZ=&Q}(?F_gCBFu%DU*W&h-%feURSj3W| znQh47drIaeb`fruvZ2`0qY%d_j!Mi5MZ{SErARM^BWURb-2!qR{1U+zK{1%FiteS5 z53NPPcu+E$7()UKfQ%l5OE2gc5cO1JDi4MNRw-g8CQd`@1rMkz=r)iu%_%x`++BK| z20EYYxMa?|3N~vIqZcyk(Pi6`G&`$IsmVqq%EuhYEfTlaPIHKnE@zk9G5`cT9 zPHD^Od8R%$FgLK{2K2%0SnUO+{Ka2P+-SR4=g|z~{rlB;3iVqo@~+m?8ZZOop_;&$ zVkowv_o6hyVC63NUgL{*s zUj@p{)JtWy#xn4ZMNP^g?%@=g(d3+S>JpoI%21@8_R zp2}Mk%z)J_N7Iv-XJR8NVC-AY7SM4oKnn^=@j($N%3@jh6@aYPgCbyCtI#Vwm!x^OM1Z47sW8FZz}&#EZ{T%(T(4`|E&p}Oi$r~#yRiD#^=cFmFeoLDqIMdO z&D12tSxLcJ*fT z_;n5u9aDO3$+ahMx};cedJ-4geQ6oY6j1=ooJD~e6xz$OUd&^v6bvm^s2450OdsUV znf<8qJD&Z`%%~2L(o$Ejzl~aXL6iXsV3M((eT#F_xq-QXJ8q!&3Ey#~Yg@nSCzRp8 zEyqhBy2#&Hjzbuv3v-IiQH%DZf;mOmQXk-+6CE%pa<9Z$49A3JpZ|jK(6>;En zsNAdR#gp_}f94*F$Ab-`4i$r_PnlU_DyBu0p(xPe7xl@SPG8k+Q>geKfsUslYLHZz zlMj@b?}D}fTQ7tzXX2JpY79z|vH3R9@km4spqi~!EK2to%wG(mn8AQvFH)`oS@x>L zX`UOH8#rPE`AHgc3xL(yI6=;H_WtiLdZuKNf=zpO)_hBtC9oxw0t)pK5DP^&*m7ru z*6--syY*5(R!>W8>i61^wssHB#e*Sp2iWOuN|E$a@Qs0dV`8tukL~HLhvhiM24U0j s-S$d9mERaRt!DWbV2d5H-r`(EdWtUU+yYW`x(%y()|_~5V3!U20JdRy(*OVf literal 0 HcmV?d00001 diff --git a/font/system.bmp b/font/system.bmp deleted file mode 100644 index e69de29..0000000 diff --git a/modern.bmp b/modern.bmp new file mode 100644 index 0000000000000000000000000000000000000000..0340f76caa3294d8fa52e91b46611365384cad91 GIT binary patch literal 24698 zcmeH~J(d(l5QJB9G3DqudN^1(Ispg3lZVAAxGuy@s6S$}x@vls?wQ%8>b)%@A|rn) z^%}A7KYsc2bUt5nf7Z`e{rsb!Kc4>9t@G*W>92SGIdfg_Km7aOg17$pXEA=CXKr9_ zU~XV;U~XV;U~XV;U~XV;U~XV;U~b?y*noZ=&Q}(?F_gCBFu%DU*W&h-%feURSj3W| znQh47drIaeb`fruvZ2`0qY%d_j!Mi5MZ{SErARM^BWURb-2!qR{1U+zK{1%FiteS5 z53NPPcu+E$7()UKfQ%l5OE2gc5cO1JDi4MNRw-g8CQd`@1rMkz=r)iu%_%x`++BK| z20EYYxMa?|3N~vIqZcyk(Pi6`G&`$IsmVqq%EuhYEfTlaPIHKnE@zk9G5`cT9 zPHD^Od8R%$FgLK{2K2%0SnUO+{Ka2P+-SR4=g|z~{rlB;3iVqo@~+m?8ZZOop_;&$ zVkowv_o6hyVC63NUgL{*s zUj@p{)JtWy#xn4ZMNP^g?%@=g(d3+S>JpoI%21@8_R zp2}Mk%z)J_N7Iv-XJR8NVC-AY7SM4oKnn^=@j($N%3@jh6@aYPgCbyCtI#Vwm!x^OM1Z47sW8FZz}&#EZ{T%(T(4`|E&p}Oi$r~#yRiD#^=cFmFeoLDqIMdO z&D12tSxLcJ*fT z_;n5u9aDO3$+ahMx};cedJ-4geQ6oY6j1=ooJD~e6xz$OUd&^v6bvm^s2450OdsUV znf<8qJD&Z`%%~2L(o$Ejzl~aXL6iXsV3M((eT#F_xq-QXJ8q!&3Ey#~Yg@nSCzRp8 zEyqhBy2#&Hjzbuv3v-IiQH%DZf;mOmQXk-+6CE%pa<9Z$49A3JpZ|jK(6>;En zsNAdR#gp_}f94*F$Ab-`4i$r_PnlU_DyBu0p(xPe7xl@SPG8k+Q>geKfsUslYLHZz zlMj@b?}D}fTQ7tzXX2JpY79z|vH3R9@km4spqi~!EK2to%wG(mn8AQvFH)`oS@x>L zX`UOH8#rPE`AHgc3xL(yI6=;H_WtiLdZuKNf=zpO)_hBtC9oxw0t)pK5DP^&*m7ru z*6--syY*5(R!>W8>i61^wssHB#e*Sp2iWOuN|E$a@Qs0dV`8tukL~HLhvhiM24U0j s-S$d9mERaRt!DWbV2d5H-r`(EdWtUU+yYW`x(%y()|_~5V3!U20JdRy(*OVf literal 0 HcmV?d00001 diff --git a/obj/modern.bmp.o b/obj/modern.bmp.o new file mode 100644 index 0000000000000000000000000000000000000000..959c5ee6236fa512230126e11d00ee0f38a6ffaa GIT binary patch literal 924 zcmZ`&O=uHQ5dL=GY)o58Q=}@ih}2M|Nbpdk-m2K@!Kz40F^V-ck)+xrra_`8E`pFs z4NJw!7L4MlRF8s+mt2J6K|HhvJxC6%CiM~x+T^73HrZIkK6r1wnfd1Dy`8<;ceGzo z71Wo4F2?H&>Z0ZAw$9zqpuTR_90SJ>^_@IckNOuhVhh@^3wy8+2QYvkoJGhc2?k0Y z5YGW^c*=6T~Sm z#FuvvD;bCv(-0+=CAP14Al6u}WuTnknrE2b)dA5SgGkLmydh|b)59_kg&!GIDC8(S zd5#KZj>`EWmD4&UCu3w*45iF9dv14H+}XDVrBX#L{dK!8V;{aUC~R_EMyK%1UX}(W z{W-1TJZSMvGp0?AK9N|vdvVB;cT#h@)TaikobN}9>S`9+E$2>YSC_I7gY0K~UFyqR zXOkJDw3!pGe$X~ECS0FE-OIhgRno=mM<_3u<8GM|)2p!hbv*UST-5l%AP4v7GV`3{ zGBqve>VB?u*nN-P{N|i%>moF&_9j|=YxMXCVI*d)d78x!9-n@WGP@ Yd2d-mO1?h$E&j?UXSsv7y{vq{0du#XuK)l5 literal 0 HcmV?d00001 diff --git a/obj/periodiq.c.o b/obj/periodiq.c.o new file mode 100644 index 0000000000000000000000000000000000000000..9e023c7761ba189f3c573138b7895b73f665f7bb GIT binary patch literal 7276 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�Qp8B|SqP*dbWho&%8BCV@uVktSJYIx3zB{BF_Esu{gs20xGtVof2JBqxJkFoSA5yve42C0@@wZX_%Zm%wgqB)-)injc zf8B7QpI2IV*DZiLF29bcz~yNN&zp|^w;l4VL%s`8&)}A$L3EYJdhdueSV12IB?VFhtos%_T$8 zCklCIXWMR6ITCwh!^EAdEum*<@KK-q!GA @@ -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) {