[Scummvm-cvs-logs] SF.net SVN: scummvm:[50194] scummvm/branches/gsoc2010-opengl

vgvgf at users.sourceforge.net vgvgf at users.sourceforge.net
Thu Jun 24 00:02:01 CEST 2010


Revision: 50194
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50194&view=rev
Author:   vgvgf
Date:     2010-06-23 22:02:00 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
Fixed Posix port problem with destructor and configure.

Modified Paths:
--------------
    scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix.h
    scummvm/branches/gsoc2010-opengl/configure

Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix.h	2010-06-23 21:07:03 UTC (rev 50193)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix.h	2010-06-23 22:02:00 UTC (rev 50194)
@@ -31,7 +31,7 @@
 class OSystem_POSIX : public OSystem_SDL {
 public:
 	OSystem_POSIX();
-	virtual ~OSystem_POSIX();
+	virtual ~OSystem_POSIX() {}
 
 	virtual void initBackend();
 

Modified: scummvm/branches/gsoc2010-opengl/configure
===================================================================
--- scummvm/branches/gsoc2010-opengl/configure	2010-06-23 21:07:03 UTC (rev 50193)
+++ scummvm/branches/gsoc2010-opengl/configure	2010-06-23 22:02:00 UTC (rev 50194)
@@ -137,7 +137,7 @@
 _vkeybd=no
 _keymapper=no
 # Default platform settings
-_backend=posix
+_backend=sdl
 _endian=unknown
 _need_memalign=no
 _have_x86=no
@@ -625,8 +625,8 @@
 Configuration:
   -h, --help              display this help and exit
   --backend=BACKEND       backend to build (dc, gp2x, gp2xwiz, iphone,
-                          linuxmoto, nds, null, posix, ps2, psp, sdl, wii, wince)
-                          [posix]
+                          linuxmoto, nds, null, ps2, psp, sdl, wii, wince)
+                          [sdl]
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -1734,7 +1734,7 @@
 # Enable 16bit support only for backends which support it
 #
 case $_backend in
-	dreamcast | samsungtv | sdl | wii | psp | posix)
+	dreamcast | samsungtv | sdl | wii | psp)
 		if test "$_16bit" = auto ; then
 			_16bit=yes
 		else
@@ -2413,13 +2413,6 @@
 	null)
 		DEFINES="$DEFINES -DUSE_NULL_DRIVER"
 		;;
-	posix)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		DEFINES="$DEFINES -DSDL_BACKEND"
-		MODULES="$MODULES backends/platform/sdl"
-		;;
 	ps2)
 		# TODO ps2
 		DEFINES="$DEFINES -D_EE -DFORCE_RTL"
@@ -2722,3 +2715,4 @@
 EOF
 
 fi
+


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