[Scummvm-cvs-logs] CVS: scummvm configure,1.86,1.87

Max Horn fingolfin at users.sourceforge.net
Thu Apr 8 16:08:02 CEST 2004


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

Modified Files:
	configure 
Log Message:
Partially added EXEEXT support to configure script (incomplete; and boy, our configure script sure needs a cleanup :-)

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- configure	8 Apr 2004 22:46:46 -0000	1.86
+++ configure	8 Apr 2004 22:54:22 -0000	1.87
@@ -93,9 +93,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
 }
 
@@ -170,7 +170,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
 }
 
@@ -346,6 +346,18 @@
 fi
 
 #
+# Determine extension used for executables
+#
+case $_host_os in
+mingw* | cygwin*)
+	EXEEXT=".exe"
+	;;
+*)
+	EXEEXT=""
+	;;
+esac
+
+#
 # Determine the C++ compiler
 #
 echo_n "Looking for C++ compiler... "
@@ -565,7 +577,7 @@
 	    exit 1
 	    ;;
     esac
-    rm -f tmp_endianness_check tmp_endianness_check.cpp
+    rm -f tmp_endianness_check$EXEEXT tmp_endianness_check.cpp
 
     #
     # Check whether memory alignment is required
@@ -912,6 +924,7 @@
 BACKEND := $_backend
 MODULES += $MODULES
 MODULE_DIRS += $MODULE_DIRS
+EXEEXT := $EXEEXT
 
 $_mak_plugins
 $_make_def_HAVE_GCC3





More information about the Scummvm-git-logs mailing list