[Scummvm-cvs-logs] SF.net SVN: scummvm:[50475] scummvm/branches/gsoc2010-opengl/backends
vgvgf at users.sourceforge.net
vgvgf at users.sourceforge.net
Tue Jun 29 03:21:31 CEST 2010
Revision: 50475
http://scummvm.svn.sourceforge.net/scummvm/?rev=50475&view=rev
Author: vgvgf
Date: 2010-06-29 01:21:30 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
Updated makefile. Fixed compile errors.
Modified Paths:
--------------
scummvm/branches/gsoc2010-opengl/backends/module.mk
scummvm/branches/gsoc2010-opengl/backends/platform/linuxmoto/linuxmoto-sdl.cpp
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix-main.cpp
Modified: scummvm/branches/gsoc2010-opengl/backends/module.mk
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/module.mk 2010-06-29 01:08:36 UTC (rev 50474)
+++ scummvm/branches/gsoc2010-opengl/backends/module.mk 2010-06-29 01:21:30 UTC (rev 50475)
@@ -6,6 +6,7 @@
audiocd/default/default-audiocd.o \
audiocd/sdl/sdl-audiocd.o \
events/default/default-events.o \
+ events/linuxmotosdl/linuxmotosdl-events.o \
events/samsungtv/samsungtv-events.o \
events/sdl/sdl-events.o \
events/symbiansdl/symbiansdl-events.o \
@@ -23,6 +24,7 @@
fs/wii/wii-fs-factory.o \
fs/n64/n64-fs-factory.o \
fs/n64/romfsstream.o \
+ graphics/linuxmotosdl/linuxmotosdl-graphics.o \
graphics/sdl/sdl-graphics.o \
graphics/symbiansdl/symbiansdl-graphics.o \
keymapper/action.o \
@@ -38,7 +40,7 @@
midi/timidity.o \
midi/dmedia.o \
midi/windows.o \
- mixer/bufferingsdl/bufferingsdl-mixer.o \
+ mixer/doublebuffersdl/doublebuffersdl-mixer.o \
mixer/sdl/sdl-mixer.o \
mixer/symbiansdl/symbiansdl-mixer.o \
mutex/sdl/sdl-mutex.o \
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/linuxmoto/linuxmoto-sdl.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/linuxmoto/linuxmoto-sdl.cpp 2010-06-29 01:08:36 UTC (rev 50474)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/linuxmoto/linuxmoto-sdl.cpp 2010-06-29 01:21:30 UTC (rev 50475)
@@ -30,8 +30,8 @@
void OSystem_LINUXMOTO::initBackend() {
// Create the backend custom managers
- if (_eventsManager == 0)
- _eventsManager = new LinuxmotoSdlEventManager();
+ if (_eventManager == 0)
+ _eventManager = new LinuxmotoSdlEventManager(this);
if (_graphicsManager == 0)
_graphicsManager = new LinuxmotoSdlGraphicsManager();
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix-main.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix-main.cpp 2010-06-29 01:08:36 UTC (rev 50474)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix-main.cpp 2010-06-29 01:21:30 UTC (rev 50475)
@@ -23,7 +23,7 @@
*
*/
-#if defined(UNIX) && !defined(MACOSX) && !defined(SAMSUNGTV)
+#if defined(UNIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(LINUXMOTO)
#include "common/scummsys.h"
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