[Scummvm-cvs-logs] CVS: tools Makefile,1.1,1.2 Makefile.mingw,1.1,1.2 rescumm.c,1.3,1.4

[Travis Howell]

Update of /cvsroot/scummvm/tools
In directory usw-pr-cvs1:/tmp/cvs-serv17040

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

Merge makefiles, add string.h to rescummvm.c


Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/tools/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	7 Jul 2002 17:30:09 -0000	1.1
+++ Makefile	8 Jul 2002 11:31:00 -0000	1.2
@@ -1,8 +1,6 @@
-# Where is scummvm will be installed
-SCUMMVMPATH=C:/scummvm
 SRC=.
 
-CC      = cc
+CC      = g++
 CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
 LDFLAGS :=
 

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/tools/Makefile.mingw,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.mingw	26 Apr 2002 11:37:52 -0000	1.1
+++ Makefile.mingw	8 Jul 2002 11:31:00 -0000	1.2
@@ -1,32 +1,9 @@
 # Where is scummvm will be installed
 SCUMMVMPATH=C:/scummvm
-SRC=.
-
-CC      = gcc
-CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
-
-.cpp.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 
-descumm3.exe : descumm3.o
-	$(CC) $(LFLAGS) -o $@ $+ -mconsole
-
-descumm5.exe : descumm5.o
-	$(CC) $(LFLAGS) -o $@ $+ -mconsole
-
-descumm6.exe : descumm6.o
-	$(CC) $(LFLAGS) -o $@ $+ -mconsole
-
-extract.exe : extract.o
-	$(CC) $(LFLAGS) -o $@ $+ -mconsole
-
-rescumm.exe : rescumm.o
-	$(CC) $(LFLAGS) -o $@ $+ -mconsole
-
-all: descumm3.exe descumm5.exe descumm6.exe extract.exe rescumm.exe
+EXEEXT	:=.exe
 
-clean:
-	rm -f *.o *.exe
+include Makefile
 
 install:   all
 	mkdir -p $(SCUMMVMPATH)

Index: rescumm.c
===================================================================
RCS file: /cvsroot/scummvm/tools/rescumm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rescumm.c	7 Jul 2002 17:50:46 -0000	1.3
+++ rescumm.c	8 Jul 2002 11:31:00 -0000	1.4
@@ -5,6 +5,7 @@
  * seperate files for usage with ScummVM.
  */
 
+#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>