[Scummvm-cvs-logs] CVS: scummvm Makefile,1.68,1.69 configure,1.78,1.79
Travis Howell
kirben at users.sourceforge.net
Wed Mar 17 01:25:01 CET 2004
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20432
Modified Files:
Makefile configure
Log Message:
Add mingw to configure (Not working yet)
Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- Makefile 15 Mar 2004 02:28:46 -0000 1.68
+++ Makefile 17 Mar 2004 09:14:41 -0000 1.69
@@ -55,6 +55,9 @@
@echo "If you cannot run configure, use 'make -f Makefile.noconf'"
@exit 1
+scummvmico.o: scummvm.ico
+ windres scummvm.rc scummvmico.o
+
dist:
$(RM) $(ZIPFILE)
$(ZIP) $(ZIPFILE) $(DISTFILES)
Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- configure 15 Mar 2004 08:09:54 -0000 1.78
+++ configure 17 Mar 2004 09:14:41 -0000 1.79
@@ -496,9 +496,9 @@
CXXFLAGS="$CXXFLAGS -faltivec"
;;
MINGW32*)
- echo "mingw32 not supported by configure script"
- echo "Try 'make -f Makefile.mingw'"
- exit 1
+ DEFINES="$DEFINES -DWIN32"
+ LIBS="$LIBS -lmingw32 -lwinmm"
+ OBJS="$OBJS scummvmico.o"
;;
CYGWIN*)
echo "cygwin not supported by configure script"
More information about the Scummvm-git-logs
mailing list