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

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Mon Nov 9 15:43:05 CET 2009


Revision: 45777
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45777&view=rev
Author:   aquadran
Date:     2009-11-09 14:43:05 +0000 (Mon, 09 Nov 2009)

Log Message:
-----------
added support for samsung tv

Modified Paths:
--------------
    scummvm/trunk/backends/base-backend.cpp
    scummvm/trunk/backends/saves/posix/posix-saves.cpp
    scummvm/trunk/common/util.cpp
    scummvm/trunk/configure

Modified: scummvm/trunk/backends/base-backend.cpp
===================================================================
--- scummvm/trunk/backends/base-backend.cpp	2009-11-09 14:31:48 UTC (rev 45776)
+++ scummvm/trunk/backends/base-backend.cpp	2009-11-09 14:43:05 UTC (rev 45777)
@@ -60,8 +60,14 @@
 
 
 #if defined(UNIX)
+#if defined(SAMSUNGTV)
+#define DEFAULT_CONFIG_FILE "/dtv/usb/sda1/.scummvmrc"
+#endif
+#else
 #define DEFAULT_CONFIG_FILE ".scummvmrc"
-#else
+#endif
+
+#if !defined(UNIX)
 #define DEFAULT_CONFIG_FILE "scummvm.ini"
 #endif
 

Modified: scummvm/trunk/backends/saves/posix/posix-saves.cpp
===================================================================
--- scummvm/trunk/backends/saves/posix/posix-saves.cpp	2009-11-09 14:31:48 UTC (rev 45776)
+++ scummvm/trunk/backends/saves/posix/posix-saves.cpp	2009-11-09 14:43:05 UTC (rev 45777)
@@ -44,6 +44,9 @@
 
 POSIXSaveFileManager::POSIXSaveFileManager() {
 	// Register default savepath based on HOME
+#if defined(SAMSUNGTV)
+	ConfMan.registerDefault("savepath", "/dtv/usb/sda1/.scummvm");
+#else
 	Common::String savePath;
 	const char *home = getenv("HOME");
 	if (home && *home && strlen(home) < MAXPATHLEN) {
@@ -51,6 +54,7 @@
 		savePath += "/" DEFAULT_SAVE_PATH;
 		ConfMan.registerDefault("savepath", savePath);
 	}
+#endif
 }
 /*
 POSIXSaveFileManager::POSIXSaveFileManager(const Common::String &defaultSavepath)

Modified: scummvm/trunk/common/util.cpp
===================================================================
--- scummvm/trunk/common/util.cpp	2009-11-09 14:31:48 UTC (rev 45776)
+++ scummvm/trunk/common/util.cpp	2009-11-09 14:43:05 UTC (rev 45777)
@@ -531,5 +531,10 @@
 	if (g_system)
 		g_system->quit();
 
+#if defined(SAMSUNGTV)
+	// FIXME
+	for (;;) {}
+#else
 	exit(1);
+#endif
 }

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-11-09 14:31:48 UTC (rev 45776)
+++ scummvm/trunk/configure	2009-11-09 14:43:05 UTC (rev 45777)
@@ -834,6 +834,11 @@
 	_host_cpu=arm
 	_host_alias=arm-linux-gnueabi
 	;;
+samsungtv)
+	_host_os=linux
+	_host_cpu=arm
+	_host_alias=arm-SamyGO-linux-gnueabi
+	;;
 arm-riscos)
 	_host_os=riscos
 	_host_cpu=arm
@@ -1337,6 +1342,24 @@
 			add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
 			;;
+		samsungtv)
+			DEFINES="$DEFINES -DUNIX -DSAMSUNGTV -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DENABLE_32BIT"
+			ASFLAGS="$ASFLAGS -mfpu=vfp"
+			HOSTEXEEXT=".so"
+			_need_memalign=yes
+			add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
+			add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
+			add_line_to_config_mk 'USE_ARM_GFX_ASM = 1'
+			add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
+			add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
+			_backend="samsungtv"
+			_build_hq_scalers="no"
+			_mt32emu="no"
+			_build_hq_scalers="no"
+			_build_scalers="yes"
+			_vkeybd="yes"
+			_keymapper="yes"
+			;;
 		motoezx)
 			DEFINES="$DEFINES -DUNIX -DMOTOEZX"
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
@@ -1607,7 +1630,7 @@
 # Enable 16bit support only for backends which support it
 #
 case $_backend in
-	sdl | wii | dreamcast)
+	sdl | wii | dreamcast | samsungtv)
 		if test "$_16bit" = auto ; then
 			_16bit=yes
 		else
@@ -2230,6 +2253,14 @@
 		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
 		DEFINES="$DEFINES -DSDL_BACKEND -DLINUXMOTO"
 		;;
+	samsungtv)
+		_sdlconfig="arm-SamyGO-linux-gnueabi-sdl-config"
+		find_sdlconfig
+		INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
+		LIBS="$LIBS `$_sdlconfig --libs`"
+		DEFINES="$DEFINES -DSDL_BACKEND -DSAMSUNGTV"
+		LDFLAGS="$LDFLAGS -shared -fpic -Wl,-whole-archive"
+		;;
 	gp2x)
 		find_sdlconfig
 		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"


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