[Scummvm-cvs-logs] SF.net SVN: scummvm: [30427] scummvm/trunk
sev at users.sourceforge.net
sev at users.sourceforge.net
Fri Jan 11 23:44:29 CET 2008
Revision: 30427
http://scummvm.svn.sourceforge.net/scummvm/?rev=30427&view=rev
Author: sev
Date: 2008-01-11 14:44:28 -0800 (Fri, 11 Jan 2008)
Log Message:
-----------
First part of Maemo port
Modified Paths:
--------------
scummvm/trunk/NEWS
scummvm/trunk/README
scummvm/trunk/backends/platform/maemo/Makefile
scummvm/trunk/configure
Added Paths:
-----------
scummvm/trunk/dists/maemo/
scummvm/trunk/dists/maemo/scummvm.desktop
scummvm/trunk/dists/maemo/scummvm.wrapper
Modified: scummvm/trunk/NEWS
===================================================================
--- scummvm/trunk/NEWS 2008-01-11 22:39:51 UTC (rev 30426)
+++ scummvm/trunk/NEWS 2008-01-11 22:44:28 UTC (rev 30427)
@@ -19,6 +19,7 @@
New Ports:
- Added iPhone port.
+ - Added Maemo port for Nokia Internet tablets.
General:
- Added ARM assembly routines for code in the sound mixer and SCUMM
Modified: scummvm/trunk/README
===================================================================
--- scummvm/trunk/README 2008-01-11 22:39:51 UTC (rev 30426)
+++ scummvm/trunk/README 2008-01-11 22:44:28 UTC (rev 30427)
@@ -719,6 +719,7 @@
PlayStation Portable
RISC OS
Symbian
+ Maemo (Nokia Internet tablets 770, N800, N810)
The Dreamcast port does not support The Curse of Monkey Island, nor The Dig.
The PalmOS port does not support The Curse of Monkey Island, Beneath a Steel
@@ -1778,6 +1779,16 @@
* Please refer to:
http://wiki.scummvm.org/index.php/Compiling_ScummVM/iPhone
+ Maemo:
+ * Get Scratchbox environment with Maemo 2.2 rootstrap (2.2 is for 770 and up)
+ * Install limbad, Tremor, FLAC, libmpeg2 from source
+ * patch scummvm source (some stuff is currently too dirty to be in svn directly)
+ patch -p1 < backends/platform/maemo/scummvm-0.11.0-maemo.patch
+ * go to backends/platform/maemo
+ * run 'make config'
+ * run 'make scummvm'
+ * create your debian/changelog in top directory
+ * run 'make deb' in backends/platform/maemo
------------------------------------------------------------------------
Good Luck and Happy Adventuring!
Modified: scummvm/trunk/backends/platform/maemo/Makefile
===================================================================
--- scummvm/trunk/backends/platform/maemo/Makefile 2008-01-11 22:39:51 UTC (rev 30426)
+++ scummvm/trunk/backends/platform/maemo/Makefile 2008-01-11 22:44:28 UTC (rev 30427)
@@ -1,69 +1,19 @@
-# ScummVM Maemo MakeFile
-# $URL$
-# $Id$
+.PHONY: all
-#control build
-DISABLE_HQ_SCALERS = true
+all:
-#DISABLE_SCUMM = 1
-#DISABLE_HE = 1
-DISABLE_AGOS = 1
-DISABLE_SKY = 1
-DISABLE_SWORD1 = 1
-DISABLE_SWORD2 = 1
-DISABLE_QUEEN = 1
-DISABLE_KYRA = 1
-DISABLE_SAGA = 1
-DISABLE_GOB = 1
-DISABLE_LURE = 1
-DISABLE_CINE = 1
-DISABLE_AGI = 1
-srcdir = ../../..
-VPATH = $(srcdir)
+SRCDIR = ../../..
-CXX := g++
-EXECUTABLE := scummvm
+config:
+ cd $(SRCDIR) ; CXXFLAGS="-Os -mcpu=arm926ej-s -fomit-frame-pointer -DMAEMO_SDL" ./configure --host=arm-linux --prefix=/usr --disable-debug --disable-mt32emu --disable-hq-scalers --with-tremor-prefix=/usr --enable-tremor --with-zlib-prefix=/usr --enable-zlib --with-mad-prefix=/usr --enable-mad --enable-flac --disable-fluidsynth
-INCDIR = $(srcdir)/ . $(srcdir)/engines/
+scummvm:
+ cd $(SRCDIR) ; make
+ echo "If there is compiler crash (in Kyra engine) then cd ../../.. and copy/run last line with -O3 instead of -Os and re-run make"
+# cp $(SRCDIR)/scummvm .
-CXXFLAGS := -g -ansi -W -Wno-unused-parameter
-CXXFLAGS += `pkg-config --cflags gconf-2.0 hildon-libs gtk+-2.0 libosso gdk-2.0`
-CXXFLAGS += $(addprefix -I,$(INCDIR)) -I. -Wall $(CXXFLAGS)
-CXXFLAGS += -O -Wuninitialized
-CXXFLAGS += -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
-# Even more warnings...
-CXXFLAGS += -pedantic -Wpointer-arith -Wcast-qual -Wconversion
-CXXFLAGS += -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor
-CXXFLAGS += -Wno-reorder -Wwrite-strings -fcheck-new
-LIBS += -lz -L/usr/lib -lSDL -lpthread -lXsp -losso
-LIBS += `pkg-config --libs gconf-2.0 hildon-libs gtk+-2.0 libosso gdk-2.0`
-INCLUDES += -I/usr/include/SDL -D_REENTRANT -I/usr/X11R6/include
-OBJS +=
-DEFINES += -DUNIX -DNONSTANDARD_PORT -D__MAEMO__
-LDFLAGS +=
+deb: $(SRCDIR)/scummvm
+ cd $(SRCDIR) ; dpkg-buildpackage -rfakeroot -b -nc
-RANLIB := ranlib
-INSTALL := install
-AR := ar cru
-MKDIR := mkdir -p
-ECHO := printf
-CAT := cat
-RM := rm -f
-RM_REC := rm -f -r
-CP := cp
-
-OBJS := main.o maemo-sdl.o
-
-MODULE_DIRS += .
-
-
-BACKEND := sdl
-MODULES += backends/platform/sdl base
-MODULE_DIRS += .
-
-HAVE_GCC3 = 1
-
-include $(srcdir)/Makefile.common
-
Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure 2008-01-11 22:39:51 UTC (rev 30426)
+++ scummvm/trunk/configure 2008-01-11 22:44:28 UTC (rev 30427)
@@ -1332,7 +1332,11 @@
fi
if test "$_flac" = yes ; then
_def_flac='#define USE_FLAC'
- LIBS="$LIBS $FLAC_LIBS $OGG_LIBS -lFLAC -logg"
+ if test "$_ogg" = yes ; then
+ LIBS="$LIBS $FLAC_LIBS $OGG_LIBS -lFLAC -logg"
+ else
+ LIBS="$LIBS $FLAC_LIBS -lFLAC"
+ fi
INCLUDES="$INCLUDES $FLAC_CFLAGS"
add_to_config_mk_if_no no 'USE_FLAC = 1'
else
Added: scummvm/trunk/dists/maemo/scummvm.desktop
===================================================================
--- scummvm/trunk/dists/maemo/scummvm.desktop (rev 0)
+++ scummvm/trunk/dists/maemo/scummvm.desktop 2008-01-11 22:44:28 UTC (rev 30427)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=ScummVM
+Exec=/usr/games/scummvm
+Icon=scummvm
+X-Icon-path=/usr/share/icons
+X-Window-Icon=scummvm
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
Property changes on: scummvm/trunk/dists/maemo/scummvm.desktop
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: scummvm/trunk/dists/maemo/scummvm.wrapper
===================================================================
--- scummvm/trunk/dists/maemo/scummvm.wrapper (rev 0)
+++ scummvm/trunk/dists/maemo/scummvm.wrapper 2008-01-11 22:44:28 UTC (rev 30427)
@@ -0,0 +1,6 @@
+#!/bin/sh
+# wrapper for proper WM_CLASS name in SDL apps (needed for icon in taskbar)
+#BASEDIR=`dirname $0`
+BASENAME=`basename $0`
+export SDL_VIDEO_X11_WMCLASS=${BASENAME}
+exec ${0}.bin "$@"
Property changes on: scummvm/trunk/dists/maemo/scummvm.wrapper
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: 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