[Scummvm-cvs-logs] SF.net SVN: scummvm:[45734] scummvm/branches/branch-1-0-0

sev at users.sourceforge.net sev at users.sourceforge.net
Sat Nov 7 21:10:52 CET 2009


Revision: 45734
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45734&view=rev
Author:   sev
Date:     2009-11-07 20:10:51 +0000 (Sat, 07 Nov 2009)

Log Message:
-----------
Add missing files to linuxmoto backend

Added Paths:
-----------
    scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-main.cpp
    scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-scaler.cpp
    scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-scaler.h
    scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto.mk
    scummvm/branches/branch-1-0-0/dists/motomagx/mgx/
    scummvm/branches/branch-1-0-0/dists/motomagx/mgx/icon.png
    scummvm/branches/branch-1-0-0/dists/motomagx/mgx/scummvm.cfg
    scummvm/branches/branch-1-0-0/dists/motomagx/mgx/scummvm.lin
    scummvm/branches/branch-1-0-0/dists/motomagx/mpkg/scummvm.sh

Added: scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-main.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-main.cpp	                        (rev 0)
+++ scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-main.cpp	2009-11-07 20:10:51 UTC (rev 45734)
@@ -0,0 +1,44 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/scummsys.h"
+#include "common/system.h"
+
+#include <SDL/SDL.h>
+#include <SDL/SDL_syswm.h>
+
+#include "backends/platform/linuxmoto/linuxmoto-sdl.h"
+#include "base/main.h"
+#include "base/internal_version.h"
+
+int main(int argc, char *argv[]) {
+	g_system = new OSystem_LINUXMOTO();
+	assert(g_system);
+	// Invoke the actual ScummVM main entry point:
+	int res = scummvm_main(argc, argv);
+	g_system->quit();	// TODO: Consider removing / replacing this!
+
+	return res;
+}


Property changes on: scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-main.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Added: scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-scaler.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-scaler.cpp	                        (rev 0)
+++ scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-scaler.cpp	2009-11-07 20:10:51 UTC (rev 45734)
@@ -0,0 +1,39 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL: 
+ * $Id: 
+ *
+ */
+
+#include "graphics/scaler/intern.h"
+#include "backends/platform/linuxmoto/linuxmoto-sdl.h"
+
+extern "C" {
+	void PocketPCHalfARM(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height, int mask, int round);
+	// Rounding constants and masks used for different pixel formats
+	int roundingconstants[] = { 0x00200802, 0x00201002 };
+	int redbluegreenMasks[] = { 0x03E07C1F, 0x07E0F81F };
+}
+
+void HalfScale(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
+	int maskUsed = (gBitFormat == 565);
+	PocketPCHalfARM(srcPtr, srcPitch, dstPtr, dstPitch, width, height, redbluegreenMasks[maskUsed],roundingconstants[maskUsed]);
+}


Property changes on: scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-scaler.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Added: scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-scaler.h
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-scaler.h	                        (rev 0)
+++ scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-scaler.h	2009-11-07 20:10:51 UTC (rev 45734)
@@ -0,0 +1,42 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL: 
+ * $Id: 
+ *
+ */
+
+#ifndef LINUXMOTO_SCALER_H
+#define LINUXMOTO_SCALER_H
+
+#include "common/scummsys.h"
+#include "common/system.h"
+#include "graphics/scaler.h"
+#include "graphics/scaler/intern.h"
+
+// FIXME: For now keep hacks in this header to save polluting the SDL backend.
+enum {
+	GFX_HALF = 12
+};
+
+// TODO/FIXME: Move this platform specific scaler into /graphics/scaler and properly merge with the WinCE PocketPCHalf that it is based on.
+DECLARE_SCALER(HalfScale);
+
+#endif


Property changes on: scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-scaler.h
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Added: scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto.mk
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto.mk	                        (rev 0)
+++ scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto.mk	2009-11-07 20:10:51 UTC (rev 45734)
@@ -0,0 +1,40 @@
+# Special target to create a motoezx snapshot
+motoezx: $(EXECUTABLE)
+	$(MKDIR) motoezx/scummvm
+	$(STRIP) $(EXECUTABLE) -o motoezx/scummvm/$(EXECUTABLE)
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) motoezx/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip motoezx/scummvm/
+	$(CP) $(srcdir)/dists/motoezx/* motoezx/scummvm/
+	tar -C motoezx -cvzf motoezx/ScummVM.pkg scummvm
+	$(RM) -r motoezx/scummvm
+
+# Special target to create a motomagx snapshot
+motomagx-mpkg: $(EXECUTABLE)
+	$(MKDIR) motomagx/scummvm
+	$(STRIP) $(EXECUTABLE) -o motomagx/scummvm/$(EXECUTABLE)
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) motomagx/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip motomagx/scummvm/
+	$(CP) $(srcdir)/dists/motomagx/mpkg/* motomagx/scummvm/
+	tar -C motomagx -cvzf motomagx/ScummVM.mpkg scummvm
+	$(RM) -r motomagx/scummvm
+
+motomagx-mgx: $(EXECUTABLE)
+	$(MKDIR) motomagx/scummvm
+	$(STRIP) $(EXECUTABLE) -o motomagx/scummvm/$(EXECUTABLE)
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) motomagx/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip motomagx/scummvm/
+	$(CP) $(srcdir)/dists/motomagx/mgx/* motomagx/scummvm/
+	tar -C motomagx -cvf motomagx/ScummVM.mgx scummvm
+	$(RM) -r motomagx/scummvm
+
+motomagx-pep: $(EXECUTABLE)
+	$(MKDIR) motomagx/pep
+	$(CP) -r $(srcdir)/dists/motomagx/pep/* motomagx/pep
+	$(RM) -r motomagx/pep/app/.svn
+	$(STRIP) $(EXECUTABLE) -o motomagx/pep/app/$(EXECUTABLE)
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) motomagx/pep/app
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip motomagx/pep/app
+	tar -C motomagx/pep -czvf motomagx/ScummVM.pep app description.ini  scummvm_big_usr.png  scummvm_small_usr.png
+	$(RM) -r motomagx/pep
+
+.PHONY: motoezx motomagx-mpkg motomagx-mgx motomagx-pep


Property changes on: scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto.mk
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: scummvm/branches/branch-1-0-0/dists/motomagx/mgx/icon.png
===================================================================
(Binary files differ)


Property changes on: scummvm/branches/branch-1-0-0/dists/motomagx/mgx/icon.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: scummvm/branches/branch-1-0-0/dists/motomagx/mgx/scummvm.cfg
===================================================================
--- scummvm/branches/branch-1-0-0/dists/motomagx/mgx/scummvm.cfg	                        (rev 0)
+++ scummvm/branches/branch-1-0-0/dists/motomagx/mgx/scummvm.cfg	2009-11-07 20:10:51 UTC (rev 45734)
@@ -0,0 +1,6 @@
+Name = ScummVM
+Exec = scummvm.lin
+Icon = icon.png
+Author = ScummVM Team
+Version = 1.0.0
+Comment = ScummVM
\ No newline at end of file


Property changes on: scummvm/branches/branch-1-0-0/dists/motomagx/mgx/scummvm.cfg
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: scummvm/branches/branch-1-0-0/dists/motomagx/mgx/scummvm.lin
===================================================================
--- scummvm/branches/branch-1-0-0/dists/motomagx/mgx/scummvm.lin	                        (rev 0)
+++ scummvm/branches/branch-1-0-0/dists/motomagx/mgx/scummvm.lin	2009-11-07 20:10:51 UTC (rev 45734)
@@ -0,0 +1,9 @@
+#!/bin/bash
+mypath=${0%/*}
+GAMES=/mmc/mmca1/games
+LIBDIR=$GAMES/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBDIR
+export SDL_QT_MODIFICATOR=1
+export HOME=$GAMES
+cd $mypath
+exec $mypath/scummvm --gfx-mode=1x > $mypath/scummvm.log


Property changes on: scummvm/branches/branch-1-0-0/dists/motomagx/mgx/scummvm.lin
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: scummvm/branches/branch-1-0-0/dists/motomagx/mpkg/scummvm.sh
===================================================================
--- scummvm/branches/branch-1-0-0/dists/motomagx/mpkg/scummvm.sh	                        (rev 0)
+++ scummvm/branches/branch-1-0-0/dists/motomagx/mpkg/scummvm.sh	2009-11-07 20:10:51 UTC (rev 45734)
@@ -0,0 +1,11 @@
+#!/bin/sh
+GAMES=/mmc/mmca1/.Games
+DIR=`busybox dirname "$0"`
+LIBDIR=/mmc/mmca1/.system/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBDIR
+export SDL_QT_MODIFICATOR=1
+export HOME=$GAMES
+cd $DIR
+rm /mmc/mmca1/.system/mySDL.cfg
+cp $DIR/mySDL.cfg /mmc/mmca1/.system/mySDL.cfg
+exec $DIR/scummvm --gfx-mode=1x > $DIR/scummvm.log


Property changes on: scummvm/branches/branch-1-0-0/dists/motomagx/mpkg/scummvm.sh
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native


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