diff options
Diffstat (limited to 'dists')
29 files changed, 497 insertions, 322 deletions
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml index 2ea2b484ac..1bc784cc4c 100644 --- a/dists/android/AndroidManifest.xml +++ b/dists/android/AndroidManifest.xml @@ -1,58 +1,61 @@ -<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- --> +<?xml version="1.0" encoding="utf-8"?> <!-- NB: android:versionCode needs to be bumped for formal releases --> + <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.inodes.gus.scummvm" - android:versionCode="6" android:versionName="1.3.0git" - android:installLocation="preferExternal"> - - <!-- This version works on Android 1.5 (SDK 3) and newer, but we - want Android 2.2 (SDK 8) defaults and features. - --> - <uses-sdk android:minSdkVersion="3" - android:targetSdkVersion="8" /> - - <application android:name=".ScummVMApplication" - android:label="@string/app_name" - android:description="@string/app_desc" - android:icon="@drawable/scummvm" - android:persistent="true"> - <activity android:name=".ScummVMActivity" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" - android:screenOrientation="landscape" - android:configChanges="orientation|keyboardHidden" - android:windowSoftInputMode="adjustResize"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - </intent-filter> - </activity> - <activity android:name=".Unpacker" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" - android:screenOrientation="landscape" - android:configChanges="orientation|keyboardHidden"> - <meta-data android:name="org.inodes.gus.unpacker.nextActivity" - android:value="org.inodes.gus.scummvm/.ScummVMActivity" /> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> - - <permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN" - android:label="@string/scummvm_perm_plugin_label" - android:description="@string/scummvm_perm_plugin_desc" - android:protectionLevel="signature" /> - - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - - - <!-- Always needs some sort of qwerty keyboard. - Can work with a D-pad / trackball --> - <uses-configuration android:reqFiveWayNav="true" - android:reqKeyboardType="qwerty"/> - <!-- .. or touchscreen --> - <uses-configuration android:reqTouchScreen="finger" - android:reqKeyboardType="qwerty"/> - <uses-configuration android:reqTouchScreen="stylus" - android:reqKeyboardType="qwerty"/> + package="org.inodes.gus.scummvm" + android:versionCode="@ANDROID_VERSIONCODE@" + android:versionName="1.4.0git" + android:installLocation="preferExternal"> + + <!-- This version works on Android 1.5 (SDK 3) and newer, but we + want Android 2.2 (SDK 8) defaults and features. --> + <uses-sdk android:minSdkVersion="3" + android:targetSdkVersion="8"/> + + <application android:name=".ScummVMApplication" + android:label="@string/app_name" + android:description="@string/app_desc" + android:icon="@drawable/scummvm"> + <activity android:name=".ScummVMActivity" + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:screenOrientation="landscape" + android:configChanges="orientation|keyboardHidden" + android:windowSoftInputMode="adjustResize"> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + </intent-filter> + </activity> + + <activity android:name=".Unpacker" + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:screenOrientation="landscape" + android:configChanges="orientation|keyboardHidden"> + <meta-data android:name="org.inodes.gus.unpacker.nextActivity" + android:value="org.inodes.gus.scummvm/.ScummVMActivity"/> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.LAUNCHER"/> + </intent-filter> + </activity> + </application> + + <permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN" + android:label="@string/scummvm_perm_plugin_label" + android:description="@string/scummvm_perm_plugin_desc" + android:protectionLevel="signature"/> + + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> + + <!-- Always needs some sort of qwerty keyboard. + Can work with a D-pad / trackball --> + <uses-configuration android:reqFiveWayNav="true" + android:reqKeyboardType="qwerty"/> + + <!-- .. or touchscreen --> + <uses-configuration android:reqTouchScreen="finger" + android:reqKeyboardType="qwerty"/> + + <uses-configuration android:reqTouchScreen="stylus" + android:reqKeyboardType="qwerty"/> </manifest> + diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in index 26a94f957b..a8d40bdddc 100644 --- a/dists/android/AndroidManifest.xml.in +++ b/dists/android/AndroidManifest.xml.in @@ -1,58 +1,61 @@ -<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- --> +<?xml version="1.0" encoding="utf-8"?> <!-- NB: android:versionCode needs to be bumped for formal releases --> + <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.inodes.gus.scummvm" - android:versionCode="6" android:versionName="@VERSION@" - android:installLocation="preferExternal"> - - <!-- This version works on Android 1.5 (SDK 3) and newer, but we - want Android 2.2 (SDK 8) defaults and features. - --> - <uses-sdk android:minSdkVersion="3" - android:targetSdkVersion="8" /> - - <application android:name=".ScummVMApplication" - android:label="@string/app_name" - android:description="@string/app_desc" - android:icon="@drawable/scummvm" - android:persistent="true"> - <activity android:name=".ScummVMActivity" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" - android:screenOrientation="landscape" - android:configChanges="orientation|keyboardHidden" - android:windowSoftInputMode="adjustResize"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - </intent-filter> - </activity> - <activity android:name=".Unpacker" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" - android:screenOrientation="landscape" - android:configChanges="orientation|keyboardHidden"> - <meta-data android:name="org.inodes.gus.unpacker.nextActivity" - android:value="org.inodes.gus.scummvm/.ScummVMActivity" /> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> - - <permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN" - android:label="@string/scummvm_perm_plugin_label" - android:description="@string/scummvm_perm_plugin_desc" - android:protectionLevel="signature" /> - - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - - - <!-- Always needs some sort of qwerty keyboard. - Can work with a D-pad / trackball --> - <uses-configuration android:reqFiveWayNav="true" - android:reqKeyboardType="qwerty"/> - <!-- .. or touchscreen --> - <uses-configuration android:reqTouchScreen="finger" - android:reqKeyboardType="qwerty"/> - <uses-configuration android:reqTouchScreen="stylus" - android:reqKeyboardType="qwerty"/> + package="org.inodes.gus.scummvm" + android:versionCode="@ANDROID_VERSIONCODE@" + android:versionName="@VERSION@" + android:installLocation="preferExternal"> + + <!-- This version works on Android 1.5 (SDK 3) and newer, but we + want Android 2.2 (SDK 8) defaults and features. --> + <uses-sdk android:minSdkVersion="3" + android:targetSdkVersion="8"/> + + <application android:name=".ScummVMApplication" + android:label="@string/app_name" + android:description="@string/app_desc" + android:icon="@drawable/scummvm"> + <activity android:name=".ScummVMActivity" + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:screenOrientation="landscape" + android:configChanges="orientation|keyboardHidden" + android:windowSoftInputMode="adjustResize"> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + </intent-filter> + </activity> + + <activity android:name=".Unpacker" + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:screenOrientation="landscape" + android:configChanges="orientation|keyboardHidden"> + <meta-data android:name="org.inodes.gus.unpacker.nextActivity" + android:value="org.inodes.gus.scummvm/.ScummVMActivity"/> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.LAUNCHER"/> + </intent-filter> + </activity> + </application> + + <permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN" + android:label="@string/scummvm_perm_plugin_label" + android:description="@string/scummvm_perm_plugin_desc" + android:protectionLevel="signature"/> + + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> + + <!-- Always needs some sort of qwerty keyboard. + Can work with a D-pad / trackball --> + <uses-configuration android:reqFiveWayNav="true" + android:reqKeyboardType="qwerty"/> + + <!-- .. or touchscreen --> + <uses-configuration android:reqTouchScreen="finger" + android:reqKeyboardType="qwerty"/> + + <uses-configuration android:reqTouchScreen="stylus" + android:reqKeyboardType="qwerty"/> </manifest> + diff --git a/dists/android/README.Android b/dists/android/README.Android new file mode 100644 index 0000000000..550b73bdfa --- /dev/null +++ b/dists/android/README.Android @@ -0,0 +1,56 @@ +README for the Android port of ScummVM +-------------------------------------- + +REQUIREMENTS + + TODO + +INSTALL + + TODO + +CONTROLS + + 5-Way navigation control / DPAD + + DPAD up/down/left/right: Mouse movement + DPAD center: Left mouse button + + Trackball + + Movement: Mouse movement + Click: Left mouse button + + Touchscreen + + The touchscreen can be used in two modes + + 1) Direct mode + 2) Touchpad mode + + When in direct mode, the mouse cursor moves to the touched point on screen. + In touchpad mode, the mouse cursor is independent of the touched point, it + is moved relative to its current position - like on a touchpad. + + The port currently misses its own configuration dialog, the mode can + be toggled with the "Mixed AdLib/MIDI mode" on the MIDI tab in ScummVM's + own option dialog. + + 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 + + On devices supporting multitouch: + + Two finger tap: Right mouse button click + Three finger tap: Middle mouse button click + + System keys + + Back button: Escape + Menu button: ScummVM menu + Menu button held for 0.5s: Toggle virtual keyboard + Camera or Search button: Right mouse button click + 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..3fd9e393d0 --- /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.4.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/android/res/layout/main.xml b/dists/android/res/layout/main.xml index f5276ce41b..b6164edc96 100644 --- a/dists/android/res/layout/main.xml +++ b/dists/android/res/layout/main.xml @@ -1,10 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> + <org.inodes.gus.scummvm.EditableSurfaceView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" android:layout_height="fill_parent" - android:id="@+id/main_surface" - android:gravity="center" - android:keepScreenOn="true" - android:focusable="true" - android:focusableInTouchMode="true" + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/main_surface" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:gravity="center" + android:keepScreenOn="true" + android:focusable="true" + android:focusableInTouchMode="true" /> + diff --git a/dists/engine-data/drascula.dat b/dists/engine-data/drascula.dat Binary files differindex feecda80a2..0938ef4a9a 100644 --- a/dists/engine-data/drascula.dat +++ b/dists/engine-data/drascula.dat diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist index f18cc61ede..e57989a7c3 100644 --- a/dists/iphone/Info.plist +++ b/dists/iphone/Info.plist @@ -15,11 +15,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.3.0git</string> + <string>1.4.0git</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>1.3.0git</string> + <string>1.4.0git</string> <key>CFBundleIconFile</key> <string>icon.png</string> <key>CFBundleIconFiles</key> diff --git a/dists/irix/scummvm.spec b/dists/irix/scummvm.spec index b6b1524a42..141d37070f 100644 --- a/dists/irix/scummvm.spec +++ b/dists/irix/scummvm.spec @@ -1,5 +1,5 @@ product scummvm - id "ScummVM 1.3.0git" + id "ScummVM 1.4.0git" image sw id "software" version 18 diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist index 9e19926f3f..20081ccc80 100644 --- a/dists/macosx/Info.plist +++ b/dists/macosx/Info.plist @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>scummvm</string> <key>CFBundleGetInfoString</key> - <string>1.3.0git, Copyright 2001-2011 The ScummVM team</string> + <string>1.4.0git, Copyright 2001-2011 The ScummVM team</string> <key>CFBundleIconFile</key> <string>scummvm.icns</string> <key>CFBundleIdentifier</key> @@ -21,9 +21,9 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.3.0git</string> + <string>1.4.0git</string> <key>CFBundleVersion</key> - <string>1.3.0git</string> + <string>1.4.0git</string> <key>NSPrincipalClass</key> <string>NSApplication</string> <key>NSHumanReadableCopyright</key> 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/redhat/scummvm-tools.spec b/dists/redhat/scummvm-tools.spec index b034e4479e..72b1ac701f 100644 --- a/dists/redhat/scummvm-tools.spec +++ b/dists/redhat/scummvm-tools.spec @@ -7,7 +7,7 @@ # Prologue information #------------------------------------------------------------------------------ Name : scummvm-tools -Version : 1.3.0git +Version : 1.4.0git Release : 1 Summary : ScummVM-related tools Group : Interpreters diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec index d0d273fc66..777e0afc8a 100644 --- a/dists/redhat/scummvm.spec +++ b/dists/redhat/scummvm.spec @@ -7,7 +7,7 @@ # Prologue information #------------------------------------------------------------------------------ Name : scummvm -Version : 1.3.0git +Version : 1.4.0git Release : 1 Summary : Graphic adventure game interpreter Group : Interpreters diff --git a/dists/scummvm.rc b/dists/scummvm.rc index 34e1ff2ed8..15dd04c0d9 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -7,35 +7,36 @@ IDI_ICON ICON DISCARDABLE "../../icons/scummvm.ico" #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,0 - PRODUCTVERSION 1,3,0,0 - FILEFLAGSMASK 0x3fL + FILEVERSION 1,4,0,0 + PRODUCTVERSION 1,4,0,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG - FILEFLAGS 0x1L + FILEFLAGS VS_FF_DEBUG #else - FILEFLAGS 0x0L + FILEFLAGS 0 #endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040904b0" + BLOCK "040904b0" // US English, Unicode BEGIN VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0" VALUE "FileDescription", "http://www.scummvm.org/\0" - VALUE "FileVersion", "1.3.0git\0" + VALUE "FileVersion", "1.4.0git\0" VALUE "InternalName", "scummvm\0" VALUE "LegalCopyright", "Copyright © 2001-2011 The ScummVM Team\0" VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0" VALUE "OriginalFilename", "scummvm.exe\0" VALUE "ProductName", "ScummVM\0" - VALUE "ProductVersion", "1.3.0git\0" + VALUE "ProductVersion", "1.4.0git\0" END END + BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0x409, 1200 + VALUE "Translation", 0x409, 1200 // US English, Unicode END END diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in index 17415f3d12..a0fcf82dbb 100644 --- a/dists/scummvm.rc.in +++ b/dists/scummvm.rc.in @@ -7,21 +7,21 @@ IDI_ICON ICON DISCARDABLE "../../icons/scummvm.ico" #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0 - PRODUCTVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0 - FILEFLAGSMASK 0x3fL + FILEVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0 + PRODUCTVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG - FILEFLAGS 0x1L + FILEFLAGS VS_FF_DEBUG #else - FILEFLAGS 0x0L + FILEFLAGS 0 #endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040904b0" + BLOCK "040904b0" // US English, Unicode BEGIN VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0" VALUE "FileDescription", "http://www.scummvm.org/\0" @@ -34,8 +34,9 @@ BEGIN VALUE "ProductVersion", "@VERSION@\0" END END + BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0x409, 1200 + VALUE "Translation", 0x409, 1200 // US English, Unicode END END diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild index 0e5436b85e..71f4818e7e 100755 --- a/dists/slackware/scummvm.SlackBuild +++ b/dists/slackware/scummvm.SlackBuild @@ -9,7 +9,7 @@ if [ "$TMP" = "" ]; then fi PKG=$TMP/package-scummvm -VERSION=1.3.0git +VERSION=1.4.0git ARCH=i486 BUILD=1 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..b3163a4e95 --- /dev/null +++ b/dists/webos/mojo/appinfo.json @@ -0,0 +1,10 @@ +{ + "id": "APP_ID", + "version": "APP_VERSION", + "vendor": "ScummVM Team", + "type": "pdk", + "main": "start", + "title": "APP_TITLE", + "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..aefc5fda98 --- /dev/null +++ b/dists/webos/mojo/scummvmrc-default @@ -0,0 +1,32 @@ +[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 +savepath=/media/internal/ScummVM/Saves + +[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..446ce83f1d --- /dev/null +++ b/dists/webos/mojo/start @@ -0,0 +1,22 @@ +#!/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 + +# Install default configuration file if not already present +if [ ! -f $SCUMMVMDIR/scummvmrc ] +then + cp $APPDIR/scummvmrc-default $SCUMMVMDIR/scummvmrc +fi + +# Change into the screenshots directory so screenshots are saved there +cd $SCUMMVMDIR/Screenshots + +# Run the game +exec $APPDIR/bin/scummvm -c $SCUMMVMDIR/scummvmrc diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml index 562d0982f5..68460c4721 100644 --- a/dists/wii/meta.xml +++ b/dists/wii/meta.xml @@ -2,7 +2,7 @@ <app version="1"> <name>ScummVM</name> <coder>The ScummVM Team</coder> - <version>1.3.0git@REVISION@</version> + <version>1.4.0git@REVISION@</version> <release_date>@TIMESTAMP@</release_date> <short_description>Point & Click Adventures</short_description> <long_description>ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed! diff --git a/dists/win32/ScummVM.iss b/dists/win32/ScummVM.iss new file mode 100644 index 0000000000..00f4868e60 --- /dev/null +++ b/dists/win32/ScummVM.iss @@ -0,0 +1,82 @@ +[Setup] +DefaultDirName={pf}\ScummVM +AppCopyright=2011 +AppName=ScummVM +AppVerName=ScummVM Git +DefaultGroupName=ScummVM +AllowNoIcons=true +AlwaysUsePersonalGroup=false +EnableDirDoesntExistWarning=false +Compression=lzma +OutputDir=C:\ScummVM +OutputBaseFilename=scummvm-win32 +DisableStartupPrompt=true +AppendDefaultDirName=false +SolidCompression=true +DirExistsWarning=no +SetupIconFile=scummvm.ico +ShowLanguageDialog=yes +LanguageDetectionMethod=uilanguage + +[Languages] +Name: en; MessagesFile: compiler:Default.isl +Name: eu; MessagesFile: compiler:Languages\Basque.isl +Name: br; MessagesFile: compiler:Languages\BrazilianPortuguese.isl +Name: ca; MessagesFile: compiler:Languages\Catalan.isl +Name: cz; MessagesFile: compiler:Languages\Czech.isl +Name: da; MessagesFile: compiler:Languages\Danish.isl +Name: nl; MessagesFile: compiler:Languages\Dutch.isl +Name: fi; MessagesFile: compiler:Languages\Finnish.isl +Name: fr; MessagesFile: compiler:Languages\French.isl +Name: de; MessagesFile: compiler:Languages\German.isl +Name: he; MessagesFile: compiler:Languages\Hebrew.isl +Name: hu; MessagesFile: compiler:Languages\Hungarian.isl +Name: it; MessagesFile: compiler:Languages\Italian.isl +Name: ja; MessagesFile: compiler:Languages\Japanese.isl +Name: nb; MessagesFile: compiler:Languages\Norwegian.isl +Name: pl; MessagesFile: compiler:Languages\Polish.isl +Name: pt; MessagesFile: compiler:Languages\Portuguese.isl +Name: ru; MessagesFile: compiler:Languages\Russian.isl +Name: sk; MessagesFile: compiler:Languages\Slovak.isl +Name: sl; MessagesFile: compiler:Languages\Slovenian.isl +Name: es; MessagesFile: compiler:Languages\Spanish.isl + +[Icons] +Name: {group}\{cm:UninstallProgram, ScummVM}; Filename: {uninstallexe} +Name: {group}\ScummVM; Filename: {app}\scummvm.exe; WorkingDir: {app}; Comment: scummvm; Flags: createonlyiffileexists; IconIndex: 0 +Name: {group}\Authors; Filename: {app}\AUTHORS.txt; WorkingDir: {app}; Comment: AUTHORS; Flags: createonlyiffileexists +Name: {group}\Copying; Filename: {app}\COPYING.txt; WorkingDir: {app}; Comment: COPYING; Flags: createonlyiffileexists +Name: {group}\Copying.LGPL; Filename: {app}\COPYING.LGPL.txt; WorkingDir: {app}; Comment: COPYING.LGPL; Flags: createonlyiffileexists +Name: {group}\Copyright; Filename: {app}\COPYRIGHT.txt; WorkingDir: {app}; Comment: COPYRIGHT; Flags: createonlyiffileexists +Name: {group}\Readme; Filename: {app}\README.txt; WorkingDir: {app}; Comment: README; Flags: createonlyiffileexists +Name: {group}\News; Filename: {app}\NEWS.txt; WorkingDir: {app}; Comment: NEWS; Flags: createonlyiffileexists + +[Run] +Filename: {app}\scummvm.exe; Flags: nowait skipifdoesntexist postinstall skipifsilent; Description: Launch ScummVM + +[UninstallDelete] +Type: files; Name: {app}\ISTool.url + +[Files] +Source: AUTHORS.txt; DestDir: {app}; Flags: ignoreversion +Source: COPYING.txt; DestDir: {app}; Flags: ignoreversion +Source: COPYING.LGPL.txt; DestDir: {app}; Flags: ignoreversion +Source: COPYRIGHT.txt; DestDir: {app}; Flags: ignoreversion +Source: NEWS.txt; DestDir: {app}; Flags: ignoreversion +Source: README.txt; DestDir: {app}; Flags: ignoreversion isreadme +Source: README-SDL.txt; DestDir: {app}; Flags: ignoreversion +Source: scummvm.exe; DestDir: {app}; Flags: ignoreversion +Source: SDL.dll; DestDir: {app} +Source: scummclassic.zip; DestDir: {app}; Flags: ignoreversion +Source: scummmodern.zip; DestDir: {app}; Flags: ignoreversion +Source: drascula.dat; DestDir: {app}; Flags: ignoreversion +Source: hugo.dat; DestDir: {app}; Flags: ignoreversion +Source: kyra.dat; DestDir: {app}; Flags: ignoreversion +Source: lure.dat; DestDir: {app}; Flags: ignoreversion +Source: m4.dat; DestDir: {app}; Flags: ignoreversion +Source: pred.dic; DestDir: {app}; Flags: ignoreversion +Source: queen.tbl; DestDir: {app}; Flags: ignoreversion +Source: sky.cpt; DestDir: {app}; Flags: ignoreversion +Source: teenagent.dat; DestDir: {app}; Flags: ignoreversion +Source: toon.dat; DestDir: {app}; Flags: ignoreversion +Source: translations.dat; DestDir: {app}; Flags: ignoreversion |
