[Scummvm-cvs-logs] SF.net SVN: scummvm:[48859] scummvm/branches/branch-1-1-0/backends/platform /maemo
fanoush at users.sourceforge.net
fanoush at users.sourceforge.net
Thu Apr 29 23:29:00 CEST 2010
Revision: 48859
http://scummvm.svn.sourceforge.net/scummvm/?rev=48859&view=rev
Author: fanoush
Date: 2010-04-29 21:28:59 +0000 (Thu, 29 Apr 2010)
Log Message:
-----------
remove unused files
Removed Paths:
-------------
scummvm/branches/branch-1-1-0/backends/platform/maemo/Makefile
scummvm/branches/branch-1-1-0/backends/platform/maemo/hildon.cpp
scummvm/branches/branch-1-1-0/backends/platform/maemo/maemo-sdl.cpp
scummvm/branches/branch-1-1-0/backends/platform/maemo/maemo-sdl.h
scummvm/branches/branch-1-1-0/backends/platform/maemo/main.cpp
scummvm/branches/branch-1-1-0/backends/platform/maemo/portdefs.h
Deleted: scummvm/branches/branch-1-1-0/backends/platform/maemo/Makefile
===================================================================
--- scummvm/branches/branch-1-1-0/backends/platform/maemo/Makefile 2010-04-29 19:06:49 UTC (rev 48858)
+++ scummvm/branches/branch-1-1-0/backends/platform/maemo/Makefile 2010-04-29 21:28:59 UTC (rev 48859)
@@ -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
-
Deleted: scummvm/branches/branch-1-1-0/backends/platform/maemo/hildon.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/backends/platform/maemo/hildon.cpp 2010-04-29 19:06:49 UTC (rev 48858)
+++ scummvm/branches/branch-1-1-0/backends/platform/maemo/hildon.cpp 2010-04-29 21:28:59 UTC (rev 48859)
@@ -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 <hildon-widgets/hildon-app.h>
-#include <gtk/gtk.h>
-#include <libosso.h>
-#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;
-}
Deleted: scummvm/branches/branch-1-1-0/backends/platform/maemo/maemo-sdl.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/backends/platform/maemo/maemo-sdl.cpp 2010-04-29 19:06:49 UTC (rev 48858)
+++ scummvm/branches/branch-1-1-0/backends/platform/maemo/maemo-sdl.cpp 2010-04-29 21:28:59 UTC (rev 48859)
@@ -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();
-}
Deleted: scummvm/branches/branch-1-1-0/backends/platform/maemo/maemo-sdl.h
===================================================================
--- scummvm/branches/branch-1-1-0/backends/platform/maemo/maemo-sdl.h 2010-04-29 19:06:49 UTC (rev 48858)
+++ scummvm/branches/branch-1-1-0/backends/platform/maemo/maemo-sdl.h 2010-04-29 21:28:59 UTC (rev 48859)
@@ -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 <SDL.h>
-
-
-class OSystem_MAEMO : public OSystem_SDL {
-public:
- OSystem_MAEMO() {}
-
- void loadGFXMode();
-};
-
-#endif
Deleted: scummvm/branches/branch-1-1-0/backends/platform/maemo/main.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/backends/platform/maemo/main.cpp 2010-04-29 19:06:49 UTC (rev 48858)
+++ scummvm/branches/branch-1-1-0/backends/platform/maemo/main.cpp 2010-04-29 21:28:59 UTC (rev 48859)
@@ -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 <common/scummsys.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/Xsp.h>
-
-#include <SDL/SDL.h>
-#include <SDL/SDL_syswm.h>
-
-#include "backends/platform/maemo/maemo-sdl.h"
-#include "base/main.h"
-#include "base/internal_version.h"
-#include <hildon-widgets/hildon-app.h>
-#include <gtk/gtk.h>
-#include <libosso.h>
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#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;
-}
Deleted: scummvm/branches/branch-1-1-0/backends/platform/maemo/portdefs.h
===================================================================
--- scummvm/branches/branch-1-1-0/backends/platform/maemo/portdefs.h 2010-04-29 19:06:49 UTC (rev 48858)
+++ scummvm/branches/branch-1-1-0/backends/platform/maemo/portdefs.h 2010-04-29 21:28:59 UTC (rev 48859)
@@ -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 <stdio.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <ctype.h>
-#include <time.h>
-#include <math.h>
-
-void set_doubling(unsigned char enable);
-
-#endif /* PORTDEFS_H */
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list