[Qonk-commit] SF.net SVN: qonk:[143] trunk/src

[<the...@us...>]

Revision: 143
          http://qonk.svn.sourceforge.net/qonk/?rev=143&view=rev
Author:   thebohemian
Date:     2008-11-07 19:21:05 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
 * fixed various gcc 4.3 compilation problems

Modified Paths:
--------------
    trunk/src/engine/Makefile
    trunk/src/input.h
    trunk/src/lisp/lexer.cpp
    trunk/src/lisp/parser.cpp
    trunk/src/sdl_driver.cpp
    trunk/src/videooptions.cpp

Modified: trunk/src/engine/Makefile
===================================================================
--- trunk/src/engine/Makefile	2008-06-01 22:07:31 UTC (rev 142)
+++ trunk/src/engine/Makefile	2008-11-07 19:21:05 UTC (rev 143)
@@ -34,9 +34,9 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+target_triplet = x86_64-unknown-linux-gnu
 subdir = src/engine
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -136,21 +136,21 @@
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
+build = x86_64-unknown-linux-gnu
 build_alias = 
-build_cpu = i686
+build_cpu = x86_64
 build_os = linux-gnu
-build_vendor = pc
+build_vendor = unknown
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
+host = x86_64-unknown-linux-gnu
 host_alias = 
-host_cpu = i686
+host_cpu = x86_64
 host_os = linux-gnu
-host_vendor = pc
+host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
@@ -169,11 +169,11 @@
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
 sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
+target = x86_64-unknown-linux-gnu
 target_alias = 
-target_cpu = i686
+target_cpu = x86_64
 target_os = linux-gnu
-target_vendor = pc
+target_vendor = unknown
 AM_CPPFLAGS = -DPKG_DATA_DIR="\"$(pkgdatadir)/\""
 INCLUDES = -I$(top_srcdir)/guichan
 noinst_LIBRARIES = libengine.a

Modified: trunk/src/input.h
===================================================================
--- trunk/src/input.h	2008-06-01 22:07:31 UTC (rev 142)
+++ trunk/src/input.h	2008-11-07 19:21:05 UTC (rev 143)
@@ -20,7 +20,7 @@
         AD_POSITIVE
 };
 
-typedef struct Input
+struct Input
 {
         InputType inputType;
 

Modified: trunk/src/lisp/lexer.cpp
===================================================================
--- trunk/src/lisp/lexer.cpp	2008-06-01 22:07:31 UTC (rev 142)
+++ trunk/src/lisp/lexer.cpp	2008-11-07 19:21:05 UTC (rev 143)
@@ -19,6 +19,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <sstream>
 #include <stdexcept>
+#include <cstring>
 
 #include "lexer.hpp"
 #include "translation.hpp"

Modified: trunk/src/lisp/parser.cpp
===================================================================
--- trunk/src/lisp/parser.cpp	2008-06-01 22:07:31 UTC (rev 142)
+++ trunk/src/lisp/parser.cpp	2008-11-07 19:21:05 UTC (rev 143)
@@ -22,6 +22,7 @@
 #include <fstream>
 
 #include <cassert>
+#include <cstring>
 
 #include "parser.hpp"
 #include "lisp.hpp"

Modified: trunk/src/sdl_driver.cpp
===================================================================
--- trunk/src/sdl_driver.cpp	2008-06-01 22:07:31 UTC (rev 142)
+++ trunk/src/sdl_driver.cpp	2008-11-07 19:21:05 UTC (rev 143)
@@ -46,7 +46,7 @@
     Canvas::initScreen(Settings::getScreenWidth(), Settings::getScreenHeight(), Settings::getFullscreen());
 
     const int NUM_STICKS = SDL_NumJoysticks();
-    sticks = (SDL_Joystick **) std::malloc(sizeof(SDL_Joystick *) * NUM_STICKS);
+    sticks = new SDL_Joystick*[NUM_STICKS];
     for (int i=0;i<NUM_STICKS;i++)
         sticks[i] = SDL_JoystickOpen(i);
 
@@ -83,7 +83,7 @@
 {
   SDL_ShowCursor(SDL_ENABLE);
 
-  std::free(sticks);
+  delete sticks;
 
   Canvas::shutdown();
 

Modified: trunk/src/videooptions.cpp
===================================================================
--- trunk/src/videooptions.cpp	2008-06-01 22:07:31 UTC (rev 142)
+++ trunk/src/videooptions.cpp	2008-11-07 19:21:05 UTC (rev 143)
@@ -1,5 +1,6 @@
 #include <vector>
 #include <sstream>
+#include <algorithm>
 
 #include <SDL/SDL.h>
 


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