[Scummvm-cvs-logs] SF.net SVN: scummvm:[45036] scummvm/trunk/configure

[fingolfin at users.sourceforge.net]

Revision: 45036
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45036&view=rev
Author:   fingolfin
Date:     2009-10-13 18:50:46 +0000 (Tue, 13 Oct 2009)

Log Message:
-----------
Revamp the way --enable-release / --enable-debug work. They are now no longer mutually exclusive. Also, ports can override whether we default to (non-)release resp. (non-)debug builds

Modified Paths:
--------------
    scummvm/trunk/configure

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-10-13 18:49:10 UTC (rev 45035)
+++ scummvm/trunk/configure	2009-10-13 18:50:46 UTC (rev 45036)
@@ -125,6 +125,8 @@
 _16bit=auto
 _readline=auto
 # Default option behaviour yes/no
+_debug_build=auto
+_release_build=auto
 _text_console=no
 _mt32emu=yes
 _build_hq_scalers=yes
@@ -658,8 +660,6 @@
 	fi
 done # for parm in ...
 
-DEBFLAGS="-g"
-
 for ac_option in $@; do
 	case "$ac_option" in
 	--disable-16bit)          _16bit=no       ;;
@@ -750,17 +750,20 @@
 		_backend=`echo $ac_option | cut -d '=' -f 2`
 		;;
 	--enable-debug)
-		# debug is enabled by default
+		_debug_build=yes
 		;;
 	--disable-debug)
-		DEBFLAGS=""
+		_debug_build=no
 		;;
 	--enable-Werror)
 		CXXFLAGS="$CXXFLAGS -Werror"
 		;;
 	--enable-release)
-		DEBFLAGS="-O2 -Wuninitialized"
+		_release_build=yes
 		;;
+	--disable-release)
+		_release_build=no
+		;;
 	--enable-profiling)
 		CXXFLAGS="$CXXFLAGS -pg"
 		LDFLAGS="$LDFLAGS -pg"
@@ -812,8 +815,6 @@
 	esac;
 done;
 
-CXXFLAGS="$CXXFLAGS $DEBFLAGS"
-
 guessed_host=`$_srcdir/config.guess`
 get_system_exe_extension $guessed_host
 NATIVEEXEEXT=$_exeext
@@ -924,6 +925,22 @@
 fi
 
 #
+# Determine extra build flags for debug and/or release builds
+#
+
+if test "$_debug_build" != no; then
+	# debug mode not explicitly disabled -> compile with -g
+	CXXFLAGS="$CXXFLAGS -g"
+fi
+
+if test "$_release_build" = yes; then
+	# Release mode enabled: enable optimizations. This also
+	# makes it possible to use -Wuninitialized, so let's do that.
+	CXXFLAGS="$CXXFLAGS -O2 -Wuninitialized"
+fi
+
+
+#
 # Determine extension used for executables
 #
 get_system_exe_extension $_host_os 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.