Add initial files for a secondary exe (to be distributed with in a single pkg file)

svn-id: r35790

9 files changed, 493 insertions, 1 deletions

diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl
index 173a5546e1..9d843d80b9 100644
--- a/backends/platform/symbian/AdaptAllMMPs.pl
+++ b/backends/platform/symbian/AdaptAllMMPs.pl
@@ -33,10 +33,12 @@ chdir("../../../");
 	# Target Platform Project Files
 	"S60/ScummVM_S60.mmp",  
 	"S60v3/ScummVM_S60v3.mmp", 
+	"S60v3/ScummVM_A0000658_S60v3.mmp", 
 	"S80/ScummVM_S80.mmp", 
 	"S90/ScummVM_S90.mmp",
 	"UIQ2/ScummVM_UIQ2.mmp", 
-	"UIQ3/ScummVM_UIQ3.mmp" 
+	"UIQ3/ScummVM_UIQ3.mmp",
+	"UIQ3/ScummVM_A0000658_UIQ3.mmp" 
 
 );
 
diff --git a/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
new file mode 100644
index 0000000000..5b77ca83af
--- /dev/null
+++ b/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
@@ -0,0 +1,130 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
+ * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
+ * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
+ * Copyright (C) 2005-2006 The ScummVM project
+ *
+ * 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.
+ *
+ */
+
+//
+// EPOC S60 MMP makefile project for ScummVM
+//
+
+// *** Definitions
+
+TARGET          ScummVM_A0000658.exe
+TARGETPATH      sys\bin
+TARGETTYPE      exe
+OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
+
+UID             0x100039ce 0xA0000658
+
+START RESOURCE  ScummVM_A0000658_reg.rss
+TARGETPATH              \private\10003a3f\apps
+END
+
+START RESOURCE  ScummVM_A0000658_loc.rss
+TARGETPATH              \Resource\Apps
+LANG                    SC
+END
+
+SOURCEPATH	..\res
+START RESOURCE  ScummVM_A0000658.rss
+HEADER
+TARGETPATH              \Resource\Apps
+LANG                    SC
+END
+
+EPOCSTACKSIZE	80000
+EPOCHEAPSIZE	5000000 64000000
+
+START BITMAP    ScummVM.mbm
+TARGETPATH              \Resource\Apps
+SOURCEPATH              ..\res
+// Source Color-depth Source-bitmap-list
+// c denotes whether the bitmap is a colour bitmap and the digits represent the
+// colour-depth of the bitmap and the bitmap mask respectively
+SOURCE  c24             ScummSmall.bmp
+SOURCE  8               ScummSmallMask.bmp
+SOURCE  c24             ScummLarge.bmp
+SOURCE  8               ScummLargeMask.bmp
+SOURCE  c24             ScummxLarge.bmp
+SOURCE  8               ScummxLargeMask.bmp
+END
+
+MACRO			S60
+MACRO			S60V3
+
+ALWAYS_BUILD_AS_ARM
+
+//START_AUTO_MACROS_SLAVE//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_MACROS_SLAVE//
+
+// *** Static Libraries
+
+STATICLIBRARY esdl.lib
+
+// *** Include paths
+
+USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
+USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
+
+SYSTEMINCLUDE	\epoc32\include\ESDL
+SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE   \epoc32\include\libc
+SYSTEMINCLUDE   \epoc32\include
+SYSTEMINCLUDE   ..\src // for portdefs.h
+
+// *** SOURCE files
+
+SOURCEPATH ..\..\..\..\base
+
+//START_AUTO_OBJECTS_BASE_//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_OBJECTS_BASE_//
+
+SOURCEPATH ..\..\..\..
+
+// backend EPOC/SDL/ESDL specific includes
+SOURCE backends\platform\sdl\events.cpp
+SOURCE backends\platform\sdl\graphics.cpp
+SOURCE backends\platform\sdl\sdl.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 gui\Key.cpp
+SOURCE gui\KeysDialog.cpp
+SOURCE gui\Actions.cpp
+SOURCE gui\Dialog.cpp
+
+// Special for graphics
+source graphics\iff.cpp
+
+// *** Dynamic Libraries
+LIBRARY cone.lib  eikcore.lib
+LIBRARY euser.lib apparc.lib fbscli.lib
+LIBRARY estlib.lib apgrfx.lib
+LIBRARY gdi.lib hal.lib bitgdi.lib
+LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
+library avkon.lib bafl.lib
diff --git a/backends/platform/symbian/S60v3/scummvm_A0000658_loc.rss b/backends/platform/symbian/S60v3/scummvm_A0000658_loc.rss
new file mode 100644
index 0000000000..5b045d0459
--- /dev/null
+++ b/backends/platform/symbian/S60v3/scummvm_A0000658_loc.rss
@@ -0,0 +1,22 @@
+#include <AppInfo.rh>
+
+// This file localise the applications icons and caption
+RESOURCE LOCALISABLE_APP_INFO
+	{
+	caption_and_icon =
+		{
+		CAPTION_AND_ICON_INFO
+			{
+			// The caption text is defined in the rls file
+			caption = "ScummVM Pt2";
+			// Icons are used to represent applications in the
+			// application launcher and application title bar.
+			// The number_of_icons value identifies how many icons
+			// that exist in the icon_file.
+			number_of_icons = 1;
+			// Using the application icons.
+			icon_file = "\\Resource\\Apps\\ScummVM.mif";
+			}
+		};
+	}
+
diff --git a/backends/platform/symbian/S60v3/scummvm_A0000658_reg.rss b/backends/platform/symbian/S60v3/scummvm_A0000658_reg.rss
new file mode 100644
index 0000000000..1b1cc9e64f
--- /dev/null
+++ b/backends/platform/symbian/S60v3/scummvm_A0000658_reg.rss
@@ -0,0 +1,18 @@
+// All registration files need to #include appinfo.rh.
+#include <AppInfo.rh>
+
+// All registration files must define UID2, which is always
+// KUidAppRegistrationResourceFile, and UID3, which is the application's UID.
+UID2 KUidAppRegistrationResourceFile
+UID3 0xA0000658 // application UID
+
+// Registration file need to containo an APP_REGISTRATION_INFO resource that
+// minimally needs to provide the name of the application binary (using the
+// app_file statement).
+RESOURCE APP_REGISTRATION_INFO
+	{
+	app_file = "ScummVM_A0000658"; // filename of application binary (minus extension)
+	// Specify the location of the localisable icon/caption definition file
+	localisable_resource_file = "\\Resource\\Apps\\ScummVM_A0000658_loc";
+	}
+
diff --git a/backends/platform/symbian/UIQ3/ScummVM_A0000658.rss b/backends/platform/symbian/UIQ3/ScummVM_A0000658.rss
new file mode 100644
index 0000000000..71e9ac8881
--- /dev/null
+++ b/backends/platform/symbian/UIQ3/ScummVM_A0000658.rss
@@ -0,0 +1,49 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
+ * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
+ * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
+ * Copyright (C) 2005-2006 The ScummVM project
+ *
+ * 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: ScummVM.rss,v 1.1 2006/06/01 19:00:29 anotherguest Exp $
+ */
+
+// ScummVM.RSS
+
+NAME SCUM
+
+// Include definitions of resource STRUCTS used by this
+// resource script
+#include <eikon.rh>
+#include <qikon.rh>
+#include "..\src\Scummvm.hrh"
+// Include the standard Eikon resource ids
+#include <eikon.rsg>
+
+
+RESOURCE RSS_SIGNATURE
+	{
+	}
+
+RESOURCE TBUF16 { buf=""; }
+
+RESOURCE EIK_APP_INFO
+	{
+	}
+
+#include <sdl.ra>
+
diff --git a/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
new file mode 100644
index 0000000000..b3c6f33719
--- /dev/null
+++ b/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
@@ -0,0 +1,132 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
+ * Copyright (C) 2003-2009 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
+ * Copyright (C) 2009 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
+ * Copyright (C) 2005-2009 The ScummVM project
+ *
+ * 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.
+ *
+ */
+
+//
+// EPOC UIQ MMP makefile project for ScummVM
+//
+
+// *** Definitions
+
+TARGET          ScummVM_A0000658.exe
+TARGETPATH      sys\bin
+TARGETTYPE      exe
+
+OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
+
+UID             0x100039ce 0xA0000658
+
+START RESOURCE  ScummVM_A0000658_reg.rss
+TARGETPATH              \private\10003a3f\apps
+END
+
+START RESOURCE  ScummVM_A0000658_loc.rss
+TARGETPATH              \Resource\Apps
+LANG                    SC
+END
+
+SOURCEPATH	.
+START RESOURCE  ScummVM_A0000658.rss
+HEADER
+TARGETPATH              \Resource\Apps
+LANG                    SC
+END
+
+EPOCSTACKSIZE	80000
+EPOCHEAPSIZE	5000000 64000000
+
+START BITMAP    ScummVM.mbm
+TARGETPATH              \Resource\Apps
+SOURCEPATH              ..\res
+// Source Color-depth Source-bitmap-list
+// c denotes whether the bitmap is a colour bitmap and the digits represent the
+// colour-depth of the bitmap and the bitmap mask respectively
+SOURCE  c24             ScummSmall.bmp
+SOURCE  8               ScummSmallMask.bmp
+SOURCE  c24             ScummLarge.bmp
+SOURCE  8               ScummLargeMask.bmp
+SOURCE  c24             ScummxLarge.bmp
+SOURCE  8               ScummxLargeMask.bmp
+END
+
+MACRO			UIQ
+MACRO			UIQ3
+
+ALWAYS_BUILD_AS_ARM
+
+//START_AUTO_MACROS_SLAVE//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_MACROS_SLAVE//
+
+// *** Static Libraries
+
+STATICLIBRARY esdl.lib
+
+// *** Include paths
+
+USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
+USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
+
+SYSTEMINCLUDE	\epoc32\include\ESDL
+SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE   \epoc32\include\libc
+SYSTEMINCLUDE   \epoc32\include
+SYSTEMINCLUDE   ..\src // for portdefs.h
+
+// *** SOURCE files
+
+SOURCEPATH ..\..\..\..\base
+
+//START_AUTO_OBJECTS_BASE_//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_OBJECTS_BASE_//
+
+SOURCEPATH ..\..\..\..\
+
+// backend EPOC/SDL/ESDL specific includes
+SOURCE backends\platform\sdl\events.cpp
+SOURCE backends\platform\sdl\graphics.cpp
+SOURCE backends\platform\sdl\sdl.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 gui\Key.cpp
+SOURCE gui\KeysDialog.cpp
+SOURCE gui\Actions.cpp
+SOURCE gui\Dialog.cpp
+
+// Special for graphics
+source graphics\iff.cpp
+
+// *** Dynamic Libraries
+LIBRARY cone.lib  eikcore.lib
+LIBRARY euser.lib apparc.lib fbscli.lib
+LIBRARY estlib.lib apgrfx.lib
+LIBRARY gdi.lib hal.lib bitgdi.lib
+LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
+LIBRARY qikctl.lib
+library qikcore.lib bafl.lib eikcoctl.lib
diff --git a/backends/platform/symbian/UIQ3/scummvm_A0000658_loc.rss b/backends/platform/symbian/UIQ3/scummvm_A0000658_loc.rss
new file mode 100644
index 0000000000..5a42fe2e13
--- /dev/null
+++ b/backends/platform/symbian/UIQ3/scummvm_A0000658_loc.rss
@@ -0,0 +1,59 @@
+#include <AppInfo.rh>
+#include <Qikon.hrh>
+
+// This file localise the applications icons and caption
+RESOURCE LOCALISABLE_APP_INFO
+	{
+	caption_and_icon =
+		{
+		CAPTION_AND_ICON_INFO
+			{
+			// The caption text is defined in the rls file
+			caption = "ScummVM Pt2";
+			// Icons are used to represent applications in the
+			// application launcher and application title bar.
+			// The number_of_icons value identifies how many icons
+			// that exist in the icon_file.
+			number_of_icons = 3;
+			// Using the application icons.
+			icon_file = "\\Resource\\Apps\\ScummVM.mbm";
+			}
+		};
+
+	view_list =
+		{
+		VIEW_DATA
+		{
+		uid = 0x10000001;
+		screen_mode = 0;
+		caption_and_icon = CAPTION_AND_ICON_INFO
+		{
+		};
+		},
+		VIEW_DATA
+		{
+		uid = 0x10000001;
+		screen_mode = EQikScreenModeLandscape;
+		caption_and_icon = CAPTION_AND_ICON_INFO
+		{
+		};
+		},
+		VIEW_DATA
+		{
+		uid = 0x10000001;
+		screen_mode = EQikScreenModeSmallPortrait;
+		caption_and_icon = CAPTION_AND_ICON_INFO
+		{
+		};
+		},
+		VIEW_DATA
+		{
+		uid = 0x10000001;
+		screen_mode = EQikScreenModeSmallPortrait;
+		caption_and_icon = CAPTION_AND_ICON_INFO
+		{
+		};
+		}
+	   };
+	}
+
diff --git a/backends/platform/symbian/UIQ3/scummvm_A0000658_reg.rss b/backends/platform/symbian/UIQ3/scummvm_A0000658_reg.rss
new file mode 100644
index 0000000000..2158406d0d
--- /dev/null
+++ b/backends/platform/symbian/UIQ3/scummvm_A0000658_reg.rss
@@ -0,0 +1,18 @@
+// All registration files need to #include appinfo.rh.
+#include <AppInfo.rh>
+
+// All registration files must define UID2, which is always
+// KUidAppRegistrationResourceFile, and UID3, which is the application's UID.
+UID2 KUidAppRegistrationResourceFile
+UID3 0xA0000658 // application UID
+
+// Registration file need to containo an APP_REGISTRATION_INFO resource that
+// minimally needs to provide the name of the application binary (using the
+// app_file statement).
+RESOURCE APP_REGISTRATION_INFO
+	{
+	app_file = "scummVM_A0000658"; // filename of application binary (minus extension)
+	// Specify the location of the localisable icon/caption definition file
+	localisable_resource_file = "\\Resource\\Apps\\ScummVM_A0000658_loc";
+	}
+
diff --git a/backends/platform/symbian/res/scummvm_A0000658.rss b/backends/platform/symbian/res/scummvm_A0000658.rss
new file mode 100644
index 0000000000..e1aad95432
--- /dev/null
+++ b/backends/platform/symbian/res/scummvm_A0000658.rss
@@ -0,0 +1,62 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
+ * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
+ * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
+ * Copyright (C) 2005-2006 The ScummVM project
+ *
+ * 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: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/symbian/res/scummvm.rss $
+ */
+
+// ScummVM.RSS
+
+NAME SCUM
+
+// Include definitions of resource STRUCTS used by this
+// resource script
+#include <eikon.rh>
+#include "..\src\Scummvm.hrh"
+// Include the standard Eikon resource ids
+#include <eikon.rsg>
+
+
+RESOURCE RSS_SIGNATURE
+	{
+	}
+
+RESOURCE TBUF16 { buf=""; }
+
+RESOURCE EIK_APP_INFO
+	{
+		menubar = r_scum_menubar;
+	}
+
+RESOURCE MENU_BAR r_scum_menubar                                         // *** Menu bar
+{
+      titles =
+    {
+		MENU_TITLE { menu_pane = r_scum_menu; txt = "ScummVM"; }
+	};
+}
+
+RESOURCE MENU_PANE r_scum_menu                                  // *** Submenu
+{
+	items =
+	{
+
+		MENU_ITEM{command = EEikCmdExit;txt = "Exit";}
+    };
+}