diff options
25 files changed, 891 insertions, 59 deletions
@@ -47,7 +47,7 @@ ScummVM Team AGI: Stuart George - Matthew Hoops + Matthew Hoops - (retired) Filippos Karapetis Martin Kiewitz Pawel Kolodziejski @@ -140,7 +140,7 @@ ScummVM Team Johannes Schickel Lastexpress: - Matthew Hoops + Matthew Hoops - (retired) Jordi Vilalta Prat Julien Templier @@ -158,7 +158,7 @@ ScummVM Team Mohawk: Bastien Bouclet - Matthew Hoops + Matthew Hoops - (retired) Filippos Karapetis Alyssa Milburn Eugene Sandulenko @@ -176,7 +176,7 @@ ScummVM Team peres Pegasus: - Matthew Hoops + Matthew Hoops - (retired) Queen: David Eriksson - (retired) @@ -405,7 +405,8 @@ ScummVM Team Thierry Crozat - Numerous contributions to documentation Joachim Eberhard - Numerous contributions to documentation (retired) - Matthew Hoops - Wiki editor + Matthew Hoops - Numerous contributions to documentation + (retired) Retired Team Members -------------------- @@ -4,215 +4,404 @@ Copyright (C) 2001-2016 by the following: If you have contributed to this project then you deserve to be on this list. Contact us (see: AUTHORS) and we'll add you. -Tore Anderson +Manuel Alfayate Torbjorn Andersson +Tore Anderson +Matteo Angelino Chris Apers +Adrian Astley +Bertrand Augereau Ori Avtalion Nicolas Bacca +Dobo Balazs +Daniel Balsom +Yotam Barnoy Fabio Battaglia +Vincent Benony +Alex Bevilacqua +Laurent Blume Bastien Bouclet Arnaud Boutonne +Francois-R Boyer +Peter Bozso Jurgen Braam Ralph Brorsen James Brown +Henry Bush Stuart Caie +Rainer Canavan +Ben Castricum +Xiaojun Chen Jamieson Christian +Ryan Clark +William Claydon +Fabien Coeurjoly Marcus Comstedt +David Corrales-Lopez Paolo Costabel +Robert Crossfield Thierry Crozat +Vyacheslav Dikonov +Paul David Doherty +Martin Doucha Ivan Dubrov Frantisek Dufka +Sylvain Dupont +Joachim Eberhard +Thomas Edvalson Oystein Eftevaag -Kovacs Endre Janos David Eriksson +Thomas Fach-Pedersen +Yaroslav Fedevych Jerome Fisher +Hampus Flink +Hans-Joerg Frieden +Greg Frieger +Tom Frost Stuart George Paul Gilbert +Jean Marc Gimenez Robert Goeffringmann +Victor Gonzalez +GrajPoPolsku.pl Team +Chris Gray Jonathan Gray +Tobias Gunkel Benjamin Haisch Vincent Hamm +Ruediger Hanke +Matt Hargett +Andre Heider Sven Hesse Jochen Hoenicke Matthew Hoops Max Horn Travis Howell Janne Huttunen +Ravi I. Felix Jakschitsch +Kovacs Endre Janos Jeroen Janssen +Emmanuel Jeandel +Dmitry Jemerov +David Jensen Florian Kagerer +Keith Kaisershot Filippos Karapetis Andreas Karlsson +Denis Kasak +Chris Kehler +Robert Kelsen Ismail Khatib Oliver Kiehl Martin Kiewitz Pawel Kolodziejski +George Kormendi Mutwin Kraus +Stefan Kristiansson Andrew Kurushin +Daniel ter Laan +Hugo Labrande +Christopher T. Lansdown +Sergey Lapin Angus Lees +Rickard Lind +Max Lingua +Lubomyr Lisen +Ivan Lukyanov +Tomas Maidagan +Hubert Maier +Johannes Manhave +Lothar Serra Mari +Vicent Marti Claudio Matsuoka Thomas Mayer +Robert Megone +Vladimir Menshakov Alyssa Milburn Neil Millstone +Dark Minister Gregory Montoir +Peter Moraliyski +Carl Muckenhoupt +Alejandro Gomez de la Munoza +Sean Murray Kostas Nakos Mikesch Nepomuk +Jeremy Newman +Anders Baden Nielsen +Juha Niemimaki +Walter van Niftrik Nicolas Noble +Steffen Nyeland +Rune Orsval +Chris Page Willem Jan Palenstijn +Stefan Parviainen +Solomon Peachy Lars Persson Joost Peters Tim Phillips +Robey Pointer +Jordi Vilalta Prat +Magnus Reftel +Christoph Reichenbach +George Reid +Klaus Reimer +Andreas Roever Edward Rudd +Toni Saarela +Kari Salminen Eugene Sandulenko +Santiago G. Sanz +Simon Sawatzki +Daniel Schepler +Dominik Scherer Johannes Schickel +Luc Schrijvers +Zbynik Schwarz Keith Scroggins +Dan Serban +Lars Skovlund +Paul Smedley +Colin Snover Tarek Soliman +Einar Johan T. Somaaen +Andre Souza +Robert Spalek +Rink Springer Won Star +Markus Strangl Ludvig Strigeus Fedor Strizhniou David Symonds -Jordi Vilalta +Rainer De Temple +Julien Templier +Sean Terrell +Tobia Tesan +Scott Thomas +David Turner +Lionel Ulmer +Mikel Iturbe Urretxa +Hugues Valois +Petr Vyhnak +Chris Warren-Smith Robin Watts +Lukasz Watka +David Weinehall +Fredrik Wendel John Willis +Anton Yarcev +Bas Zoetekouw Jezar n0p peres Quietust +ScummBR Team +Raina Patches contributed by: Laura Abbott "sageofminerva" Vikram Aggarwal "youngelf" -the rara avis "theraraavis" +Norbert Bajko +Giovanni Bajo +Matan Bareket Dieter Baron "dillo" +Kevin Becker Alban Bedel "albeu" Bodo Bellut "bellut" -Bramvandijk "bramvandijk" +Nagy Bendeguz Andreas Bierfert "awjb" +Kaustav Biswas Elio Blanca "eblanca76" +Martin Bohm David Breakey "dbreakey" +Michael du Breuil "WickedShell" +Michael Brown Robert Buchholz "prendi" -Rainer Canavan "canavan" +Sander Buskens +Giulio Camuffo +Kevin Carnes Mathieu Carot "yokna" Stefano Ceccherini "jackburton" Travis S Coady "theealien" Josh Coalson "jcoalson" +Curt Coder Thomas Combeleran "hibernatus" +Patrick Combet Kees Cook "keescook" Carlos Corbacho "cathectic" +Andrea Corna Roberto Costa "fiix76" -dc france "erwan2004" -dewt "mncl" -Martin Doucha "next_ghost" +Eric Culp +Alexander Dergunov +Alexandre Detiste +Roman Donchenko +Heather Douglass Michael Drueing "doc_wagon" -Michael du Breuil "WickedShell" -dubsdj Matthew Duggan "stauff1" +Barry Duncan Olivier Duverne "richiefs" Andrei Dziahel "develop7" John Eckerdal "johneck" -Thomas Fach-Pedersen "madm00se" -Florent "flobo" -Florob "florob" +Abdeselam El-Haman +Henrik Engqvist Mike Frysinger "vapier" +Bence Gazder Chris Gelatt "kreeblah" Jens Georg "phako" Nicolas George "cigaes" +Martin Gerhardy Jonathan Gevaryahu "lord_nightmare" +Boris Gnezdilov Tobias Gruetzmacher "tobig" Damien Guard "damienguard" -Tobias Gunkel "tobigun" Matti Hamalainen "ccrtnsp" -Matt Hargett "matt_hargett" +Lauri Harsila Stefan Haubenthal "polluks" +Gavin Hayler Alexander Holler "holler" +Enrico Horn Falk Hueffner "mellum" Casey Hutchinson "nnooiissee" -j0tt +Tomas Jakobsson Gregor Jasny "gjasny" -Jellby "jellby" -Joerg "macdrega" Matt Johnson "mattjon" Nicolas Joly "njoly" -KeithS "keithscr" +Yusuke Kamiyamane +Martin Kennedy +Stephen Kennedy Sam Kenny "sam_k" Koen Kooi "koenkooi" +Christoph Korn +Christian Krause +Till Kresslein Zygmunt Krynicki "zygoon" Janne Kujanpaa "jukuja" +Neeraj Kumar +Oleksiy Kurochko Jay Lanagan "r0ni" Norbert Lange "nolange" Manuel Lauss "mlau2" Rolf Leggewie "leggewie" +Jim Leiterman +Matt Lewandowsky +Chenbo Li +Rob Loach Duncan Lock "dflock" Mark Lodato "itsr0y" Fridvin Logi "phillip_j_fry" -Lostech "lostech" +Michael Lojkovic +Borja Lorente Escobar Georg Lukas "ge0rg" +Artem Lukoyanov Michael Madsen "pidgeot" +Matthias Mailander +Narek Mailian +Christoph Mallon +Engin Manap Dmitry Marakasov "amdmi3" Alejandro Marzini "vgvgf" Connor McLeod "mcleod2032" Mickey McMurray "metafox" -Vladimir Menshakov "megath" Adam Metcalf "gamblore" +Nicola Mettifogo Frank Meyering "frank_m24" Gael Le Migno "kilobug" +Etienne Millon Andy Molloy "maloi" -Sean Murrau "lightcast" +Omer Mor Armin Mueller "arm_in" +Sean Murrau "lightcast" Andrea Musuruane "musuruan" KO Myung-Hun "lvzuufx" Markus Napp "meist3r" Peter Naulls "pnaulls" Christian Neumair "mannythegnome" -Nicos "anarxia" -Juha Niemimaki "capehill" +Hannes Niederhausen Markus Niemisto "niemisto" -ole +Bastien Nocera +Jody Northup +Julian Ospald +Christopher Page Chris Paras "paras_rasmatazz" Aubin Paul "outlyer" +Michael Pearce Vincent Pelletier "subdino" -phi1 -Pix2 "pix2" +Jussi Pitkanen Carsten Pohl "carstenpohl" +Tony Puccinelli Markus Pyykko "mankeli" -Richard "trinity78" -Felix Riemann "kirschsaft" +Rodrigo Rebello +Alexander Reim Thomas Richter "thorfdbg" +Felix Riemann "kirschsaft" Timo Roehling "t1m0" -Andreas Roever "roever" Jonathan Rogers "jonner" +Enrico Rolfi +Doron Rosenberg Marek Roth "logicdeluxe" +David Russo Uwe Ryssel "uweryssel" -Simon Sawatzki "simsaw" -Scarlatti "escarlate" -Daniel Schepler "dschepler" Florian Schmitt "fatpenguin" Mark Schreiber "mark7" Ben Shadwick "benshadwick" +Rodrigo Silva Jean-Yves Simon "lethalwp" Andrej Sinicyn "andrej4000" -Andre Souza "luke_br" -spookypeanut "spookypeanut" +Dmitry Smirnov Steve Stavropoulos "isnothere" Daniel Steinberger "amorphousshape" Sven Strothoff "dataslayer" Andrea Suatoni "mrhandler" -tbcarey -Tim "tipabu" +Max Tabachenko +DOSBox Team +Sarien Team +Joel Teichroeb +Jimmi Thogersen +Alexander Tkachov +Pino Toscano Luigi Toscano "ltosky" Xavier Trochu "xtrochu" +Vasyl Tsvirkunov Michal Tulacek "tutchek" Michael Udaltsov "cccp99" +Joni Vahamaki Kristof Vansant "lupusbe" +Aaryaman Vasishta Tim Walters "realmz" -David Weinehall "weine" Eric A. Welsh "eweish42" Yudhi Widyatama "yudhi97" +Jakub Wilk +Kieron Wilkinson Robert Wohlrab "moshroum" -Xanathar "xanathar" +James Woodcock Grant Yeager "glo_kidd" Benjamin W. Zale "junior_aepi" -Yotam Barnoy "bluddy" -Tom Frost "TomFrost" +Kamil Zbrog +Michal Ziabkowski +Bramvandijk "bramvandijk" +Canadacow +countingpine +Damien +dc france "erwan2004" +dewt "mncl" +dubsdj +Florent "flobo" +Florob "florob" +j0tt +Jellby "jellby" +Joerg "macdrega" +Lostech "lostech" +Nicos "anarxia" +ole +phi1 +Pix2 "pix2" +Richard "trinity78" +Scarlatti "escarlate" +the rara avis "theraraavis" +Tim "tipabu" +vandalo +Xanathar "xanathar" @@ -13,6 +13,7 @@ For a more comprehensive changelog of the latest experimental code, see: 1.8.1 (2016-05-25) New ports: - Added Nintendo 3DS port. + - Added Android SDL port. General: - Removed TESTING flag from several supported games. diff --git a/backends/events/androidsdl/androidsdl-events.cpp b/backends/events/androidsdl/androidsdl-events.cpp new file mode 100644 index 0000000000..bd8045ec62 --- /dev/null +++ b/backends/events/androidsdl/androidsdl-events.cpp @@ -0,0 +1,84 @@ +/* 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. + * + */ + +#include "common/scummsys.h" + +#if defined(ANDROIDSDL) + +#include "backends/events/androidsdl/androidsdl-events.h" +#include "backends/platform/androidsdl/androidsdl-sdl.h" +#include <SDL_screenkeyboard.h> + +bool AndroidSdlEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) { + if (ev.button.button == SDL_BUTTON_LEFT) + event.type = Common::EVENT_LBUTTONDOWN; + else if (ev.button.button == SDL_BUTTON_RIGHT) + event.type = Common::EVENT_RBUTTONDOWN; +#if defined(SDL_BUTTON_WHEELUP) && defined(SDL_BUTTON_WHEELDOWN) + else if (ev.button.button == SDL_BUTTON_WHEELUP) + event.type = Common::EVENT_WHEELUP; + else if (ev.button.button == SDL_BUTTON_WHEELDOWN) + event.type = Common::EVENT_WHEELDOWN; +#endif +#if defined(SDL_BUTTON_MIDDLE) + else if (ev.button.button == SDL_BUTTON_MIDDLE) { + event.type = Common::EVENT_MBUTTONDOWN; + + static int show_onscreen=0; + if (show_onscreen==0) { + SDL_ANDROID_SetScreenKeyboardShown(0); + show_onscreen++; + } + else if (show_onscreen==1) { + SDL_ANDROID_SetScreenKeyboardShown(1); + show_onscreen++; + } + if (show_onscreen==2) + show_onscreen=0; + } +#endif + else + return false; + + processMouseEvent(event, ev.button.x, ev.button.y); + + return true; +} + +bool AndroidSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { + if (false) {} + + if (ev.key.keysym.sym == SDLK_LCTRL) { + ev.key.keysym.sym = SDLK_F5; + } else { + // Let the events fall through if we didn't change them, this may not be the best way to + // set it up, but i'm not sure how sdl would like it if we let if fall through then redid it though. + // and yes i have an huge terminal size so i dont wrap soon enough. + event.type = Common::EVENT_KEYDOWN; + event.kbd.keycode = (Common::KeyCode)ev.key.keysym.sym; + event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode); + } + + return false; +} + +#endif diff --git a/backends/events/androidsdl/androidsdl-events.h b/backends/events/androidsdl/androidsdl-events.h new file mode 100644 index 0000000000..bca712e579 --- /dev/null +++ b/backends/events/androidsdl/androidsdl-events.h @@ -0,0 +1,37 @@ +/* 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. + * + */ + +#if !defined(BACKEND_EVENTS_SDL_ANDROIDSDL_H) && !defined(DISABLE_DEFAULT_EVENTMANAGER) +#define BACKEND_EVENTS_SDL_ANDROIDSDL_H + +#include "backends/events/sdl/sdl-events.h" + +/** + * SDL events manager for ANDROIDSDL + */ +class AndroidSdlEventSource : public SdlEventSource { +protected: + virtual bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event); + virtual bool remapKey(SDL_Event &ev, Common::Event &event); +}; + +#endif diff --git a/backends/graphics/androidsdl/androidsdl-graphics.cpp b/backends/graphics/androidsdl/androidsdl-graphics.cpp new file mode 100644 index 0000000000..23a1a86dd6 --- /dev/null +++ b/backends/graphics/androidsdl/androidsdl-graphics.cpp @@ -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. + * + */ + +#include "common/scummsys.h" + +#if defined(ANDROIDSDL) + +#include "backends/graphics/androidsdl/androidsdl-graphics.h" +#include "backends/events/androidsdl/androidsdl-events.h" +#include "common/mutex.h" +#include "common/textconsole.h" +#include "graphics/font.h" +#include "graphics/fontman.h" +#include "graphics/scaler.h" +#include "graphics/scaler/aspect.h" +#include "graphics/scaler/downscaler.h" +#include "graphics/surface.h" + +AndroidSdlGraphicsManager::AndroidSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window) + : SurfaceSdlGraphicsManager(sdlEventSource, window) { +} + +#endif diff --git a/backends/graphics/androidsdl/androidsdl-graphics.h b/backends/graphics/androidsdl/androidsdl-graphics.h new file mode 100644 index 0000000000..b7ca7c1de8 --- /dev/null +++ b/backends/graphics/androidsdl/androidsdl-graphics.h @@ -0,0 +1,34 @@ +/* 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. + * + */ + +#ifndef BACKENDS_GRAPHICS_SDL_ANDROIDSDL_H +#define BACKENDS_GRAPHICS_SDL_ANDROIDSDL_H + +#include "backends/graphics/surfacesdl/surfacesdl-graphics.h" + +class AndroidSdlGraphicsManager : public SurfaceSdlGraphicsManager { +public: + AndroidSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window); + +}; + +#endif diff --git a/backends/module.mk b/backends/module.mk index 2e100d215d..7574db4009 100644 --- a/backends/module.mk +++ b/backends/module.mk @@ -122,6 +122,12 @@ MODULE_OBJS += \ taskbar/win32/win32-taskbar.o endif +ifeq ($(BACKEND),androidsdl) +MODULE_OBJS += \ + events/androidsdl/androidsdl-events.o \ + graphics/androidsdl/androidsdl-graphics.o +endif + ifdef AMIGAOS MODULE_OBJS += \ fs/amigaos4/amigaos4-fs.o \ diff --git a/backends/platform/androidsdl/androidsdl-main.cpp b/backends/platform/androidsdl/androidsdl-main.cpp new file mode 100644 index 0000000000..26a73579c0 --- /dev/null +++ b/backends/platform/androidsdl/androidsdl-main.cpp @@ -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. + * + */ + +#include "backends/platform/androidsdl/androidsdl-sdl.h" +#include "base/main.h" + +int main(int argc, char *argv[]) { + + // Create our OSystem instance + g_system = new OSystem_ANDROIDSDL(); + assert(g_system); + + // Pre initialize the backend + ((OSystem_POSIX *)g_system)->init(); + + // Invoke the actual ScummVM main entry point: + int res = scummvm_main(argc, argv); + + // Free OSystem + delete (OSystem_ANDROIDSDL *)g_system; + + return res; +} diff --git a/backends/platform/androidsdl/androidsdl-sdl.cpp b/backends/platform/androidsdl/androidsdl-sdl.cpp new file mode 100644 index 0000000000..5e0eaa0408 --- /dev/null +++ b/backends/platform/androidsdl/androidsdl-sdl.cpp @@ -0,0 +1,37 @@ +/* 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. + * + */ + +#include "backends/platform/androidsdl/androidsdl-sdl.h" +#include "backends/events/androidsdl/androidsdl-events.h" +#include "backends/graphics/androidsdl/androidsdl-graphics.h" + +void OSystem_ANDROIDSDL::initBackend() { + // Create the backend custom managers + if (_eventSource == 0) + _eventSource = new AndroidSdlEventSource(); + + if (_graphicsManager == 0) + _graphicsManager = new AndroidSdlGraphicsManager(_eventSource, _window); + + // Call parent implementation of this method + OSystem_POSIX::initBackend(); +} diff --git a/backends/platform/androidsdl/androidsdl-sdl.h b/backends/platform/androidsdl/androidsdl-sdl.h new file mode 100644 index 0000000000..6ebe5022eb --- /dev/null +++ b/backends/platform/androidsdl/androidsdl-sdl.h @@ -0,0 +1,38 @@ +/* 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. + * + */ + +#ifndef PLATFORM_SDL_ANDROIDSDL_H +#define PLATFORM_SDL_ANDROIDSDL_H + +#include "backends/platform/sdl/posix/posix.h" + +class OSystem_ANDROIDSDL : public OSystem_POSIX { +public: + virtual void initBackend(); + +#ifdef ENABLE_KEYMAPPER + // FIXME: This just calls parent methods, is it needed? + virtual Common::HardwareInputSet *getHardwareInputSet(); +#endif +}; + +#endif diff --git a/backends/platform/androidsdl/androidsdl.mk b/backends/platform/androidsdl/androidsdl.mk new file mode 100644 index 0000000000..1defb81b97 --- /dev/null +++ b/backends/platform/androidsdl/androidsdl.mk @@ -0,0 +1,11 @@ +# Special target to create an AndroidSDL snapshot +androidsdl: + $(MKDIR) release + $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release + $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) release + $(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release + zip -j scummvm190-git-appdata.zip release/* + split -d -b 1000000 scummvm190-git-appdata.zip scummvm190-git-appdata.zip0 + $(RM) -r scummvm190-git-appdata.zip + +.PHONY: androidsdl diff --git a/backends/platform/androidsdl/module.mk b/backends/platform/androidsdl/module.mk new file mode 100644 index 0000000000..df927163b8 --- /dev/null +++ b/backends/platform/androidsdl/module.mk @@ -0,0 +1,13 @@ +MODULE := backends/platform/androidsdl + +MODULE_OBJS := \ + androidsdl-main.o \ + androidsdl-sdl.o + +# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS. +MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) +OBJS := $(MODULE_OBJS) $(OBJS) +MODULE_DIRS += $(sort $(dir $(MODULE_OBJS))) + +# Hack to ensure the SDL backend is built so we can use OSystem_SDL. +-include $(srcdir)/backends/platform/sdl/module.mk diff --git a/backends/platform/maemo/debian/changelog b/backends/platform/maemo/debian/changelog index 6b6d1aebd8..e4c5c58ccd 100644 --- a/backends/platform/maemo/debian/changelog +++ b/backends/platform/maemo/debian/changelog @@ -4,6 +4,12 @@ scummvm (1.9.0~git) unstable; urgency=low -- Tarek Soliman <tsoliman@scummvm.org> Fri, 26 Feb 2016 21:11:20 -0600 +scummvm (1.8.1) unstable; urgency=low + + * 1.8.1 release + + -- Tarek Soliman <tsoliman@scummvm.org> Fri, 20 May 2016 20:05:11 -0500 + scummvm (1.8.0) unstable; urgency=low * 1.8.0 release diff --git a/backends/platform/sdl/posix/posix-main.cpp b/backends/platform/sdl/posix/posix-main.cpp index d07db11b0c..5deebb0ae3 100644 --- a/backends/platform/sdl/posix/posix-main.cpp +++ b/backends/platform/sdl/posix/posix-main.cpp @@ -22,7 +22,7 @@ #include "common/scummsys.h" -#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(MAEMO) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3) +#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(MAEMO) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3) && !defined(ANDROIDSDL) #include "backends/platform/sdl/posix/posix.h" #include "backends/plugins/sdl/sdl-provider.h" @@ -875,6 +875,7 @@ Special configuration feature: android-arm for Android ARM android-mips for Android MIPS android-x86 for Android x86 + androidsdl for Android with SDL backend caanoo for Caanoo dingux for Dingux raspberrypi for Raspberry Pi @@ -1330,6 +1331,26 @@ android-x86) _host_cpu=i686 _host_alias=i686-linux-android ;; +androidsdl-armeabi | androidsdl-armeabi-v7a) + _host_os=androidsdl + _host_cpu=arm + _host_alias=arm-linux-androideabi + ;; +androidsdl-arm64-v8a) + _host_os=androidsdl + _host_cpu=aarch64 + _host_alias=aarch64-linux-android + ;; +androidsdl-mips) + _host_os=androidsdl + _host_cpu=mipsel + _host_alias=mipsel-linux-android + ;; +androidsdl-x86) + _host_os=androidsdl + _host_cpu=i686 + _host_alias=i686-linux-android + ;; arm-riscos) _host_os=riscos _host_cpu=arm @@ -1852,7 +1873,7 @@ if test "$have_gcc" = yes ; then case $_host_os in # newlib-based system include files suppress non-C89 function # declarations under __STRICT_ANSI__ - 3ds | amigaos* | android | dreamcast | ds | gamecube | mingw* | n64 | psp | ps2 | ps3 | tizen | wii | wince ) + 3ds | amigaos* | android | androidsdl | dreamcast | ds | gamecube | mingw* | n64 | psp | ps2 | ps3 | tizen | wii | wince ) ;; *) append_var CXXFLAGS "-ansi" @@ -1888,7 +1909,7 @@ echo $_use_cxx11 # However, some platforms use GNU extensions in system header files, so # for these we must not use -pedantic. case $_host_os in -android | gamecube | psp | tizen | wii | webos) +android | androidsdl | gamecube | psp | tizen | wii | webos) ;; *) # ICC does not support pedantic, while GCC and clang do. @@ -2635,6 +2656,15 @@ if test -n "$_host"; then _mt32emu=no _timidity=no ;; + androidsdl | androidsdl-armeabi | androidsdl-armeabi-v7a | androidsdl-mips | androidsdl-x86 | androidsdl-arm64-v8a) + DEFINES="$DEFINES -DANDROIDSDL" + _unix=yes + _seq_midi=no + _mt32emu=no + _timidity=no + _backend="androidsdl" + _port_mk="backends/platform/androidsdl/androidsdl.mk" + ;; arm-linux|arm*-linux-gnueabi|arm-*-linux) ;; arm-riscos|linupy) @@ -3089,6 +3119,8 @@ case $_backend in append_var LDFLAGS "-Wl,-z,noexecstack" append_var INCLUDES "-I$ANDROID_NDK/sources/cxx-stl/system/include" ;; + androidsdl) + ;; dc) append_var INCLUDES '-I$(srcdir)/backends/platform/dc' append_var INCLUDES '-isystem $(ronindir)/include' @@ -3246,7 +3278,7 @@ append_var MODULES "backends/platform/$_backend" # Setup SDL specifics for SDL based backends # case $_backend in - dingux | gph | linuxmoto | maemo | openpandora | samsungtv | sdl) + androidsdl | dingux | gph | linuxmoto | maemo | openpandora | samsungtv | sdl) find_sdlconfig append_var INCLUDES "`$_sdlconfig --prefix="$_sdlpath" --cflags`" append_var LIBS "`$_sdlconfig --prefix="$_sdlpath" --libs`" @@ -3269,7 +3301,7 @@ esac # Enable 16bit support only for backends which support it # case $_backend in - 3ds | android | dingux | dc | gph | iphone | ios7 | maemo | openpandora | psp | samsungtv | sdl | tizen | webos | wii) + 3ds | android | androidsdl | dingux | dc | gph | iphone | ios7 | maemo | openpandora | psp | samsungtv | sdl | tizen | webos | wii) if test "$_16bit" = auto ; then _16bit=yes else @@ -3348,7 +3380,7 @@ case $_host_os in amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | ps3 | psp | wii | wince) _posix=no ;; - 3ds | android | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | ios7 | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos) + 3ds | android | androidsdl | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | ios7 | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos) _posix=yes ;; os2-emx*) diff --git a/devtools/credits.pl b/devtools/credits.pl index e695a3650b..80f4c6d487 100755 --- a/devtools/credits.pl +++ b/devtools/credits.pl @@ -536,7 +536,7 @@ begin_credits("Credits"); begin_section("AGI"); add_person("Stuart George", "darkfiber", ""); - add_person("Matthew Hoops", "clone2727", ""); + add_person("Matthew Hoops", "clone2727", "(retired)"); add_person("Filippos Karapetis", "[md5]", ""); add_person("Martin Kiewitz", "m_kiewitz", ""); add_person("Paweł Kołodziejski", "aquadran", ""); @@ -647,7 +647,7 @@ begin_credits("Credits"); end_section(); begin_section("Lastexpress"); - add_person("Matthew Hoops", "clone2727", ""); + add_person("Matthew Hoops", "clone2727", "(retired)"); add_person("Jordi Vilalta Prat", "jvprat", ""); add_person("Julien Templier", "littleboy", ""); end_section(); @@ -669,7 +669,7 @@ begin_credits("Credits"); begin_section("Mohawk"); add_person("Bastien Bouclet", "bgk", ""); - add_person("Matthew Hoops", "clone2727", ""); + add_person("Matthew Hoops", "clone2727", "(retired)"); add_person("Filippos Karapetis", "[md5]", ""); add_person("Alyssa Milburn", "fuzzie", ""); add_person("Eugene Sandulenko", "sev", ""); @@ -691,7 +691,7 @@ begin_credits("Credits"); end_section(); begin_section("Pegasus"); - add_person("Matthew Hoops", "clone2727", ""); + add_person("Matthew Hoops", "clone2727", "(retired)"); end_section(); begin_section("Queen"); @@ -958,7 +958,7 @@ begin_credits("Credits"); begin_persons(); add_person("Thierry Crozat", "criezy", "Numerous contributions to documentation"); add_person("Joachim Eberhard", "joachimeberhard", "Numerous contributions to documentation (retired)"); - add_person("Matthew Hoops", "clone2727", "Wiki editor"); + add_person("Matthew Hoops", "clone2727", "Numerous contributions to documentation (retired)"); end_persons(); end_section(); diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg b/dists/androidsdl/scummvm/AndroidAppSettings.cfg new file mode 100644 index 0000000000..73d794e1ab --- /dev/null +++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg @@ -0,0 +1,230 @@ +# The application settings for Android libSDL port + +AppSettingVersion=19 + +# libSDL version to use (1.2 or 1.3, specify 1.3 for SDL2) +LibSdlVersion=1.2 + +# Specify application name (e.x. My Application) +AppName="ScummVM-SDL" + +# Specify reversed site name of application (e.x. com.mysite.myapp) +AppFullName=org.scummvm.sdl + +# Specify screen orientation: (v)ertical/(p)ortrait or (h)orizontal/(l)andscape +ScreenOrientation=h + +# Do not allow device to sleep when the application is in foreground, set this for video players or apps which use accelerometer +InhibitSuspend=y + +# Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' +# If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu +# If the URL in in the form ':dir/file.dat:http://URL/' it will be downloaded as binary BLOB to the application dir and not unzipped +# If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir - +# these files are put inside .apk package by build system +# Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS +AppDataDownloadUrl="!!App data|scummvm190-git-appdata.zip" + +# Video color depth - 16 BPP is the fastest and supported for all modes, 24 bpp is supported only +# with SwVideoMode=y, SDL_OPENGL mode supports everything. (16)/(24)/(32) +VideoDepthBpp=32 + +# Enable OpenGL depth buffer (needed only for 3-d applications, small speed decrease) (y) or (n) +NeedDepthBuffer=y + +# Enable OpenGL stencil buffer (needed only for 3-d applications, small speed decrease) (y) or (n) +NeedStencilBuffer=y + +# Try to use GLES 2.x context - will revert to GLES 1.X if unsupported by device +# you need this option only if you're developing 3-d app (y) or (n) +NeedGles2=n + +# Application uses software video buffer - you're calling SDL_SetVideoMode() without SDL_HWSURFACE and without SDL_OPENGL, +# this will allow small speed optimization. Enable this even when you're using SDL_HWSURFACE. (y) or (n) +SwVideoMode=n + +# Application video output will be resized to fit into native device screen (y)/(n) +SdlVideoResize=y + +# Application resizing will keep 4:3 aspect ratio, with black bars at sides (y)/(n) +SdlVideoResizeKeepAspect=n + +# Application does not call SDL_Flip() or SDL_UpdateRects() appropriately, or draws from non-main thread - +# enabling the compatibility mode will force screen update every 100 milliseconds, which is laggy and inefficient (y) or (n) +CompatibilityHacks=n + +# Application initializes SDL audio/video inside static constructors (which is bad, you won't be able to run ndk-gdb) (y)/(n) +CompatibilityHacksStaticInit=n + +# On-screen Android soft text input emulates hardware keyboard, this will only work with Hackers Keyboard app (y)/(n) +CompatibilityHacksTextInputEmulatesHwKeyboard=y +TextInputKeyboard=1 + +# Hack for broken devices: prevent audio chopping, by sleeping a bit after pushing each audio chunk (y)/(n) +CompatibilityHacksPreventAudioChopping=n + +# Hack for broken apps: application ignores audio buffer size returned by SDL (y)/(n) +CompatibilityHacksAppIgnoresAudioBufferSize=n + +# Hack for VCMI: preload additional shared libraries before aplication start +CompatibilityHacksAdditionalPreloadedSharedLibraries="" + +# Hack for Free Heroes 2, which redraws the screen inside SDL_PumpEvents(): slow and compatible SDL event queue - +# do not use it with accelerometer/gyroscope, or your app may freeze at random (y)/(n) +CompatibilityHacksSlowCompatibleEventQueue=n + +# Save and restore OpenGL state when drawing on-screen keyboard for apps that use SDL_OPENGL +CompatibilityHacksTouchscreenKeyboardSaveRestoreOpenGLState=y + +# Application uses mouse (y) or (n), this will show mouse emulation dialog to the user +AppUsesMouse=y + +# Application needs two-button mouse, will also enable advanced point-and-click features (y) or (n) +AppNeedsTwoButtonMouse=y + +# Show SDL mouse cursor, for applications that do not draw cursor at all (y) or (n) +ShowMouseCursor=n + +# Force relative (laptop) mouse movement mode, useful when both on-screen keyboard and mouse are needed (y) or (n) +ForceRelativeMouseMode=n + +# Application needs arrow keys (y) or (n), will show on-screen dpad/joystick (y) or (n) +AppNeedsArrowKeys=n + +# Application needs text input (y) or (n), enables button for text input on screen +AppNeedsTextInput=y + +# Application uses joystick (y) or (n), the on-screen DPAD will be used as joystick 0 axes 0-1 +AppUsesJoystick=n + +# Application uses second on-screen joystick, as SDL joystick 0 axes 2-3 (y)/(n) +AppUsesSecondJoystick=n + +# Application uses accelerometer (y) or (n), the accelerometer will be used as joystick 1 axes 0-1 and 5-7 +AppUsesAccelerometer=n + +# Application uses gyroscope (y) or (n), the gyroscope will be used as joystick 1 axes 2-4 +AppUsesGyroscope=n + +# Application uses multitouch (y) or (n), multitouch events are passed as SDL_JOYBALLMOTION events for the joystick 0 +AppUsesMultitouch=y + +# Application records audio (it will use any available source, such a s microphone) +# API is defined in file SDL_android.h: int SDL_ANDROID_OpenAudioRecording(SDL_AudioSpec *spec); void SDL_ANDROID_CloseAudioRecording(void); +# This option will add additional permission to Android manifest (y)/(n) +AppRecordsAudio=n + +# Application implements Android-specific routines to put to background, and will not draw anything to screen +# between SDL_ACTIVEEVENT lost / gained notifications - you should check for them +# rigth after SDL_Flip(), if (n) then SDL_Flip() will block till app in background (y) or (n) +# This option is reported to be buggy, sometimes failing to restore video state +NonBlockingSwapBuffers=n + +# Redefine common hardware keys to SDL keysyms +# BACK hardware key is available on all devices, MENU is available on pre-ICS devices, other keys may be absent +# SEARCH and CALL by default return same keycode as DPAD_CENTER - one of those keys is available on most devices +# Use word NO_REMAP if you want to preserve native functionality for certain key (volume keys are 3-rd and 4-th) +# Keys: TOUCHSCREEN (works only when AppUsesMouse=n), DPAD_CENTER/SEARCH, VOLUMEUP, VOLUMEDOWN, MENU, BACK, CAMERA +RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP ESCAPE LCTRL F7 F4 F2 MOUSE_LEFT" + +# Number of virtual keyboard keys (currently 6 is maximum) +AppTouchscreenKeyboardKeysAmount=0 + +# Number of virtual keyboard keys that support autofire (currently 2 is maximum) +AppTouchscreenKeyboardKeysAmountAutoFire=0 + +# Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right) +RedefinedKeysScreenKb="MOUSE_RIGHT F7 LCTRL" + +# Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu +RedefinedKeysScreenKbNames="MOUSE_RIGHT F7 LCTRL" + +# On-screen keys theme +# 0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick) +# 1 = Simple Theme by Beholder (white, with gamepad joystick) +# 2 = Sun by Sirea (yellow, with round joystick) +# 3 = Keen by Gerstrong (multicolor, with round joystick) +TouchscreenKeysTheme=1 + +# Redefine gamepad keys to SDL keysyms, button order is: +# A B X Y L1 R1 L2 R2 LThumb RThumb +RedefinedKeysGamepad="MOUSE_RIGHT F7 LCTRL ESCAPE F5 SPACE RETURN MOUSE_LEFT" + +# How long to show startup menu button, in msec, 0 to disable startup menu +StartupMenuButtonTimeout=3000 + +# Menu items to hide from startup menu, available menu items: +# SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration SettingsMenuMisc.ResetToDefaultsConfig SettingsMenuMouse.MouseConfigMainMenu SettingsMenuMouse.DisplaySizeConfig SettingsMenuMouse.LeftClickConfig SettingsMenuMouse.RightClickConfig SettingsMenuMouse.AdditionalMouseConfig SettingsMenuMouse.JoystickMouseConfig SettingsMenuMouse.TouchPressureMeasurementTool SettingsMenuMouse.CalibrateTouchscreenMenu SettingsMenuKeyboard.KeyboardConfigMainMenu SettingsMenuKeyboard.ScreenKeyboardSizeConfig SettingsMenuKeyboard.ScreenKeyboardDrawSizeConfig SettingsMenuKeyboard.ScreenKeyboardThemeConfig SettingsMenuKeyboard.ScreenKeyboardTransparencyConfig SettingsMenuKeyboard.RemapHwKeysConfig SettingsMenuKeyboard.RemapScreenKbConfig SettingsMenuKeyboard.ScreenGesturesConfig SettingsMenuKeyboard.CustomizeScreenKbLayout +HiddenMenuOptions='SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMouse.DisplaySizeConfig' + +# Menu items to show at startup - this is Java code snippet, leave empty for default +# new SettingsMenuMisc.ShowReadme(), (AppUsesMouse \&\& \! ForceRelativeMouseMode \? new SettingsMenuMouse.DisplaySizeConfig(true) : new SettingsMenu.DummyMenu()), new SettingsMenuMisc.OptionalDownloadConfig(true), new SettingsMenuMisc.GyroscopeCalibration() +# Available menu items: +# SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration SettingsMenuMisc.ResetToDefaultsConfig SettingsMenuMouse.MouseConfigMainMenu SettingsMenuMouse.DisplaySizeConfig SettingsMenuMouse.LeftClickConfig SettingsMenuMouse.RightClickConfig SettingsMenuMouse.AdditionalMouseConfig SettingsMenuMouse.JoystickMouseConfig SettingsMenuMouse.TouchPressureMeasurementTool SettingsMenuMouse.CalibrateTouchscreenMenu SettingsMenuKeyboard.KeyboardConfigMainMenu SettingsMenuKeyboard.ScreenKeyboardSizeConfig SettingsMenuKeyboard.ScreenKeyboardDrawSizeConfig SettingsMenuKeyboard.ScreenKeyboardThemeConfig SettingsMenuKeyboard.ScreenKeyboardTransparencyConfig SettingsMenuKeyboard.RemapHwKeysConfig SettingsMenuKeyboard.RemapScreenKbConfig SettingsMenuKeyboard.ScreenGesturesConfig SettingsMenuKeyboard.CustomizeScreenKbLayout +FirstStartMenuOptions='' + +# Enable multi-ABI binary, with hardware FPU support - it will also work on old devices, +# but .apk size is 2x bigger (y) / (n) / (x86) / (all) +MultiABI="armeabi-v7a" + +# Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower +AppMinimumRAM=256 + +# Application version code (integer) +AppVersionCode=19002 + +# Application user-visible version name (string) +AppVersionName="1.9.0git1661" + +# Reset SDL config when updating application to the new version (y) / (n) +ResetSdlConfigForThisVersion=y + +# Delete application data files when upgrading (specify file/dir paths separated by spaces) +DeleteFilesOnUpgrade="%" + +# Optional shared libraries to compile - removing some of them will save space +# MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed +# Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 +CompiledLibraries="mad vorbis flac ogg jpeg png theora freetype faad" + +# Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) +CustomBuildScript=y + +# Aditional CFLAGS for application +AppCflags='' + +# Additional LDFLAGS for application +AppLdflags='' + +# If application has headers with the same name as system headers, this option tries to fix compiler flags to make it compilable +AppOverlapsSystemHeaders= + +# Build only following subdirs (empty will build all dirs, ignored with custom script) +AppSubdirsBuild='' + +# Exclude these files from build +AppBuildExclude='' + +# Application command line parameters, including app name as 0-th param +AppCmdline='' + +# Here you may type readme text, which will be shown during startup. Format is: +# Text in English, use \\\\n to separate lines^de:Text in Deutsch^ru:Text in Russian, and so on (that's four backslashes, nice isn't it?) +ReadmeText='^You may press "Home" now - the data will be downloaded in background' + +# Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens +# Minimum screen size that application supports: (s)mall / (m)edium / (l)arge +MinimumScreenSize=s + +# Your AdMob Publisher ID, (n) if you don't want advertisements +AdmobPublisherId=n + +# Your AdMob test device ID, to receive a test ad +AdmobTestDeviceId= + +# Your AdMob banner size (BANNER/IAB_BANNER/IAB_LEADERBOARD/IAB_MRECT/IAB_WIDE_SKYSCRAPER/SMART_BANNER) +AdmobBannerSize= + +UseGlshim=n + +AccessSdCard=y
\ No newline at end of file diff --git a/dists/androidsdl/scummvm/AndroidBuild.sh b/dists/androidsdl/scummvm/AndroidBuild.sh new file mode 100644 index 0000000000..a7bf6ed446 --- /dev/null +++ b/dists/androidsdl/scummvm/AndroidBuild.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +LOCAL_PATH=`dirname $0` +LOCAL_PATH=`cd $LOCAL_PATH && pwd` + +#ln -sf libtremor.a $LOCAL_PATH/../../../obj/local/$1/libvorbisidec.a +ln -sf libflac.a $LOCAL_PATH/../../../obj/local/$1/libFLAC.a +ln -sf libvorbis.a $LOCAL_PATH/../../../obj/local/$1/libvorbisfile.a +ln -sf libtheora.so $LOCAL_PATH/../../../obj/local/$1/libtheoradec.so +ln -sf libglshim.a $LOCAL_PATH/../../../obj/local/$1/libGL.a + +if [ \! -f scummvm/config.mk ] ; then + ../setEnvironment-$1.sh sh -c "cd scummvm && env LIBS='-lflac -lvorbis -logg -lmad -lz -lgcc -ltheora -lpng -lfreetype -lfaad -lgnustl_static' ./configure --host=androidsdl-$1 --enable-zlib --enable-vorbis --enable-mad --enable-flac --enable-png --enable-theoradec --enable-vkeybd --enable-verbose-build --disable-readline --disable-nasm --disable-mt32emu --disable-timidity --disable-fluidsynth --opengl-mode=gles --enable-all-engines --datadir=. " +fi +../setEnvironment-$1.sh make -C scummvm -j2 && cp -f scummvm/scummvm libapplication-$1.so diff --git a/dists/androidsdl/scummvm/AndroidData/logo.png b/dists/androidsdl/scummvm/AndroidData/logo.png Binary files differnew file mode 100644 index 0000000000..553d97d25e --- /dev/null +++ b/dists/androidsdl/scummvm/AndroidData/logo.png diff --git a/dists/androidsdl/scummvm/DataBuild.sh b/dists/androidsdl/scummvm/DataBuild.sh new file mode 100755 index 0000000000..f38c82f8b1 --- /dev/null +++ b/dists/androidsdl/scummvm/DataBuild.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +LOCAL_PATH=`dirname $0` +LOCAL_PATH=`cd $LOCAL_PATH && pwd` + +rm AndroidData/* +make -C scummvm androidsdl +cp -f scummvm/scummvm*.z* AndroidData +rm scummvm/scummvm*.z*
\ No newline at end of file diff --git a/dists/androidsdl/scummvm/banner.png b/dists/androidsdl/scummvm/banner.png Binary files differnew file mode 100644 index 0000000000..28a7196b7f --- /dev/null +++ b/dists/androidsdl/scummvm/banner.png diff --git a/dists/androidsdl/scummvm/icon.png b/dists/androidsdl/scummvm/icon.png Binary files differnew file mode 100755 index 0000000000..03bc753aab --- /dev/null +++ b/dists/androidsdl/scummvm/icon.png diff --git a/doc/de/Neues b/doc/de/Neues index 80a7fd363f..8015feb05b 100644 --- a/doc/de/Neues +++ b/doc/de/Neues @@ -14,6 +14,7 @@ Programmcodes finden Sie auf Englisch unter: 1.8.1 (25.05.2016) Neue Portierungen: - Portierung für den Nintendo 3DS hinzugefügt. + - Portierung für Android SDL hinzugefügt. Allgemein: - "TESTING"-Markierung von mehreren unterstützten Spielen entfernt. diff --git a/gui/credits.h b/gui/credits.h index e27973c228..79f4516370 100644 --- a/gui/credits.h +++ b/gui/credits.h @@ -58,6 +58,7 @@ static const char *credits[] = { "C1""AGI", "C0""Stuart George", "C0""Matthew Hoops", +"C2""(retired)", "C0""Filippos Karapetis", "C0""Martin Kiewitz", "C0""Pawel Kolodziejski", @@ -173,6 +174,7 @@ static const char *credits[] = { "", "C1""Lastexpress", "C0""Matthew Hoops", +"C2""(retired)", "C0""Jordi Vilalta Prat", "C0""Julien Templier", "", @@ -192,6 +194,7 @@ static const char *credits[] = { "C1""Mohawk", "C0""Bastien Bouclet", "C0""Matthew Hoops", +"C2""(retired)", "C0""Filippos Karapetis", "C0""Alyssa Milburn", "C0""Eugene Sandulenko", @@ -211,6 +214,7 @@ static const char *credits[] = { "", "C1""Pegasus", "C0""Matthew Hoops", +"C2""(retired)", "", "C1""Queen", "C0""David Eriksson", @@ -481,7 +485,7 @@ static const char *credits[] = { "C0""Joachim Eberhard", "C2""Numerous contributions to documentation (retired)", "C0""Matthew Hoops", -"C2""Wiki editor", +"C2""Numerous contributions to documentation (retired)", "", "C1""Retired Team Members", "C0""Chris Apers", |