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

[dhewg at users.sourceforge.net]

Revision: 39530
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39530&view=rev
Author:   dhewg
Date:     2009-03-19 18:52:38 +0000 (Thu, 19 Mar 2009)

Log Message:
-----------
Moved -pedantic from Makefile to the end of configure script

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

Modified: scummvm/trunk/Makefile
===================================================================
--- scummvm/trunk/Makefile	2009-03-19 18:47:01 UTC (rev 39529)
+++ scummvm/trunk/Makefile	2009-03-19 18:52:38 UTC (rev 39530)
@@ -24,7 +24,7 @@
 # Turn off some annoying and not-so-useful warnings
 CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder
 # Enable even more warnings...
-CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wcast-align
+CXXFLAGS+= -Wpointer-arith -Wcast-qual -Wcast-align
 CXXFLAGS+= -Wshadow -Wimplicit -Wnon-virtual-dtor -Wwrite-strings
 
 # Disable RTTI and exceptions, and enabled checking of pointers returned by "new"

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-03-19 18:47:01 UTC (rev 39529)
+++ scummvm/trunk/configure	2009-03-19 18:52:38 UTC (rev 39530)
@@ -973,27 +973,6 @@
 fi
 
 #
-# Do CXXFLAGS now we know the compiler version
-#
-if test "$_cxx_major" -ge "3" ; then
-	case $_host_os in
-	mingw* | cygwin* | dreamcast)
-		CXXFLAGS="$CXXFLAGS -W -Wno-unused-parameter"
-		;;
-	*)
-		CXXFLAGS="$CXXFLAGS -ansi -W -Wno-unused-parameter"
-		;;
-	esac
-	add_line_to_config_mk 'HAVE_GCC3 = 1'
-fi;
-
-if test "$_cxx_major" -ge "4" && test "$_cxx_minor" -ge "3" ; then
-	CXXFLAGS="$CXXFLAGS -Wno-parentheses -Wno-empty-body"
-else
-	CXXFLAGS="$CXXFLAGS -Wconversion"
-fi;
-
-#
 # Check for endianness
 #
 echo_n "Checking endianness... "
@@ -1755,6 +1734,34 @@
 esac
 
 #
+# Do CXXFLAGS now we know the compiler version
+#
+if test "$_cxx_major" -ge "3" ; then
+	case $_host_os in
+	mingw* | cygwin* | dreamcast)
+		CXXFLAGS="$CXXFLAGS -W -Wno-unused-parameter"
+		;;
+	*)
+		CXXFLAGS="$CXXFLAGS -ansi -W -Wno-unused-parameter"
+		;;
+	esac
+	add_line_to_config_mk 'HAVE_GCC3 = 1'
+fi;
+
+if test "$_cxx_major" -ge "4" && test "$_cxx_minor" -ge "3" ; then
+	CXXFLAGS="$CXXFLAGS -Wno-parentheses -Wno-empty-body"
+else
+	CXXFLAGS="$CXXFLAGS -Wconversion"
+fi;
+
+# Some platforms use certain GNU extensions in header files
+case $_host_os in
+*)
+	CXXFLAGS="$CXXFLAGS -pedantic"
+	;;
+esac
+
+#
 # Engine selection
 #
 _engines_built_static=""


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