2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b4cd1962d1..93204a1d81 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,9 @@ config.mak: $(srcdir)/configure
 	@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)
diff --git a/configure b/configure
index 91618132f4..368a41d735 100755
--- a/configure
+++ b/configure
@@ -496,9 +496,9 @@ else
 	    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"