[Scummvm-cvs-logs] SF.net SVN: scummvm:[42076] tools/branches/gsoc2009-gui

joostp at users.sourceforge.net joostp at users.sourceforge.net
Fri Jul 3 21:58:56 CEST 2009


Revision: 42076
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42076&view=rev
Author:   joostp
Date:     2009-07-03 19:58:55 +0000 (Fri, 03 Jul 2009)

Log Message:
-----------
fix compilation with gcc

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/Makefile
    tools/branches/gsoc2009-gui/compress_agos.cpp
    tools/branches/gsoc2009-gui/util.h

Modified: tools/branches/gsoc2009-gui/Makefile
===================================================================
--- tools/branches/gsoc2009-gui/Makefile	2009-07-03 19:05:58 UTC (rev 42075)
+++ tools/branches/gsoc2009-gui/Makefile	2009-07-03 19:58:55 UTC (rev 42076)
@@ -30,8 +30,8 @@
 CXXFLAGS+= -Wpointer-arith -Wcast-qual -Wconversion
 CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor -Wwrite-strings
 
-# Disable exceptions, and enabled checking of pointers returned by "new"
-CXXFLAGS+= -fno-exceptions -fcheck-new
+# Enable checking of pointers returned by "new"
+CXXFLAGS+= -fcheck-new
 
 #######################################################################
 # Default commands - put the necessary replacements in config.mk      #

Modified: tools/branches/gsoc2009-gui/compress_agos.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_agos.cpp	2009-07-03 19:05:58 UTC (rev 42075)
+++ tools/branches/gsoc2009-gui/compress_agos.cpp	2009-07-03 19:58:55 UTC (rev 42076)
@@ -236,8 +236,6 @@
 int export_main(compress_agos)(int argc, char *argv[]) {
 	const char *helptext = "\nUsage: %s [mode] [mode params] [--mac] <infile>\n" kCompressionAudioHelp;
 
-	const char *h = "Something something " INT_STR(INT);
-
 	bool convertMac = false;
 
 	Filename inpath, outpath;

Modified: tools/branches/gsoc2009-gui/util.h
===================================================================
--- tools/branches/gsoc2009-gui/util.h	2009-07-03 19:05:58 UTC (rev 42075)
+++ tools/branches/gsoc2009-gui/util.h	2009-07-03 19:58:55 UTC (rev 42076)
@@ -40,8 +40,8 @@
 #endif
 
 #include <string>
+#include <stdexcept>
 
-
 /*
  * Some useful types
  */


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




More information about the Scummvm-git-logs mailing list