[Scummvm-cvs-logs] CVS: scummvm Makefile,1.90,1.91

Max Horn fingolfin at users.sourceforge.net
Fri Dec 24 16:23:01 CET 2004


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

Modified Files:
	Makefile 
Log Message:
Simplified building of the tools -> should fix compilation problems on Windows

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- Makefile	24 Dec 2004 22:59:05 -0000	1.90
+++ Makefile	25 Dec 2004 00:22:01 -0000	1.91
@@ -91,11 +91,11 @@
 
 tools: $(TOOLS)
 
-tools/convbdf$(EXEEXT): tools/convbdf.o
-	$(CXX) -o $@ $<
+tools/convbdf$(EXEEXT): tools/convbdf.c
+	$(CC) -Wall -o $@ $<
 
-tools/md5table$(EXEEXT): tools/md5table.o
-	$(CXX) -o $@ $<
+tools/md5table$(EXEEXT): tools/md5table.c
+	$(CC) -Wall -o $@ $<
 
 #simon/simon-md5.h: tools/simon-md5.txt
 #	tools/md5table$(EXEEXT) --c++ < $< > $@
@@ -185,4 +185,4 @@
 	u2d $(WIN32PATH)/*.txt
 
 
-.PHONY: deb bundle test osxsnap win32dist dist install uninstall credits
+.PHONY: deb bundle test osxsnap win32dist dist install uninstall credits tools





More information about the Scummvm-git-logs mailing list