[Scummvm-cvs-logs] CVS: scummvm Makefile,1.62.2.2,1.62.2.3 configure,1.67.2.2,1.67.2.3 Makefile.mingw,1.36,NONE

[Travis Howell]

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

Modified Files:
      Tag: branch-0-6-0
	Makefile configure 
Removed Files:
      Tag: branch-0-6-0
	Makefile.mingw 
Log Message:

Back port mingw configure changes.


Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.62.2.2
retrieving revision 1.62.2.3
diff -u -d -r1.62.2.2 -r1.62.2.3
--- Makefile	25 Feb 2004 10:00:07 -0000	1.62.2.2
+++ Makefile	12 Apr 2004 12:50:21 -0000	1.62.2.3
@@ -10,6 +10,7 @@
 RM_REC  := $(RM) -r
 ZIP     := zip -q
 CP      := cp
+WIN32PATH=C:/scummvm
 
 #######################################################################
 # Default compilation parameters. Normally don't edit these           #
@@ -55,6 +56,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)
@@ -106,4 +110,15 @@
 		-framework OpenGL -framework AGL -framework QuickTime \
 		-framework AudioUnit -framework AudioToolbox
 
+# Special target to create a win32 snapshot binary
+win32dist: scummvm$(EXEEXT)
+	mkdir -p $(WIN32PATH)
+	strip scummvm.exe -o $(WIN32PATH)/scummvm$(EXEEXT)
+	cp COPYING $(WIN32PATH)/copying.txt
+	cp README $(WIN32PATH)/readme.txt
+	cp NEWS $(WIN32PATH)/news.txt
+	cp SDL/README-SDL.txt $(WIN32PATH)
+	cp SDL/lib/SDL.dll $(WIN32PATH)
+	u2d $(WIN32PATH)/*.txt
+
 .PHONY: deb bundle test

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.67.2.2
retrieving revision 1.67.2.3
diff -u -d -r1.67.2.2 -r1.67.2.3
--- configure	17 Mar 2004 01:28:11 -0000	1.67.2.2
+++ configure	12 Apr 2004 12:50:21 -0000	1.67.2.3
@@ -82,9 +82,9 @@
 
 if test -n "$_host"; then
     # In cross-compiling mode, we cannot run the result
-    eval "$1 -o tmp_cxx_compiler tmp_cxx_compiler.cpp 2> /dev/null" && rm -f tmp_cxx_compiler tmp_cxx_compiler.cpp
+    eval "$1 -o tmp_cxx_compiler tmp_cxx_compiler.cpp 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
 else
-    eval "$1 -o tmp_cxx_compiler tmp_cxx_compiler.cpp 2> /dev/null" && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler tmp_cxx_compiler.cpp
+    eval "$1 -o tmp_cxx_compiler tmp_cxx_compiler.cpp 2> /dev/null" && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
 fi
 }
 
@@ -159,7 +159,7 @@
 	exit 1
   fi
 fi
-rm -f tmp_find_type_with_size tmp_find_type_with_size.cpp
+rm -f tmp_find_type_with_size$EXEEXT tmp_find_type_with_size.cpp
 echo $datatype
 }
 
@@ -315,6 +315,19 @@
 fi
 
 #
+# Determine extension used for executables
+#
+hosttype=`uname -s`
+case $hosttype in
+	MINGW32* | CYGWIN*)
+	EXEEXT=".exe"
+	;;
+*)
+	EXEEXT=""
+	;;
+esac
+
+#
 # Determine the C++ compiler
 #
 printf "Looking for C++ compiler... "
@@ -385,8 +398,16 @@
 #
 
 if test "$_cxx_major" -ge "3" ; then
+    hosttype=`uname -s`
+    case $hosttype in
+	MINGW32* | CYGWIN*)
+	CXXFLAGS="$CXXFLAGS -W -Wno-unused-parameter"
+	    ;;
+	*)
 	CXXFLAGS="$CXXFLAGS -ansi -W -Wno-unused-parameter"
-	_make_def_HAVE_GCC3='HAVE_GCC3 = 1'
+	    ;;
+    esac
+    _make_def_HAVE_GCC3='HAVE_GCC3 = 1'
 fi;
 
 #
@@ -472,13 +493,14 @@
 		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"
-		exit 1
+		DEFINES="$DEFINES -mno-cygwin -DWIN32"
+		LIBS="$LIBS -mno-cygwin -lmingw32 -lwinmm"
+		OBJS="$OBJS scummvmico.o"
 		;;
 	# given this is a shell script assume some type of unix
 	*)
@@ -521,7 +543,7 @@
 	    exit 1
 	    ;;
     esac
-    rm -f tmp_endianess_check tmp_endianess_check.cpp
+    rm -f tmp_endianess_check$EXEEXT tmp_endianess_check.cpp
 
     #
     # Check whether memory alignment is required
@@ -791,6 +813,7 @@
 BACKEND := $_backend
 MODULES += $MODULES
 MODULE_DIRS += $MODULE_DIRS
+EXEEXT := $EXEEXT
 
 $_make_def_HAVE_GCC3
 $_mak_scumm

--- Makefile.mingw DELETED ---