[Scummvm-cvs-logs] CVS: tools Makefile,1.33,1.34 Makefile.mingw,1.15,1.16 loom_tg16_extract.c,1.1,1.2

[Travis Howell]

Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1679

Modified Files:
	Makefile Makefile.mingw loom_tg16_extract.c 
Log Message:

Add to Makefiles and cleanup


Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/tools/Makefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Makefile	10 May 2004 15:05:17 -0000	1.33
+++ Makefile	11 Jul 2004 04:56:58 -0000	1.34
@@ -21,6 +21,7 @@
 	descumm$(EXEEXT) \
 	desword2$(EXEEXT) \
 	extract$(EXEEXT) \
+	loom_tg16_extract$(EXEEXT) \
 	md5table$(EXEEXT) \
 	mm_nes_extract$(EXEEXT) \
 	queenrebuild$(EXEEXT) \
@@ -45,6 +46,9 @@
 extract$(EXEEXT): extract.o extract-common.o util.o
 	$(CC) $(LFLAGS) -o $@ $+
 
+loom_tg16_extract$(EXEEXT): loom_tg16_extract.o
+	$(CC) $(LFLAGS) -o $@ $+
+
 md5table$(EXEEXT): md5table.o util.o
 	$(CXX) $(LFLAGS) -o $@ $+
 

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/tools/Makefile.mingw,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.mingw	13 Apr 2004 19:25:02 -0000	1.15
+++ Makefile.mingw	11 Jul 2004 04:56:58 -0000	1.16
@@ -14,6 +14,7 @@
 	strip desword2.exe -o $(SCUMMVMPATH)/tools/desword2.exe
 	strip extract.exe -o $(SCUMMVMPATH)/tools/extract.exe
 	strip md5table.exe -o $(SCUMMVMPATH)/tools/md5table.exe
+	strip loom_tg16_extract.exe -o $(SCUMMVMPATH)/tools/loom_tg16_extract.exe
 	strip mm_nes_extract.exe -o $(SCUMMVMPATH)/tools/mm_nes_extract.exe
 	strip queenrebuild.exe -o $(SCUMMVMPATH)/tools/queenrebuild.exe
 	strip rescumm.exe -o $(SCUMMVMPATH)/tools/rescumm.exe

Index: loom_tg16_extract.c
===================================================================
RCS file: /cvsroot/scummvm/tools/loom_tg16_extract.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- loom_tg16_extract.c	5 Jul 2004 12:22:02 -0000	1.1
+++ loom_tg16_extract.c	11 Jul 2004 04:56:58 -0000	1.2
@@ -22,16 +22,23 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <string.h>
 
 typedef int BOOL;
 #define TRUE 1
 #define FALSE 0
 
-// if defined, generates a set of .LFL files
-// if not defined, dumps all resources to separate files
[...1485 lines suppressed...]
 	for (i = 0; i < lfl_index.num_sounds; i++)
 	{
@@ -1277,7 +1293,7 @@
 	extract_resource(input,output,&res_charset);
 	fclose(output);
 
-#else	// !MAKE_LFLS
+#else	/* !MAKE_LFLS */
 	dump_resource(input,"globdata.dmp",0,&res_globdata);
 	dump_resource(input,"charset.dmp",0,&res_charset);
 	for (i = 0; i < NUM_UNKNOWNS; i++)
@@ -1290,7 +1306,7 @@
 		dump_resource(input,"script-%i.dmp",i,&res_scripts[i]);
 	for (i = 0; i < NUM_SOUNDS; i++)
 		dump_resource(input,"sound-%i.dmp",i,&res_sounds[i]);
-#endif	// MAKE_LFLS
+#endif	/* MAKE_LFLS */
 	debug("All done!");
 	return 0;
 }