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

[aquadran at users.sourceforge.net]

Revision: 45806
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45806&view=rev
Author:   aquadran
Date:     2009-11-10 17:18:19 +0000 (Tue, 10 Nov 2009)

Log Message:
-----------
fixed linking in samsungtv target

Modified Paths:
--------------
    scummvm/trunk/backends/platform/samsungtv/events.cpp
    scummvm/trunk/backends/platform/samsungtv/sdl.cpp
    scummvm/trunk/backends/platform/samsungtv/sdl.h
    scummvm/trunk/configure

Modified: scummvm/trunk/backends/platform/samsungtv/events.cpp
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/events.cpp	2009-11-10 11:20:35 UTC (rev 45805)
+++ scummvm/trunk/backends/platform/samsungtv/events.cpp	2009-11-10 17:18:19 UTC (rev 45806)
@@ -29,7 +29,7 @@
 
 #if defined(SAMSUNGTV)
 
-void OSystem_SDL::handleKbdMouse() {
+void OSystem_SDL_SamsungTV::handleKbdMouse() {
 	uint32 curTime = getMillis();
 	if (curTime >= _km.last_time + _km.delay_time) {
 		_km.last_time = curTime;
@@ -96,7 +96,7 @@
 	}
 }
 
-bool OSystem_SDL::pollEvent(Common::Event &event) {
+bool OSystem_SDL_SamsungTV::pollEvent(Common::Event &event) {
 	SDL_Event ev;
 
 	handleKbdMouse();

Modified: scummvm/trunk/backends/platform/samsungtv/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/sdl.cpp	2009-11-10 11:20:35 UTC (rev 45805)
+++ scummvm/trunk/backends/platform/samsungtv/sdl.cpp	2009-11-10 17:18:19 UTC (rev 45806)
@@ -50,13 +50,6 @@
 	return interval;
 }
 
-AspectRatio::AspectRatio(int w, int h) {
-	// TODO : Validation and so on...
-	// Currently, we just ensure the program don't instantiate non-supported aspect ratios
-	_kw = w;
-	_kh = h;
-}
-
 static const size_t AR_COUNT = 4;
 static const char*       desiredAspectRatioAsStrings[AR_COUNT] = {            "auto",            "4/3",            "16/9",            "16/10" };
 static const AspectRatio desiredAspectRatios[AR_COUNT]         = { AspectRatio(0, 0), AspectRatio(4,3), AspectRatio(16,9), AspectRatio(16,10) };

Modified: scummvm/trunk/backends/platform/samsungtv/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/sdl.h	2009-11-10 11:20:35 UTC (rev 45805)
+++ scummvm/trunk/backends/platform/samsungtv/sdl.h	2009-11-10 17:18:19 UTC (rev 45806)
@@ -51,10 +51,6 @@
 	// Typically, 320x200 CLUT8
 	virtual void initSize(uint w, uint h, const Graphics::PixelFormat *format);
 
-	// Draw a bitmap to screen.
-	// The screen will not be updated to reflect the new bitmap
-	virtual void copyRectToScreen(const byte *src, int pitch, int x, int y, int w, int h); // overloaded by CE backend (FIXME)
-
 	// Warp the mouse cursor. Where set_mouse_pos() only informs the
 	// backend of the mouse cursor's current position, this function
 	// actually moves the cursor to the specified position.
@@ -88,10 +84,7 @@
 
 	SDL_Surface *_prehwscreen;
 
-	virtual void setGraphicsModeIntern();
-
 	virtual void drawMouse(); // overloaded by CE backend
-	virtual void undrawMouse(); // overloaded by CE backend (FIXME)
 	virtual void blitCursor(); // overloaded by CE backend (FIXME)
 
 	virtual void internUpdateScreen(); // overloaded by CE backend
@@ -101,7 +94,6 @@
 	virtual bool hotswapGFXMode(); // overloaded by CE backend
 
 	void setFullscreenMode(bool enable);
-	void setAspectRatioCorrection(bool enable);
 
 	void handleKbdMouse();
 

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-11-10 11:20:35 UTC (rev 45805)
+++ scummvm/trunk/configure	2009-11-10 17:18:19 UTC (rev 45806)
@@ -2260,6 +2260,7 @@
 		LIBS="$LIBS `$_sdlconfig --libs`"
 		DEFINES="$DEFINES -DSDL_BACKEND -DSAMSUNGTV"
 		LDFLAGS="$LDFLAGS -shared -fpic -Wl,-whole-archive"
+		MODULES="$MODULES backends/platform/sdl"
 		;;
 	gp2x)
 		find_sdlconfig


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