diff options
author | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
---|---|---|
committer | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
commit | 6d153f311c65fe414e31e99f8a9a6503c49a01a5 (patch) | |
tree | 9173f9964c0fec4215514e622f705810730d0ce9 /dists | |
parent | 47c2a9adbe8d9e6640a819386f0f34e929937672 (diff) | |
parent | 66b43f2312578f35e0718d0699de207a7bf77f1a (diff) | |
download | scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.gz scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.bz2 scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.zip |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'dists')
-rw-r--r-- | dists/android/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | dists/android/AndroidManifest.xml.in | 2 | ||||
-rwxr-xr-x | dists/android/mkmanifest.pl | 170 | ||||
-rwxr-xr-x | dists/android/mkplugin.sh | 17 | ||||
-rw-r--r-- | dists/android/plugin-manifest.xml | 35 | ||||
-rw-r--r-- | dists/android/plugin-manifest.xml.in | 35 | ||||
-rw-r--r-- | dists/android/plugin-strings.xml | 7 | ||||
-rw-r--r-- | dists/msvc10/readme.txt | 2 | ||||
-rw-r--r-- | dists/msvc8/readme.txt | 2 | ||||
-rw-r--r-- | dists/msvc9/readme.txt | 2 | ||||
-rw-r--r-- | dists/webos/README.WebOS | 37 | ||||
-rw-r--r-- | dists/webos/mojo/appinfo.json | 10 | ||||
-rw-r--r-- | dists/webos/mojo/icon.png | bin | 0 -> 3290 bytes | |||
-rw-r--r-- | dists/webos/mojo/package.properties | 1 | ||||
-rw-r--r-- | dists/webos/mojo/scummvmrc-default | 36 | ||||
-rwxr-xr-x | dists/webos/mojo/start | 32 |
16 files changed, 215 insertions, 175 deletions
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml index 68c58d9aea..cae1f369e7 100644 --- a/dists/android/AndroidManifest.xml +++ b/dists/android/AndroidManifest.xml @@ -3,7 +3,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.inodes.gus.scummvm" - android:versionCode="6" + android:versionCode="@ANDROID_VERSIONCODE@" android:versionName="1.3.0git" android:installLocation="preferExternal"> diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in index 7a75b6fd0b..a8d40bdddc 100644 --- a/dists/android/AndroidManifest.xml.in +++ b/dists/android/AndroidManifest.xml.in @@ -3,7 +3,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.inodes.gus.scummvm" - android:versionCode="6" + android:versionCode="@ANDROID_VERSIONCODE@" android:versionName="@VERSION@" android:installLocation="preferExternal"> diff --git a/dists/android/mkmanifest.pl b/dists/android/mkmanifest.pl deleted file mode 100755 index 62caa64a55..0000000000 --- a/dists/android/mkmanifest.pl +++ /dev/null @@ -1,170 +0,0 @@ -#!/usr/bin/perl - -use File::Basename qw(dirname); -use File::Path qw(mkpath); -use IO::File; -use XML::Writer; -use XML::Parser; -use Getopt::Long; - -use warnings; -use strict; - -use constant ANDROID => 'http://schemas.android.com/apk/res/android'; - -my $id; -my $package_versionName; -my $package_versionCode; -my $configure = 'configure'; -my $stringres = 'res/string/values.xml'; -my $manifest = 'AndroidManifest.xml'; -my $master_manifest; -my @unpack_libs; -GetOptions('id=s' => \$id, - 'version-name=s' => \$package_versionName, - 'version-code=i' => \$package_versionCode, - 'configure=s' => \$configure, - 'stringres=s' => \$stringres, - 'manifest=s' => \$manifest, - 'master-manifest=s' => \$master_manifest, - 'unpacklib=s' => \@unpack_libs, - ) or die; -die "Missing required arg" - unless $id and $package_versionName and $package_versionCode; - - -sub grope_engine_info { - my $configure = shift; - my @ret; - while (<$configure>) { - m/^add_engine \s+ (\w+) \s+ "(.*?)" \s+ \w+ (?:\s+ "([\w\s]*)")?/x - or next; - my $subengines = $3 || ''; - my %info = (id => $1, name => $2, - subengines => [split / /, $subengines]); - push @ret, \%info; - } - return @ret; -} - -sub read_constraints { - my $manifest = shift; - my @constraints; - my $parser = new XML::Parser Handlers => { - Start => sub { - my $expat = shift; - my $elem = shift; - return if $elem !~ - /^(uses-configuration|supports-screens|uses-sdk)$/; - my @constraint = ($elem); - while (@_) { - my $attr = shift; - my $value = shift; - $attr = [ANDROID, $attr] if $attr =~ s/^android://; - push @constraint, $attr, $value; - } - push @constraints, \@constraint; - }, - }; - $parser->parse($manifest); - return @constraints; -} - -sub print_stringres { - my $output = shift; - my $info = shift; - - my $writer = new XML::Writer(OUTPUT => $output, ENCODING => 'utf-8', - DATA_MODE => 1, DATA_INDENT => 2); - - $writer->xmlDecl(); - $writer->startTag('resources'); - - while (my ($k,$v) = each %$info) { - $writer->dataElement('string', $v, name => $k); - } - - $writer->endTag('resources'); - $writer->end(); -} - -sub print_manifest { - my $output = shift; - my $info = shift; - my $constraints = shift; - - my $writer = new XML::Writer(OUTPUT => $output, ENCODING => 'utf-8', - DATA_MODE => 1, DATA_INDENT => 2, - NAMESPACES => 1, - PREFIX_MAP => {ANDROID, 'android'}); - - $writer->xmlDecl(); - - $writer->startTag( - 'manifest', - 'package' => "org.inodes.gus.scummvm.plugin.$info->{name}", - [ANDROID, 'versionCode'] => $package_versionCode, - [ANDROID, 'versionName'] => $package_versionName, - [ANDROID, 'installLocation'] => 'preferExternal', - ); - - $writer->startTag( - 'application', - [ANDROID, 'label'] => '@string/app_name', - [ANDROID, 'description'] => '@string/app_desc', - [ANDROID, 'icon'] => '@drawable/scummvm', - ); - - $writer->startTag( - 'receiver', - [ANDROID, 'name'] => 'org.inodes.gus.scummvm.PluginProvider', - [ANDROID, 'process'] => 'org.inodes.gus.scummvm'); - - $writer->startTag('intent-filter'); - $writer->emptyTag('action', [ANDROID, 'name'] => - 'org.inodes.gus.scummvm.action.PLUGIN_QUERY'); - $writer->emptyTag('category', [ANDROID, 'name'] => - 'android.intent.category.INFO'); - $writer->endTag('intent-filter'); - $writer->emptyTag( - 'meta-data', - [ANDROID, 'name'] => 'org.inodes.gus.scummvm.meta.UNPACK_LIB', - [ANDROID, 'value'] => $_) - for @{$info->{unpack_libs}}; - - $writer->endTag('receiver'); - $writer->endTag('application'); - - $writer->emptyTag('uses-permission', [ANDROID, 'name'] => - 'org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN'); - - $writer->emptyTag(@$_) foreach @$constraints; - - $writer->endTag('manifest'); - $writer->end(); -} - - -my %engines; -for my $engine (grope_engine_info(new IO::File $configure, 'r')) { - $engines{$engine->{id}} = $engine; -} - -my @games = ($id, @{$engines{$id}{subengines}}); -my $games_desc = join('; ', map $engines{$_}{name}, @games); - -my @constraints = read_constraints(new IO::File $master_manifest, 'r'); - -print "Writing $stringres ...\n"; -mkpath(dirname($stringres)); -print_stringres(IO::File->new($stringres, 'w'), - {app_name => qq{ScummVM plugin: "$id"}, - app_desc => "Game engine for: $games_desc", - }); - -print "Writing $manifest ...\n"; -mkpath(dirname($manifest)); -print_manifest(IO::File->new($manifest, 'w'), - {name => $id, unpack_libs => \@unpack_libs}, \@constraints); - -exit 0; diff --git a/dists/android/mkplugin.sh b/dists/android/mkplugin.sh new file mode 100755 index 0000000000..f4643132cf --- /dev/null +++ b/dists/android/mkplugin.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +if [ $# -ne 5 ]; then + echo "usage: $0 configure plugin template versioncode target" + exit 1 +fi + +CONFIGURE=$1 +PLUGIN_NAME=$2 +TEMPLATE=$3 +PLUGIN_VERSION_CODE=$4 +TARGET=$5 + +PLUGIN_DESC=`sed -n s/add_engine\s$PLUGIN_NAME\s\"\(.\+\)\"\s.*/\1/p` < $CONFIGURE + +sed "s|@PLUGIN_NAME@|$PLUGIN_NAME|;s|@PLUGIN_VERSION_CODE@|$PLUGIN_VERSION_CODE|;s|@PLUGIN_DESC@|$PLUGIN_DESC|" < $TEMPLATE > $TARGET + diff --git a/dists/android/plugin-manifest.xml b/dists/android/plugin-manifest.xml new file mode 100644 index 0000000000..2442d3f32a --- /dev/null +++ b/dists/android/plugin-manifest.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="org.inodes.gus.scummvm.plugin.@PLUGIN_NAME@" + android:versionCode="@PLUGIN_VERSION_CODE@" + android:versionName="1.3.0git" + android:installLocation="preferExternal"> + + <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" /> + + <application android:label="@string/app_name" + android:description="@string/app_desc" + android:icon="@drawable/scummvm"> + <receiver android:name="org.inodes.gus.scummvm.PluginProvider" + android:process="org.inodes.gus.scummvm"> + <intent-filter> + <action android:name="org.inodes.gus.scummvm.action.PLUGIN_QUERY"/> + <category android:name="android.intent.category.INFO"/> + </intent-filter> + <meta-data android:name="org.inodes.gus.scummvm.meta.UNPACK_LIB" + android:value="mylib/armeabi/lib@PLUGIN_NAME@.so" /> + </receiver> + </application> + + <uses-permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"/> + <uses-configuration android:reqFiveWayNav="true" + android:reqKeyboardType="qwerty"/> + + <uses-configuration android:reqTouchScreen="finger" + android:reqKeyboardType="qwerty"/> + + <uses-configuration android:reqTouchScreen="stylus" + android:reqKeyboardType="qwerty"/> +</manifest> + diff --git a/dists/android/plugin-manifest.xml.in b/dists/android/plugin-manifest.xml.in new file mode 100644 index 0000000000..c941b2f48c --- /dev/null +++ b/dists/android/plugin-manifest.xml.in @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="org.inodes.gus.scummvm.plugin.@PLUGIN_NAME@" + android:versionCode="@PLUGIN_VERSION_CODE@" + android:versionName="@VERSION@" + android:installLocation="preferExternal"> + + <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" /> + + <application android:label="@string/app_name" + android:description="@string/app_desc" + android:icon="@drawable/scummvm"> + <receiver android:name="org.inodes.gus.scummvm.PluginProvider" + android:process="org.inodes.gus.scummvm"> + <intent-filter> + <action android:name="org.inodes.gus.scummvm.action.PLUGIN_QUERY"/> + <category android:name="android.intent.category.INFO"/> + </intent-filter> + <meta-data android:name="org.inodes.gus.scummvm.meta.UNPACK_LIB" + android:value="mylib/armeabi/lib@PLUGIN_NAME@.so" /> + </receiver> + </application> + + <uses-permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"/> + <uses-configuration android:reqFiveWayNav="true" + android:reqKeyboardType="qwerty"/> + + <uses-configuration android:reqTouchScreen="finger" + android:reqKeyboardType="qwerty"/> + + <uses-configuration android:reqTouchScreen="stylus" + android:reqKeyboardType="qwerty"/> +</manifest> + diff --git a/dists/android/plugin-strings.xml b/dists/android/plugin-strings.xml new file mode 100644 index 0000000000..363503f8d8 --- /dev/null +++ b/dists/android/plugin-strings.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> + +<resources> + <string name="app_name">ScummVM plugin: "@PLUGIN_NAME@"</string> + <string name="app_desc">Game engine for: @PLUGIN_DESC@</string> +</resources> + diff --git a/dists/msvc10/readme.txt b/dists/msvc10/readme.txt index be7b8a4db5..fa077fa485 100644 --- a/dists/msvc10/readme.txt +++ b/dists/msvc10/readme.txt @@ -1,5 +1,5 @@ The Visual Studio project files can now be created automatically from the GCC -files using the create_project tool inside the /tools/create_project folder. +files using the create_project tool inside the /devtools/create_project folder. To create the default project files, build create_project.exe, copy it inside this folder and run the create_msvc10.bat file for a default build. You can run diff --git a/dists/msvc8/readme.txt b/dists/msvc8/readme.txt index 461e5c9bd5..95b55e973a 100644 --- a/dists/msvc8/readme.txt +++ b/dists/msvc8/readme.txt @@ -1,5 +1,5 @@ The Visual Studio project files can now be created automatically from the GCC -files using the create_project tool inside the /tools/create_project folder. +files using the create_project tool inside the /devtools/create_project folder. To create the default project files, build create_project.exe, copy it inside this folder and run the create_msvc8.bat file for a default build. You can run diff --git a/dists/msvc9/readme.txt b/dists/msvc9/readme.txt index 059c9e556b..410b8ea403 100644 --- a/dists/msvc9/readme.txt +++ b/dists/msvc9/readme.txt @@ -1,5 +1,5 @@ The Visual Studio project files can now be created automatically from the GCC -files using the create_project tool inside the /tools/create_project folder. +files using the create_project tool inside the /devtools/create_project folder. To create the default project files, build create_project.exe, copy it inside this folder and run the create_msvc9.bat file for a default build. You can run diff --git a/dists/webos/README.WebOS b/dists/webos/README.WebOS new file mode 100644 index 0000000000..5947d86f20 --- /dev/null +++ b/dists/webos/README.WebOS @@ -0,0 +1,37 @@ +README for the WebOS port of ScummVM +------------------------------------ + +INSTALLATION + + When starting ScummVM the first time on a WebOS device it creates the + following directory structure on the flash drive: + + ScummVM/ + Extras/ + Games/ + Plugins/ + Saves/ + Screenshots/ + Themes/ + + To install the games switch your WebOS device to USB drive mode and copy + the game folders into the ScummVM/Games directory. Then start ScummVM, + click "Add game" and select the game folder. + +CONTROLS + + Touchscreen + + The touchscreen operates like a touchpad. The mouse cursor is independent + of the touched point, it is moved relative to its current position. + + Tap + movement: Mouse movement + Tap without movement: Left mouse button click + Tap held for >0.5s without movement: Right mouse button click + Tap held for >1s without movement: Middle mouse button click + Double Tap + movement: Drag and drop + + Gesture area + + Back gesture: Escape + Forward gesture: ScummVM menu diff --git a/dists/webos/mojo/appinfo.json b/dists/webos/mojo/appinfo.json new file mode 100644 index 0000000000..00762c9410 --- /dev/null +++ b/dists/webos/mojo/appinfo.json @@ -0,0 +1,10 @@ +{ + "id": "org.scummvm.scummvm", + "version": "1.3.0001", + "vendor": "ScummVM Team", + "type": "pdk", + "main": "start", + "title": "ScummVM", + "icon": "icon.png", + "requiredMemory": 64 +} diff --git a/dists/webos/mojo/icon.png b/dists/webos/mojo/icon.png Binary files differnew file mode 100644 index 0000000000..eb9d8e37e7 --- /dev/null +++ b/dists/webos/mojo/icon.png diff --git a/dists/webos/mojo/package.properties b/dists/webos/mojo/package.properties new file mode 100644 index 0000000000..962e809ec6 --- /dev/null +++ b/dists/webos/mojo/package.properties @@ -0,0 +1 @@ +filemode.755=start,bin/scummvm diff --git a/dists/webos/mojo/scummvmrc-default b/dists/webos/mojo/scummvmrc-default new file mode 100644 index 0000000000..d29a0fc6db --- /dev/null +++ b/dists/webos/mojo/scummvmrc-default @@ -0,0 +1,36 @@ +[scummvm] +gui_theme=scummmodern +mute=false +speech_volume=192 +native_mt32=false +midi_gain=100 +talkspeed=60 +subtitles=true +multi_midi=false +fullscreen=true +sfx_volume=192 +music_volume=192 +autosave_period=300 +music_driver=auto +opl_driver=auto +aspect_ratio=false +speech_mute=false +enable_gs=false +browser_lastpath=/media/internal/ScummVM/Games +themepath=/media/internal/ScummVM/Themes +savepath=/media/internal/ScummVM/Saves +extrapath=/media/internal/ScummVM/Extras +pluginspath=/media/internal/ScummVM/Plugins +vkeybdpath=/media/cryptofs/apps/usr/palm/applications/org.scummvm.scummvm/share/scummvm + +[keymapper] +keymap_global_MEN=FORWARD +keymap_gui_VIR=C+k +keymap_global_SKL=PERIOD +keymap_global_SKC=ESCAPE +keymap_gui_REM=AT +keymap_global_PAU=SPACE +keymap_gui_CLO=ESCAPE +keymap_gui_CLI=RETURN +keymap_global_VIR=C+k +keymap_global_REM=AT diff --git a/dists/webos/mojo/start b/dists/webos/mojo/start new file mode 100755 index 0000000000..3bdb9a59d8 --- /dev/null +++ b/dists/webos/mojo/start @@ -0,0 +1,32 @@ +#!/bin/sh + +# Setup directories +APPDIR=$(readlink -f $(dirname $0)) +SCUMMVMDIR=/media/internal/ScummVM + + +# Create the initial ScummVM directory structure +mkdir -p $SCUMMVMDIR/Games +mkdir -p $SCUMMVMDIR/Saves +mkdir -p $SCUMMVMDIR/Screenshots +mkdir -p $SCUMMVMDIR/Themes +mkdir -p $SCUMMVMDIR/Extras +mkdir -p $SCUMMVMDIR/Plugins + +# Install default configuration file if not already present +if [ ! -f $SCUMMVMDIR/scummvmrc ] +then + cp $APPDIR/scummvmrc-default $SCUMMVMDIR/scummvmrc +fi + +# Copy themes to theme directory +cp -f $APPDIR/share/scummvm/*.zip $SCUMMVMDIR/Themes + +# Change into the screenshots directory so screenshots are saved there +cd $SCUMMVMDIR/Screenshots + +# Set library path so the app finds its custom shared libraries +export LD_LIBRARY_PATH=$APPDIR/lib + +# Run the game +exec $APPDIR/bin/scummvm -c $SCUMMVMDIR/scummvmrc |