[Scummvm-cvs-logs] SF.net SVN: scummvm:[51588] scummvm/branches/gsoc2010-opengl/backends/ platform/symbian
anotherguest at users.sourceforge.net
anotherguest at users.sourceforge.net
Sun Aug 1 21:51:23 CEST 2010
Revision: 51588
http://scummvm.svn.sourceforge.net/scummvm/?rev=51588&view=rev
Author: anotherguest
Date: 2010-08-01 19:51:23 +0000 (Sun, 01 Aug 2010)
Log Message:
-----------
SYMBIAN 2nd installment of getting symbian to build with gsoc2010 SDL
Modified Paths:
--------------
scummvm/branches/gsoc2010-opengl/backends/platform/symbian/AdaptAllMMPs.pl
scummvm/branches/gsoc2010-opengl/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
scummvm/branches/gsoc2010-opengl/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
scummvm/branches/gsoc2010-opengl/backends/platform/symbian/mmp/scummvm_base.mmp.in
Added Paths:
-----------
scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/Symbianmain.cpp
Removed Paths:
-------------
scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/main.cpp
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/symbian/AdaptAllMMPs.pl
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/symbian/AdaptAllMMPs.pl 2010-08-01 19:40:46 UTC (rev 51587)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/symbian/AdaptAllMMPs.pl 2010-08-01 19:51:23 UTC (rev 51588)
@@ -91,9 +91,6 @@
"iff.cpp"
);
-my @excludes_gui = (
-);
-
# the USE_ARM_* defines not parsed correctly, exclude manually:
my @excludes_scumm = (
".*ARM.*", # the *ARM.s files are added in .mpp files based on WINS/ARM build!
@@ -106,7 +103,7 @@
#arseModule(mmpStr, dirStr, ifdefArray, [exclusionsArray])
ParseModule("_base", "base", \@section_empty); # now in ./TRG/ScummVM_TRG.mmp, these never change anyways...
ParseModule("_base", "common", \@section_empty);
-ParseModule("_base", "gui", \@section_empty, \@excludes_gui);
+ParseModule("_base", "gui", \@section_empty);
ParseModule("_base", "graphics", \@section_empty, \@excludes_graphics);
ParseModule("_base", "sound", \@section_empty, \@excludes_snd);
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in 2010-08-01 19:40:46 UTC (rev 51587)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in 2010-08-01 19:51:23 UTC (rev 51588)
@@ -118,7 +118,7 @@
SOURCE backends\platform\symbian\src\SymbianOS.cpp
SOURCE backends\platform\symbian\src\SymbianActions.cpp
SOURCE backends\platform\symbian\src\ScummApp.cpp
-SOURCE backends\platform\symbian\src\Main.cpp
+SOURCE backends\platform\symbian\src\SymbianMain.cpp
SOURCE gui\Key.cpp
SOURCE gui\KeysDialog.cpp
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2010-08-01 19:40:46 UTC (rev 51587)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2010-08-01 19:51:23 UTC (rev 51588)
@@ -118,7 +118,7 @@
SOURCE backends\platform\symbian\src\SymbianOS.cpp
SOURCE backends\platform\symbian\src\SymbianActions.cpp
SOURCE backends\platform\symbian\src\ScummApp.cpp
-SOURCE backends\platform\symbian\src\Main.cpp
+SOURCE backends\platform\symbian\src\SymbianMain.cpp
SOURCE gui\Key.cpp
SOURCE gui\KeysDialog.cpp
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in 2010-08-01 19:40:46 UTC (rev 51587)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in 2010-08-01 19:51:23 UTC (rev 51588)
@@ -36,7 +36,6 @@
TARGET ScummVM_A0000658.exe
TARGETPATH sys\bin
TARGETTYPE exe
-
OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
UID 0x100039ce 0xA0000658
@@ -113,20 +112,22 @@
SOURCEPATH ..\..\..\..\
// backend EPOC/SDL/ESDL specific includes
-SOURCE backends\platform\sdl\events.cpp
-SOURCE backends\platform\sdl\graphics.cpp
+SOURCE backends\platform\sdl\hardwarekeys.cpp
SOURCE backends\platform\sdl\sdl.cpp
-SOURCE backends\platform\sdl\hardwarekeys.cpp
SOURCE backends\fs\symbian\symbian-fs-factory.cpp
SOURCE backends\platform\symbian\src\SymbianOS.cpp
SOURCE backends\platform\symbian\src\SymbianActions.cpp
SOURCE backends\platform\symbian\src\ScummApp.cpp
+SOURCE backends\platform\symbian\src\SymbianMain.cpp
SOURCE gui\Key.cpp
SOURCE gui\KeysDialog.cpp
SOURCE gui\Actions.cpp
SOURCE gui\Dialog.cpp
+// Common error
+source common\error.cpp
+
// Special for graphics
source graphics\iff.cpp
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2010-08-01 19:40:46 UTC (rev 51587)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2010-08-01 19:51:23 UTC (rev 51588)
@@ -113,20 +113,22 @@
SOURCEPATH ..\..\..\..\
// backend EPOC/SDL/ESDL specific includes
-SOURCE backends\platform\sdl\events.cpp
-SOURCE backends\platform\sdl\graphics.cpp
+SOURCE backends\platform\sdl\hardwarekeys.cpp
SOURCE backends\platform\sdl\sdl.cpp
-SOURCE backends\platform\sdl\hardwarekeys.cpp
SOURCE backends\fs\symbian\symbian-fs-factory.cpp
SOURCE backends\platform\symbian\src\SymbianOS.cpp
SOURCE backends\platform\symbian\src\SymbianActions.cpp
SOURCE backends\platform\symbian\src\ScummApp.cpp
+SOURCE backends\platform\symbian\src\SymbianMain.cpp
SOURCE gui\Key.cpp
SOURCE gui\KeysDialog.cpp
SOURCE gui\Actions.cpp
SOURCE gui\Dialog.cpp
+// Common error
+source common\error.cpp
+
// Special for graphics
source graphics\iff.cpp
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/symbian/mmp/scummvm_base.mmp.in
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/symbian/mmp/scummvm_base.mmp.in 2010-08-01 19:40:46 UTC (rev 51587)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/symbian/mmp/scummvm_base.mmp.in 2010-08-01 19:51:23 UTC (rev 51588)
@@ -108,7 +108,6 @@
// add a few files manually, since they are not parsed from modules.mk files
SOURCEPATH ..\..\..\..
-SOURCE base\main.cpp
SOURCE backends\events\default\default-events.cpp
SOURCE backends\timer\default\default-timer.cpp
SOURCE backends\saves\savefile.cpp
Copied: scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/Symbianmain.cpp (from rev 51578, scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/main.cpp)
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/Symbianmain.cpp (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/Symbianmain.cpp 2010-08-01 19:51:23 UTC (rev 51588)
@@ -0,0 +1,99 @@
+/* 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 "base/main.h"
+#include "backends/platform/symbian/src/SymbianOS.h"
+#include "backends/platform/symbian/src/portdefs.h"
+
+extern "C"
+{
+// Include the snprintf and vsnprintf implementations as 'C' code
+#include "vsnprintf.h"
+}
+
+// Symbian SDL_Main implementation
+// Redirects standard io, creates Symbian specific SDL backend (inherited from main SDL)
+int main(int argc, char *argv[]) {
+ //
+ // Set up redirects for stdout/stderr under Symbian.
+ // Code copied from SDL_main.
+ //
+
+ // Symbian does not like any output to the console through any *print* function
+ char STDOUT_FILE[256], STDERR_FILE[256]; // shhh, don't tell anybody :)
+ strcpy(STDOUT_FILE, Symbian::GetExecutablePath());
+ strcpy(STDERR_FILE, Symbian::GetExecutablePath());
+ strcat(STDOUT_FILE, "scummvm.stdout.txt");
+ strcat(STDERR_FILE, "scummvm.stderr.txt");
+
+ /* Flush the output in case anything is queued */
+ fclose(stdout);
+ fclose(stderr);
+
+ /* Redirect standard input and standard output */
+ FILE *newfp = freopen(STDOUT_FILE, "w", stdout);
+ if (newfp == NULL) { /* This happens on NT */
+#if !defined(stdout)
+ stdout = fopen(STDOUT_FILE, "w");
+#else
+ newfp = fopen(STDOUT_FILE, "w");
+ if (newfp) {
+ *stdout = *newfp;
+ }
+#endif
+ }
+ newfp = freopen(STDERR_FILE, "w", stderr);
+ if (newfp == NULL) { /* This happens on NT */
+#if !defined(stderr)
+ stderr = fopen(STDERR_FILE, "w");
+#else
+ newfp = fopen(STDERR_FILE, "w");
+ if (newfp) {
+ *stderr = *newfp;
+ }
+#endif
+ }
+ setbuf(stderr, NULL); /* No buffering */
+
+ // Create our OSystem instance
+ g_system = new OSystem_SDL_Symbian();
+ assert(g_system);
+
+ // Pre initialize the backend
+ ((OSystem_SDL_Symbian *)g_system)->init();
+
+#ifdef DYNAMIC_MODULES
+ PluginManager::instance().addPluginProvider(new SDLPluginProvider());
+#endif
+
+ // Invoke the actual ScummVM main entry point:
+ int res = scummvm_main(argc, argv);
+
+ // Free OSystem
+ delete (OSystem_SDL_Symbian *)g_system;
+
+ return res;
+}
+
Deleted: scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/main.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/main.cpp 2010-08-01 19:40:46 UTC (rev 51587)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/main.cpp 2010-08-01 19:51:23 UTC (rev 51588)
@@ -1,99 +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 "base/main.h"
-#include "backends/platform/symbian/src/SymbianOS.h"
-#include "backends/platform/symbian/src/portdefs.h"
-
-extern "C"
-{
-// Include the snprintf and vsnprintf implementations as 'C' code
-#include "vsnprintf.h"
-}
-
-// Symbian SDL_Main implementation
-// Redirects standard io, creates Symbian specific SDL backend (inherited from main SDL)
-int main(int argc, char *argv[]) {
- //
- // Set up redirects for stdout/stderr under Symbian.
- // Code copied from SDL_main.
- //
-
- // Symbian does not like any output to the console through any *print* function
- char STDOUT_FILE[256], STDERR_FILE[256]; // shhh, don't tell anybody :)
- strcpy(STDOUT_FILE, Symbian::GetExecutablePath());
- strcpy(STDERR_FILE, Symbian::GetExecutablePath());
- strcat(STDOUT_FILE, "scummvm.stdout.txt");
- strcat(STDERR_FILE, "scummvm.stderr.txt");
-
- /* Flush the output in case anything is queued */
- fclose(stdout);
- fclose(stderr);
-
- /* Redirect standard input and standard output */
- FILE *newfp = freopen(STDOUT_FILE, "w", stdout);
- if (newfp == NULL) { /* This happens on NT */
-#if !defined(stdout)
- stdout = fopen(STDOUT_FILE, "w");
-#else
- newfp = fopen(STDOUT_FILE, "w");
- if (newfp) {
- *stdout = *newfp;
- }
-#endif
- }
- newfp = freopen(STDERR_FILE, "w", stderr);
- if (newfp == NULL) { /* This happens on NT */
-#if !defined(stderr)
- stderr = fopen(STDERR_FILE, "w");
-#else
- newfp = fopen(STDERR_FILE, "w");
- if (newfp) {
- *stderr = *newfp;
- }
-#endif
- }
- setbuf(stderr, NULL); /* No buffering */
-
- // Create our OSystem instance
- g_system = new OSystem_SDL_Symbian();
- assert(g_system);
-
- // Pre initialize the backend
- ((OSystem_SDL_Symbian *)g_system)->init();
-
-#ifdef DYNAMIC_MODULES
- PluginManager::instance().addPluginProvider(new SDLPluginProvider());
-#endif
-
- // Invoke the actual ScummVM main entry point:
- int res = scummvm_main(argc, argv);
-
- // Free OSystem
- delete (OSystem_SDL_Symbian *)g_system;
-
- return res;
-}
-
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