From 664fdfc9146dcf5d1505db29ef468868184e88a0 Mon Sep 17 00:00:00 2001 From: Frantisek Dufka Date: Thu, 29 Apr 2010 21:35:11 +0000 Subject: remove unused files svn-id: r48862 --- backends/platform/maemo/Makefile | 19 ----- backends/platform/maemo/hildon.cpp | 138 ---------------------------------- backends/platform/maemo/maemo-sdl.cpp | 44 ----------- backends/platform/maemo/maemo-sdl.h | 43 ----------- backends/platform/maemo/main.cpp | 84 --------------------- backends/platform/maemo/portdefs.h | 72 ------------------ 6 files changed, 400 deletions(-) delete mode 100644 backends/platform/maemo/Makefile delete mode 100644 backends/platform/maemo/hildon.cpp delete mode 100644 backends/platform/maemo/maemo-sdl.cpp delete mode 100644 backends/platform/maemo/maemo-sdl.h delete mode 100644 backends/platform/maemo/main.cpp delete mode 100644 backends/platform/maemo/portdefs.h (limited to 'backends/platform') diff --git a/backends/platform/maemo/Makefile b/backends/platform/maemo/Makefile deleted file mode 100644 index f70a00e490..0000000000 --- a/backends/platform/maemo/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -.PHONY: all - -all: - - -SRCDIR = ../../.. - -config: - cd $(SRCDIR) ; CXXFLAGS="-Os -mcpu=arm926ej-s -fomit-frame-pointer -DMAEMO_SDL" ./configure --host=arm-linux --prefix=/usr --disable-debug --disable-mt32emu --disable-hq-scalers --with-tremor-prefix=/usr --enable-tremor --with-zlib-prefix=/usr --enable-zlib --with-mad-prefix=/usr --enable-mad --enable-flac --disable-fluidsynth - -scummvm: - cd $(SRCDIR) ; make - echo "If there is compiler crash (in Kyra engine) then cd ../../.. and copy/run last line with -O3 instead of -Os and re-run make" -# cp $(SRCDIR)/scummvm . - - -deb: $(SRCDIR)/scummvm - cd $(SRCDIR) ; dpkg-buildpackage -rfakeroot -b -nc - diff --git a/backends/platform/maemo/hildon.cpp b/backends/platform/maemo/hildon.cpp deleted file mode 100644 index 697e4d8b70..0000000000 --- a/backends/platform/maemo/hildon.cpp +++ /dev/null @@ -1,138 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ - -#include -#include -#include -#include "base/internal_version.h" - -#define OSSO_APP_NAME "scummvm" -#define OSSO_APP_VERSION SCUMMVM_VERSION -#define OSSO_APP_SERVICE "org.scummvm."OSSO_APP_NAME -#define OSSO_APP_OBJECT "/org/scummvm/"OSSO_APP_NAME -#define OSSO_APP_IFACE "org.scummvm."OSSO_APP_NAME - -// Application UI data struct -typedef struct _AppData AppData; -struct _AppData { - HildonApp *app; - HildonAppView *appview; - osso_context_t *osso_context; -}; - -// Callback for exit D-BUS event -void exit_event_handler(gboolean die_now, gpointer data) { - AppData *appdata; - appdata = (AppData *)data; - g_print("exit_event_handler called\n"); - /* Do whatever application needs to do before exiting */ - gtk_infoprint(GTK_WINDOW(appdata->app), "Exiting..."); -} - -// Callback for normal D-BUS messages -gint dbus_req_handler(const gchar *interface, const gchar *method, - GArray *arguments, gpointer data, - osso_rpc_t *retval) { - AppData *appdata; - appdata = (AppData *)data; - osso_system_note_infoprint(appdata->osso_context, method, retval); - return OSSO_OK; -} - - -// Main application -int main(int argc, char *argv[]) { - // Create needed variables - HildonApp *app; - HildonAppView *appview; - osso_context_t *osso_context; - osso_return_t result; - GtkWidget *main_vbox; - GtkWidget *label; - - // Initialize the GTK. - gtk_init(&argc, &argv); - - // Initialize maemo application - osso_context = osso_initialize(OSSO_APP_NAME, OSSO_APP_VERSION, TRUE, NULL); - - // Check that initialization was ok - if (osso_context == NULL) { - return OSSO_ERROR; - } - - // Create the hildon application and setup the title - app = HILDON_APP(hildon_app_new()); - hildon_app_set_title(app, "ScummVM"); - hildon_app_set_two_part_title(app, TRUE); - - // Create HildonAppView and set it to HildonApp - appview = HILDON_APPVIEW(hildon_appview_new("AppView Title")); - hildon_app_set_appview(app, appview); - - // Create AppData - AppData *appdata; - appdata = g_new0(AppData, 1); - appdata->app = app; - appdata->appview = appview; - appdata->osso_context = osso_context; - - // Add vbox to appview - main_vbox = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(appview), main_vbox); - - // Add button to vbox - label = gtk_label_new("Waiting for DBUS message..."); - gtk_box_pack_start(GTK_BOX(main_vbox), label, FALSE, TRUE, 0); - - // Add handler for hello D-BUS messages - result = osso_rpc_set_cb_f(appdata->osso_context, - OSSO_APP_SERVICE, - OSSO_APP_OBJECT, - OSSO_APP_IFACE, - dbus_req_handler, appdata); - if (result != OSSO_OK) { - g_print("Error setting D-BUS callback (%d)\n", result); - return OSSO_ERROR; - } - - // Add handler for Exit D-BUS messages - result = osso_application_set_exit_cb(appdata->osso_context, - exit_event_handler, - (gpointer) appdata); - if (result != OSSO_OK) { - g_print("Error setting exit callback (%d)\n", result); - return OSSO_ERROR; - } - - // Begin the main application - gtk_widget_show_all(GTK_WIDGET(app)); - gtk_main(); - - // Deinitialize OSSO - osso_deinitialize(osso_context); - - return 0; -} diff --git a/backends/platform/maemo/maemo-sdl.cpp b/backends/platform/maemo/maemo-sdl.cpp deleted file mode 100644 index cb0141924b..0000000000 --- a/backends/platform/maemo/maemo-sdl.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ - -#include "backends/platform/maemo/maemo-sdl.h" - - -void OSystem_MAEMO::loadGFXMode() { - if (_fullscreen || effectiveScreenHeight() > 400) { - _overlayWidth = 800; - _overlayHeight = 480; - - _fullscreen = true; - } else { - _overlayWidth = 720; - _overlayHeight = 400; - } - - if (_screenHeight != 200) - _adjustAspectRatio = false; - - OSystem_SDL::loadGFXMode(); -} diff --git a/backends/platform/maemo/maemo-sdl.h b/backends/platform/maemo/maemo-sdl.h deleted file mode 100644 index f45648a9e6..0000000000 --- a/backends/platform/maemo/maemo-sdl.h +++ /dev/null @@ -1,43 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ - -#ifndef MAEMO_SDL_H -#define MAEMO_SDL_H - -#include "backends/platform/sdl/sdl-common.h" - -//#include "CEkeys.h" - -#include - - -class OSystem_MAEMO : public OSystem_SDL { -public: - OSystem_MAEMO() {} - - void loadGFXMode(); -}; - -#endif diff --git a/backends/platform/maemo/main.cpp b/backends/platform/maemo/main.cpp deleted file mode 100644 index cbf271b970..0000000000 --- a/backends/platform/maemo/main.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ - -#include -#include -#include - -#include -#include - -#include "backends/platform/maemo/maemo-sdl.h" -#include "base/main.h" -#include "base/internal_version.h" -#include -#include -#include - -#include -#include - -#define OSSO_APP_NAME "scummvm" -#define OSSO_APP_VERSION SCUMMVM_VERSION - -void set_doubling(unsigned char enable) { - return; - - SDL_SysWMinfo wminfo; - SDL_VERSION(&wminfo.version); - SDL_GetWMInfo(&wminfo); - XSPSetPixelDoubling(wminfo.info.x11.display, 0, enable); -} - -int main(int argc, char *argv[]) { - osso_context_t *osso_context; - - // Initialize maemo application - //osso_context = osso_initialize(OSSO_APP_NAME, OSSO_APP_VERSION, TRUE, NULL); - - // Check that initialization was ok - //if (osso_context == NULL) { - // return OSSO_ERROR; - //} - - // Maemo task navigator priority inheritance fix - setpriority(PRIO_PROCESS, 0, 0); - - set_doubling(0); - - g_system = new OSystem_MAEMO(); - assert(g_system); - - // Invoke the actual ScummVM main entry point: - int res = scummvm_main(argc, argv); - g_system->quit(); // TODO: Consider removing / replacing this! - - /* Deinitialize OSSO */ - //osso_deinitialize(osso_context); - - set_doubling(0); - - return res; -} diff --git a/backends/platform/maemo/portdefs.h b/backends/platform/maemo/portdefs.h deleted file mode 100644 index 52d16fd820..0000000000 --- a/backends/platform/maemo/portdefs.h +++ /dev/null @@ -1,72 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ - -#ifndef PORTDEFS_H -#define PORTDEFS_H - -#define SCUMM_LITTLE_ENDIAN -#define SCUMM_NEED_ALIGNMENT - -#undef HAVE_X86 - -#undef LINUPY - -/* Data types */ -typedef unsigned char byte; -typedef unsigned int uint; -typedef unsigned char uint8; -typedef unsigned short uint16; -typedef unsigned int uint32; -typedef signed char int8; -typedef signed short int16; -typedef signed int int32; - -/* Libs */ -#undef USE_VORBIS -#undef USE_TREMOR -#undef USE_FLAC -#undef USE_MAD -#define USE_ZLIB -#undef USE_MPEG2 -#undef USE_MT32EMU - -/* Whether we should use i386 assembly routines */ -#undef USE_NASM - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -void set_doubling(unsigned char enable); - -#endif /* PORTDEFS_H */ - - -- cgit v1.2.3