Changeset 2318 for pwntcha/trunk/src/ticketsTweet

Timestamp:

Apr 26, 2008, 10:41:43 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Step 2 of the code reorganisation: move each font to its corresponding decoder's subdirectory.

Location:

pwntcha/trunk/src/tickets

Files:

• Makefile.am (modified) (1 diff)
• decoder.c (modified) (1 diff)
• font1.png (moved) (moved from pwntcha/trunk/share/font_tickets1.png)
• font2.png (moved) (moved from pwntcha/trunk/share/font_tickets2.png)
• font3.png (moved) (moved from pwntcha/trunk/share/font_tickets3.png)
• font4.png (moved) (moved from pwntcha/trunk/share/font_tickets4.png)
• font5.png (moved) (moved from pwntcha/trunk/share/font_tickets5.png)
• font6.png (moved) (moved from pwntcha/trunk/share/font_tickets6.png)
• font7.png (moved) (moved from pwntcha/trunk/share/font_tickets7.png)
• font8.png (moved) (moved from pwntcha/trunk/share/font_tickets8.png)

pwntcha/trunk/src/tickets/Makefile.am

@@ +1 @@
+
+DECODER = tickets
 
 noinst_LIBRARIES = libdecoder.a
 
 libdecoder_a_SOURCES = decoder.c
-libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+libdecoder_a_CPPFLAGS = -I$(srcdir)/.. -DDECODER=\"$(DECODER)\"
 
+EXTRA_DIST = font1.png font2.png font3.png font4.png font5.png font6.png font7.png font8.png
+

pwntcha/trunk/src/tickets/decoder.c

@@ -35 +35 @@
         {
             char buf[BUFSIZ];
-            sprintf(buf, "font_tickets%i.png", i + 1);
-            fonts[i] = font_load_variable(buf, "0123456789");
+            sprintf(buf, "font%i.png", i + 1);
+            fonts[i] = font_load_variable(DECODER, buf, "0123456789");
             if(!fonts[i])
                 exit(-1);