[Scummvm-git-logs] scummvm master -> 1783836a0f38845dbcc54f7bf58b3814e700f45b
sev-
sev at scummvm.org
Mon Jul 12 09:48:36 UTC 2021
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4c8ea82bb7 SYMBIAN: Enhancement for app build.
d48a14fd08 SYMBIAN: Add right source_patcher.py.
f992ae017b SYMBIAN: Fix exception in thread function for piper.py and build_apps.py
1783836a0f SYMBIAN: symbian_builder can apply single line patches.
Commit: 4c8ea82bb77b6b1e478b71ad6da12729ab7ec77a
https://github.com/scummvm/scummvm/commit/4c8ea82bb77b6b1e478b71ad6da12729ab7ec77a
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2021-07-12T11:48:29+02:00
Commit Message:
SYMBIAN: Enhancement for app build.
Add missed library dependency.
Resolve linker errors compiling certain files with exe
Added generator for installer builder
Added source patcher. It make abld build system happy if these patches break other ports and therefore can't accepted. Currently fixes "..." in macros arguments.
Delete obsolete files.
Changed paths:
A backends/platform/symbian/symbian_builder/pkg_generator.py
A backends/platform/symbian/symbian_builder/source_patcher.py
R backends/platform/symbian/S60v3/ScummVM1.pkg
R backends/platform/symbian/S60v3/ScummVM2.pkg
R backends/platform/symbian/S60v3/ScummVM3.pkg
R backends/platform/symbian/S60v3/ScummVM4.pkg
R backends/platform/symbian/S60v3/ScummVM5.pkg
R backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
R backends/platform/symbian/S60v3/ScummVM_Loc.rss
R backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
R backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
R backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
R backends/platform/symbian/S60v3/scummvm_A0000658_loc.rss
R backends/platform/symbian/S60v3/scummvm_A0000658_reg.rss
R backends/platform/symbian/S60v3/scummvm_base.mmp
R backends/platform/symbian/S60v3/scummvm_reg.rss
backends/platform/symbian/S60v3/build_app_config.mmh
backends/platform/symbian/src/portdefs.h
backends/platform/symbian/symbian_builder/__init__.py
backends/platform/symbian/symbian_builder/build_apps.py
backends/platform/symbian/symbian_builder/common_names.py
backends/platform/symbian/symbian_builder/create_installers.py
backends/platform/symbian/symbian_builder/parse_gamedata.py
backends/platform/symbian/symbian_builder/piper.py
backends/platform/symbian/symbian_builder/scummvm_hrh.py
diff --git a/backends/platform/symbian/S60v3/ScummVM1.pkg b/backends/platform/symbian/S60v3/ScummVM1.pkg
deleted file mode 100644
index 69cf353024..0000000000
--- a/backends/platform/symbian/S60v3/ScummVM1.pkg
+++ /dev/null
@@ -1,99 +0,0 @@
-; ScummVM - Graphic Adventure Engine
-; Copyright (C) 2020 Stryzhniou Fiodar
-;
-; 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.
-;
-;
-
-;;;
-;;; ScummVM .PKG file for .SIS generation
-;;;
-
-;Language - standard language definitions
-&EN
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]).
-; List must correspond to list of languages specified elsewhere in the .pkg
-%{"ScummVM"}
-; The non-localised, globally unique vendor name (mandatory)
-:"ScummVM"
-
-; UID is the app's UID
-#{"ScummVM S60v3"},(0xA0000657),2,02,0
-;#{"ScummVM S60v3"},(0xAA000657),2,02,0
-
-;Supports Series 60 v 3.0
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-;Supports Series 60 v 5.0
-[0x1028315F], 0, 0, 0, {"Series60ProductID"}
-
-; Launcher, Application, AIF & Resource file
-"$(EPOCROOT)epoc32\release\gcce\urel\ScummVM1.exe" - "!:\sys\bin\ScummVM1.exe"
-"$(EPOCROOT)epoc32\data\z\resource\apps\ScummVM1.rsc" - "!:\resource\apps\ScummVM1.rsc"
-"$(EPOCROOT)epoc32\Data\Z\resource\apps\ScummVM1_loc.rsc"- "!:\resource\apps\ScummVM1_loc.rsc"
-"$(EPOCROOT)epoc32\data\z\private\10003a3f\apps\ScummVM1_reg.rsc" -
- "!:\private\10003a3f\import\apps\ScummVM1_reg.rsc"
-
-"$(EPOCROOT)epoc32\data\Z\resource\APPS\ScummVM.mif" - "!:\resource\apps\ScummVM.mif"
-
-; Scummvm Documentation
-"..\..\..\..\COPYRIGHT" - "!:\data\scummvm\COPYRIGHT", FT, TC
-"..\..\..\..\COPYING" - "!:\data\scummvm\COPYING", FT, TC
-"..\..\..\..\COPYING.BSD" - "!:\data\scummvm\COPYING.BSD"
-"..\..\..\..\COPYING.LGPL" - "!:\data\scummvm\COPYING.LGPL"
-"..\README" - "!:\data\scummvm\SYMBIAN_README", FT, TC
-"..\BELARUS" - "!:\data\scummvm\BELARUS", FT, TC
-"..\HUMBLE" - "!:\data\scummvm\HUMBLE", FT, TC
-"..\..\..\..\AUTHORS" - "!:\data\scummvm\AUTHORS"
-"..\..\..\..\README.md" - "!:\data\scummvm\README.md"
-"..\..\..\..\NEWS.md" - "!:\data\scummvm\NEWS.md"
-
-; Scummvm help
-"..\help\ScummVM.hlp" - "!:\resource\help\ScummVM.hlp"
-
-;dictionary used by several games
-"..\..\..\..\dists\pred.dic" - "c:\data\scummvm\pred.dic"
-;set of free TTF fonts used by Glk, ZVision, Wintermute engines and GUI
-"..\..\..\..\dists\engine-data\fonts.dat" - "c:\data\scummvm\fonts.dat"
-;used by Director, MacVenture and WAGE engines.
-"..\..\..\..\dists\engine-data\macgui.dat" - "c:\data\scummvm\macgui.dat"
-;localization
-"..\..\..\..\gui\themes\translations.dat" - "c:\data\scummvm\translations.dat"
-
-;Themes
-"..\..\..\..\gui\themes\scummclassic.zip" - "c:\data\scummvm\scummclassic.zip"
-"..\..\..\..\gui\themes\scummmodern.zip" - "c:\data\scummvm\scummmodern.zip"
-"..\..\..\..\gui\themes\scummremastered.zip" - "c:\data\scummvm\scummremastered.zip"
-
-;Screen keyboard
-"..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\data\scummvm\vkeybd_default.zip"
-"..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\data\scummvm\vkeybd_small.zip"
-
-; Config/log files: 'empty' will automagically be removed on uninstall
-""- "c:\data\scummvm\scummvm.ini",FILENULL
-""- "c:\data\scummvm\scummvm.stdout.txt",FILENULL
-""- "c:\data\scummvm\scummvm.stderr.txt",FILENULL
-""- "c:\data\scummvm\sdl.ini",FILENULL
-
-;IF NOT exists("!:\data\scummvm\")
-;"..\..\..\..\"-"!:\data\scummvm\"
-;endif
-
-;IF NOT exists()
-;endif
diff --git a/backends/platform/symbian/S60v3/ScummVM2.pkg b/backends/platform/symbian/S60v3/ScummVM2.pkg
deleted file mode 100644
index e1688012db..0000000000
--- a/backends/platform/symbian/S60v3/ScummVM2.pkg
+++ /dev/null
@@ -1,76 +0,0 @@
-; ScummVM - Graphic Adventure Engine
-; Copyright (C) 2020 Stryzhniou Fiodar
-;
-; 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.
-;
-;
-
-;;;
-;;; ScummVM .PKG file for .SIS generation
-;;;
-
-;Language - standard language definitions
-&EN
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]).
-; List must correspond to list of languages specified elsewhere in the .pkg
-%{"ScummVM"}
-; The non-localised, globally unique vendor name (mandatory)
-:"ScummVM"
-
-; UID is the app's UID
-#{"ScummVM S60v3"},(0xA0000658),2,02,0
-;#{"ScummVM S60v3"},(0xAA000658),2,02,0
-
-;Supports Series 60 v 3.0
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-;Supports Series 60 v 5.0
-[0x1028315F], 0, 0, 0, {"Series60ProductID"}
-
-;ScummVM1 dependency
-(0xA0000657), 2, 2, 0 ~ 2, 2, 0, {"ScummVM1.sisx"}
-
-; Launcher, Application, AIF & Resource file
-"$(EPOCROOT)epoc32\release\gcce\urel\ScummVM2.exe" - "!:\sys\bin\ScummVM2.exe"
-"$(EPOCROOT)epoc32\data\z\resource\apps\ScummVM2.rsc" - "!:\resource\apps\ScummVM2.rsc"
-"$(EPOCROOT)epoc32\Data\Z\resource\apps\ScummVM2_loc.rsc"- "!:\resource\apps\ScummVM2_loc.rsc"
-"$(EPOCROOT)epoc32\data\z\private\10003a3f\apps\ScummVM2_reg.rsc" -
- "!:\private\10003a3f\import\apps\ScummVM2_reg.rsc"
-
-; Launcher, Application, AIF & Resource file
-"$(EPOCROOT)epoc32\release\gcce\urel\ScummVM3.exe" - "!:\sys\bin\ScummVM3.exe"
-"$(EPOCROOT)epoc32\data\z\resource\apps\ScummVM3.rsc" - "!:\resource\apps\ScummVM3.rsc"
-"$(EPOCROOT)epoc32\Data\Z\resource\apps\ScummVM3_loc.rsc"- "!:\resource\apps\ScummVM3_loc.rsc"
-"$(EPOCROOT)epoc32\data\z\private\10003a3f\apps\ScummVM3_reg.rsc" -
- "!:\private\10003a3f\import\apps\ScummVM3_reg.rsc"
-
-; Scummvm Documentation
-"..\..\..\..\COPYRIGHT"-"", FT, TC
-"..\..\..\..\COPYING"-"", FT, TC
-"..\README"-"", FT, TC
-"..\BELARUS"-"", FT, TC
-"..\HUMBLE"-"", FT, TC
-
-
-;IF NOT exists("!:\data\scummvm\")
-;"..\..\..\..\"-"!:\data\scummvm\"
-;endif
-
-;IF NOT exists()
-;endif
diff --git a/backends/platform/symbian/S60v3/ScummVM3.pkg b/backends/platform/symbian/S60v3/ScummVM3.pkg
deleted file mode 100644
index 41c7a44391..0000000000
--- a/backends/platform/symbian/S60v3/ScummVM3.pkg
+++ /dev/null
@@ -1,70 +0,0 @@
-; ScummVM - Graphic Adventure Engine
-; Copyright (C) 2020 Stryzhniou Fiodar
-;
-; 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.
-;
-;
-
-;;;
-;;; ScummVM .PKG file for .SIS generation
-;;;
-
-;Language - standard language definitions
-&EN
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]).
-; List must correspond to list of languages specified elsewhere in the .pkg
-%{"ScummVM"}
-; The non-localised, globally unique vendor name (mandatory)
-:"ScummVM"
-
-; UID is the app's UID
-#{"ScummVM S60v3"},(0x2006FE7C),2,02,0
-
-;Supports Series 60 v 3.0
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-;Supports Series 60 v 5.0
-[0x1028315F], 0, 0, 0, {"Series60ProductID"}
-
-;ScummVM1 dependency
-(0xA0000657), 2, 2, 0 ~ 2, 2, 0, {"ScummVM1.sisx"}
-
-; Launcher, Application, AIF & Resource file
-"$(EPOCROOT)epoc32\release\gcce\urel\ScummVM3.exe" - "!:\sys\bin\ScummVM3.exe"
-"$(EPOCROOT)epoc32\data\z\resource\apps\ScummVM3.rsc" - "!:\resource\apps\ScummVM3.rsc"
-"$(EPOCROOT)epoc32\Data\Z\resource\apps\ScummVM3_loc.rsc"- "!:\resource\apps\ScummVM3_loc.rsc"
-"$(EPOCROOT)epoc32\data\z\private\10003a3f\apps\ScummVM3_reg.rsc" -
- "!:\private\10003a3f\import\apps\ScummVM3_reg.rsc"
-
-
-; Scummvm Documentation
-"..\..\..\..\COPYRIGHT"-"", FT, TC
-"..\..\..\..\COPYING"-"", FT, TC
-"..\README"-"", FT, TC
-"..\BELARUS"-"", FT, TC
-"..\HUMBLE"-"", FT, TC
-
-
-;IF NOT exists("!:\data\scummvm\")
-;"..\..\..\..\"-"!:\data\scummvm\"
-;endif
-
-;IF NOT exists()
-;endif
-
diff --git a/backends/platform/symbian/S60v3/ScummVM4.pkg b/backends/platform/symbian/S60v3/ScummVM4.pkg
deleted file mode 100644
index 5361c526f3..0000000000
--- a/backends/platform/symbian/S60v3/ScummVM4.pkg
+++ /dev/null
@@ -1,76 +0,0 @@
-; ScummVM - Graphic Adventure Engine
-; Copyright (C) 2020 Stryzhniou Fiodar
-;
-; 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.
-;
-;
-
-;;;
-;;; ScummVM .PKG file for .SIS generation
-;;;
-
-;Language - standard language definitions
-&EN
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]).
-; List must correspond to list of languages specified elsewhere in the .pkg
-%{"ScummVM"}
-; The non-localised, globally unique vendor name (mandatory)
-:"ScummVM"
-
-; UID is the app's UID
-#{"ScummVM S60v3"},(0x2006FE7D),2,02,0
-
-;Supports Series 60 v 3.0
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-;Supports Series 60 v 5.0
-[0x1028315F], 0, 0, 0, {"Series60ProductID"}
-
-;ScummVM1 dependency
-(0xA0000657), 2, 2, 0 ~ 2, 2, 0, {"ScummVM1.sisx"}
-
-; Launcher, Application, AIF & Resource file
-"$(EPOCROOT)epoc32\release\gcce\urel\ScummVM4.exe" - "!:\sys\bin\ScummVM4.exe"
-"$(EPOCROOT)epoc32\data\z\resource\apps\ScummVM4.rsc" - "!:\resource\apps\ScummVM4.rsc"
-"$(EPOCROOT)epoc32\Data\Z\resource\apps\ScummVM4_loc.rsc"- "!:\resource\apps\ScummVM4_loc.rsc"
-"$(EPOCROOT)epoc32\data\z\private\10003a3f\apps\ScummVM4_reg.rsc" -
- "!:\private\10003a3f\import\apps\ScummVM4_reg.rsc"
-
-; Launcher, Application, AIF & Resource file
-"$(EPOCROOT)epoc32\release\gcce\urel\ScummVM5.exe" - "!:\sys\bin\ScummVM5.exe"
-"$(EPOCROOT)epoc32\data\z\resource\apps\ScummVM5.rsc" - "!:\resource\apps\ScummVM5.rsc"
-"$(EPOCROOT)epoc32\Data\Z\resource\apps\ScummVM5_loc.rsc"- "!:\resource\apps\ScummVM5_loc.rsc"
-"$(EPOCROOT)epoc32\data\z\private\10003a3f\apps\ScummVM5_reg.rsc" -
- "!:\private\10003a3f\import\apps\ScummVM5_reg.rsc"
-
-
-; Scummvm Documentation
-"..\..\..\..\COPYRIGHT"-"", FT, TC
-"..\..\..\..\COPYING"-"", FT, TC
-"..\README"-"", FT, TC
-"..\BELARUS"-"", FT, TC
-"..\HUMBLE"-"", FT, TC
-
-
-;IF NOT exists("!:\data\scummvm\")
-;"..\..\..\..\"-"!:\data\scummvm\"
-;endif
-
-;IF NOT exists()
-;endif
diff --git a/backends/platform/symbian/S60v3/ScummVM5.pkg b/backends/platform/symbian/S60v3/ScummVM5.pkg
deleted file mode 100644
index 7f3ee9da44..0000000000
--- a/backends/platform/symbian/S60v3/ScummVM5.pkg
+++ /dev/null
@@ -1,69 +0,0 @@
-; ScummVM - Graphic Adventure Engine
-; Copyright (C) 2020 Stryzhniou Fiodar
-;
-; 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.
-;
-;
-
-;;;
-;;; ScummVM .PKG file for .SIS generation
-;;;
-
-;Language - standard language definitions
-&EN
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]).
-; List must correspond to list of languages specified elsewhere in the .pkg
-%{"ScummVM"}
-; The non-localised, globally unique vendor name (mandatory)
-:"ScummVM"
-
-; UID is the app's UID
-#{"ScummVM S60v3"},(0x2006FE7E), 2,02,0
-
-;Supports Series 60 v 3.0
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-;Supports Series 60 v 5.0
-[0x1028315F], 0, 0, 0, {"Series60ProductID"}
-
-;ScummVM1 dependency
-(0xA0000657), 2, 2, 0 ~ 2, 2, 0, {"ScummVM1.sisx"}
-
-; Launcher, Application, AIF & Resource file
-"$(EPOCROOT)epoc32\release\gcce\urel\ScummVM5.exe" - "!:\sys\bin\ScummVM5.exe"
-"$(EPOCROOT)epoc32\data\z\resource\apps\ScummVM5.rsc" - "!:\resource\apps\ScummVM5.rsc"
-"$(EPOCROOT)epoc32\Data\Z\resource\apps\ScummVM5_loc.rsc"- "!:\resource\apps\ScummVM5_loc.rsc"
-"$(EPOCROOT)epoc32\data\z\private\10003a3f\apps\ScummVM5_reg.rsc" -
- "!:\private\10003a3f\import\apps\ScummVM5_reg.rsc"
-
-
-; Scummvm Documentation
-"..\..\..\..\COPYRIGHT"-"", FT, TC
-"..\..\..\..\COPYING"-"", FT, TC
-"..\README"-"", FT, TC
-"..\BELARUS"-"", FT, TC
-"..\HUMBLE"-"", FT, TC
-
-
-;IF NOT exists("!:\data\scummvm\")
-;"..\..\..\..\"-"!:\data\scummvm\"
-;endif
-
-;IF NOT exists()
-;endif
diff --git a/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
deleted file mode 100644
index e5e0b56e32..0000000000
--- a/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
+++ /dev/null
@@ -1,153 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
- * Copyright (C) 2003-2014 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
- * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2013-2014 Fedor Strizhniou Additional library porting, engine support, help files etc
- * Copyright (C) 2005-2017 The ScummVM Team
- *
- * 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.
- *
- */
-
-//
-// 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
-// fixes error "section .data loaded at [...] overlaps section .text loaded at [...]"
-LINKEROPTION GCCE -Tdata 0xAA00000 --gc-sections --strip-all
-
-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 128000000
-
-START BITMAP ScummVM.mbm
-TARGETPATH \Resource\Apps
-SOURCEPATH ..\res
-// Source Color-depth Source-bitmap-list
-// c denotes whether the bitmap is a color bitmap and the digits represent the
-// color-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
-MACRO SECOND_EXE
-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 ..\..\..\.. ..\..\..\..\gui ..\..\..\..\engines
-USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\audio
-
-SYSTEMINCLUDE \epoc32\include\freetype
-SYSTEMINCLUDE \epoc32\include\mpeg2dec
-SYSTEMINCLUDE \epoc32\include\jpeg
-SYSTEMINCLUDE \epoc32\include\png
-SYSTEMINCLUDE \epoc32\include\ESDL
-SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE \epoc32\include\libc
-SYSTEMINCLUDE \epoc32\include\theora
-SYSTEMINCLUDE \epoc32\include\tremor
-SYSTEMINCLUDE \epoc32\include
-SYSTEMINCLUDE \epoc32\include\mw
-SYSTEMINCLUDE \epoc32\include\platform
-SYSTEMINCLUDE \epoc32\include\platform\mw
-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\sdl.cpp
-SOURCE backends\platform\sdl\sdl-window.cpp
-SOURCE backends\audiocd\sdl\sdl-audiocd.cpp
-SOURCE backends\audiocd\default\default-audiocd.cpp
-SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\fs\symbian\symbian-fs-factory.cpp
-SOURCE backends\platform\symbian\src\SymbianOS.cpp
-SOURCE backends\platform\symbian\src\ScummApp.cpp
-SOURCE backends\platform\symbian\src\SymbianMain.cpp
-
-SOURCE gui\Dialog.cpp
-
-// Common error
-SOURCE common\error.cpp
-SOURCE common\quicktime.cpp
-
-// Special for graphics
-SOURCE backends\graphics\surfacesdl\surfacesdl-graphics.cpp
-SOURCE engines\obsolete.cpp
-
-// *** Dynamic Libraries
-LIBRARY cone.lib eikcore.lib euser.lib
-LIBRARY apparc.lib fbscli.lib estlib.lib
-LIBRARY apgrfx.lib gdi.lib hal.lib bitgdi.lib
-LIBRARY esock.lib mediaclientaudiostream.lib
-LIBRARY efsrv.lib ws32.lib avkon.lib bafl.lib
-LIBRARY remconcoreapi.lib remconinterfacebase.lib
-
-CAPABILITY LocalServices ReadUserData
-MACRO SDL_BACKEND
diff --git a/backends/platform/symbian/S60v3/ScummVM_Loc.rss b/backends/platform/symbian/S60v3/ScummVM_Loc.rss
deleted file mode 100644
index 7247ce1207..0000000000
--- a/backends/platform/symbian/S60v3/ScummVM_Loc.rss
+++ /dev/null
@@ -1,21 +0,0 @@
-#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 1";
- // 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_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
deleted file mode 100644
index ac0e2216ed..0000000000
--- a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
+++ /dev/null
@@ -1,154 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
- * Copyright (C) 2003-2014 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
- * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2013-2014 Fedor Strizhniou Additional library porting, engine support, help files etc
- * Copyright (C) 2005-2017 The ScummVM Team
- *
- * 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.
- *
- */
-
-//
-// EPOC S60 MMP makefile project for ScummVM
-//
-
-// *** Definitions
-
-TARGET ScummVM.exe
-TARGETPATH sys\bin
-TARGETTYPE exe
-OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-
-// fixes error "section .data loaded at [...] overlaps section .text loaded at [...]"
-LINKEROPTION GCCE -Tdata 0xAA00000 --gc-sections --strip-all
-
-UID 0x100039ce 0xA0000657
-
-START RESOURCE ScummVM_reg.rss
-TARGETPATH \private\10003a3f\apps
-END
-
-START RESOURCE ScummVM_loc.rss
-TARGETPATH \Resource\Apps
-LANG SC
-END
-
-SOURCEPATH ..\res
-START RESOURCE ScummVM.rss
-HEADER
-TARGETPATH \Resource\Apps
-LANG SC
-END
-
-EPOCSTACKSIZE 80000
-EPOCHEAPSIZE 5000000 128000000
-
-START BITMAP ScummVM.mbm
-TARGETPATH \Resource\Apps
-SOURCEPATH ..\res
-// Source Color-depth Source-bitmap-list
-// c denotes whether the bitmap is a color bitmap and the digits represent the
-// color-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 ..\..\..\.. ..\..\..\..\gui ..\..\..\..\engines
-USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\audio
-
-SYSTEMINCLUDE \epoc32\include\freetype
-SYSTEMINCLUDE \epoc32\include\mpeg2dec
-SYSTEMINCLUDE \epoc32\include\jpeg
-SYSTEMINCLUDE \epoc32\include\png
-SYSTEMINCLUDE \epoc32\include\ESDL
-SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE \epoc32\include\libc
-SYSTEMINCLUDE \epoc32\include\theora
-SYSTEMINCLUDE \epoc32\include\tremor
-SYSTEMINCLUDE \epoc32\include
-SYSTEMINCLUDE \epoc32\include\mw
-SYSTEMINCLUDE \epoc32\include\platform
-SYSTEMINCLUDE \epoc32\include\platform\mw
-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\sdl.cpp
-SOURCE backends\platform\sdl\sdl-window.cpp
-SOURCE backends\audiocd\sdl\sdl-audiocd.cpp
-SOURCE backends\audiocd\default\default-audiocd.cpp
-SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\fs\symbian\symbian-fs-factory.cpp
-SOURCE backends\platform\symbian\src\SymbianOS.cpp
-SOURCE backends\platform\symbian\src\ScummApp.cpp
-SOURCE backends\platform\symbian\src\SymbianMain.cpp
-
-SOURCE gui\Dialog.cpp
-
-// Common error
-SOURCE common\error.cpp
-SOURCE common\quicktime.cpp
-
-// Special for graphics
-SOURCE backends\graphics\surfacesdl\surfacesdl-graphics.cpp
-SOURCE engines\obsolete.cpp
-
-// *** Dynamic Libraries
-LIBRARY cone.lib eikcore.lib euser.lib
-LIBRARY apparc.lib fbscli.lib estlib.lib
-LIBRARY apgrfx.lib gdi.lib hal.lib bitgdi.lib
-LIBRARY esock.lib mediaclientaudiostream.lib
-LIBRARY efsrv.lib ws32.lib avkon.lib bafl.lib
-LIBRARY remconcoreapi.lib remconinterfacebase.lib
-
-CAPABILITY LocalServices ReadUserData
-MACRO SDL_BACKEND
diff --git a/backends/platform/symbian/S60v3/build_app_config.mmh b/backends/platform/symbian/S60v3/build_app_config.mmh
index 94b43adab9..fae468097c 100644
--- a/backends/platform/symbian/S60v3/build_app_config.mmh
+++ b/backends/platform/symbian/S60v3/build_app_config.mmh
@@ -40,6 +40,8 @@ CAPABILITY LocalServices ReadUserData
// *** Static Libraries
STATICLIBRARY scummvm_base.lib
+STATICLIBRARY scummvm_codecs.lib
+STATICLIBRARY scummvm_lua.lib
STATICLIBRARY liba52.lib
STATICLIBRARY libFAAD2.lib
STATICLIBRARY libflacdec.lib
@@ -52,6 +54,7 @@ STATICLIBRARY theora.lib
STATICLIBRARY libtremor.lib
STATICLIBRARY zlib.lib
STATICLIBRARY esdl.lib
+STATICLIBRARY openlibm.lib
// *** SOURCE files
@@ -95,3 +98,11 @@ LIBRARY remconcoreapi.lib remconinterfacebase.lib apmime.lib drtaeabi.lib // li
SOURCEPATH ..\..\sdl
SOURCE sdl-window.cpp
+//These files compiled if particular engines or features enabled.
+//So we compile them with app build.
+SOURCEPATH ..\..\..\..\video
+SOURCE coktel_decoder.cpp //GOB and SCI32 games
+
+SOURCEPATH ..\..\..\..\graphics
+SOURCE sjis.cpp //KYRA, SCI, SCUMM, SAGA and AGOS
+SOURCE renderer.cpp //USE_TINYGL
diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
deleted file mode 100644
index 0ba151d177..0000000000
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ /dev/null
@@ -1,92 +0,0 @@
-;
-; 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.
-;
-;
-
-;;;
-;;; ScummVM .PKG file for .SIS gegeration
-;;;
-
-;Language - standard language definitions
-&EN
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]).
-; List must correspond to list of languages specified elsewhere in the .pkg
-%{"ScummVM"}
-; The non-localised, globally unique vendor name (mandatory)
-:"ScummVM"
-
-; UID is the app's UID
-#{"ScummVM S60v3"},(0xA0000657),2,00,0
-
-;Supports Series 60 v 3.0
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-;Supports Series 60 v 5.0
-[0x1028315F], 0, 0, 0, {"Series60ProductID"}
-
-; Launcher, Application, AIF & Resource file
-"\epoc32\release\gcce\urel\ScummVM.exe"- "!:\sys\bin\ScummVM.exe"
-"\epoc32\data\z\resource\apps\ScummVM.rsc"- "!:\resource\apps\ScummVM.rsc"
-"\epoc32\Data\Z\resource\apps\scummvm_loc.rsc"- "!:\resource\apps\scummvm_loc.rsc"
-"\epoc32\data\Z\resource\APPS\scummvm.MIF"- "!:\resource\apps\scummvm.MIF"
-"\epoc32\data\z\private\10003a3f\apps\scummvm_reg.rsc"-"!:\private\10003a3f\import\apps\scummvm_reg.rsc"
-
-"..\..\..\..\dists\pred.dic"-"c:\data\scummvm\pred.dic"
-
-; Scummvm Documentation
-"..\..\..\..\COPYRIGHT"-"!:\resource\apps\scummvm\COPYRIGHT", FT, TC
-"..\..\..\..\COPYING"-"!:\resource\apps\scummvm\COPYING", FT, TC
-"..\README"-"!:\resource\apps\scummvm\SYMBIAN_README", FT, TC
-"..\..\..\..\AUTHORS"-"!:\resource\apps\scummvm\AUTHORS"
-"..\..\..\..\README"-"!:\resource\apps\scummvm\README"
-"..\..\..\..\NEWS"-"!:\resource\apps\scummvm\NEWS"
-
-; Scummvm help
-"..\help\ScummVM.hlp"-"!:\resource\help\ScummVM.hlp"
-
-; Common datafiles needed for some games
-"..\..\..\..\dists\engine-data\drascula.dat"-"c:\data\scummvm\drascula.dat"
-"..\..\..\..\dists\engine-data\encoding.dat"-"c:\system\apps\scummvm\encoding.dat"
-"..\..\..\..\dists\engine-data\fonts.dat"-"c:\data\scummvm\fonts.dat"
-"..\..\..\..\dists\engine-data\hadesch_translations.dat"-"c:\data\scummvm\hadesch_translations.dat"
-"..\..\..\..\dists\engine-data\hugo.dat"-"c:\data\scummvm\hugo.dat"
-"..\..\..\..\dists\engine-data\kyra.dat"-"c:\data\scummvm\kyra.dat"
-"..\..\..\..\dists\engine-data\lure.dat"-"c:\data\scummvm\lure.dat"
-"..\..\..\..\dists\engine-data\mort.dat"-"c:\data\scummvm\mort.dat"
-"..\..\..\..\dists\engine-data\neverhood.dat"-"c:\data\scummvm\neverhood.dat"
-"..\..\..\..\dists\engine-data\queen.tbl"-"c:\data\scummvm\queen.tbl"
-"..\..\..\..\dists\engine-data\sky.cpt"-"c:\data\scummvm\sky.cpt"
-"..\..\..\..\dists\engine-data\teenagent.dat"-"c:\data\scummvm\teenagent.dat"
-"..\..\..\..\dists\engine-data\tony.dat"-"c:\data\scummvm\tony.dat"
-"..\..\..\..\dists\engine-data\toon.dat"-"c:\data\scummvm\toon.dat"
-"..\..\..\..\dists\engine-data\wintermute.zip"-"c:\data\scummvm\wintermute.zip"
-"..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\data\scummvm\vkeybd_default.zip"
-"..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\data\scummvm\vkeybd_small.zip"
-"..\..\..\..\gui\themes\translations.dat"-"c:\data\scummvm\translations.dat"
-"..\..\..\..\gui\themes\scummmodern.zip"-"c:\data\scummvm\scummmodern.zip"
-"..\..\..\..\gui\themes\scummremastered.zip"-"c:\data\scummvm\scummremastered.zip"
-
-; Config/log files: 'empty' will automagically be removed on uninstall
-""-"c:\data\scummvm\scummvm.ini",FILENULL
-""-"c:\data\scummvm\scummvm.stdout.txt",FILENULL
-""-"c:\data\scummvm\scummvm.stderr.txt",FILENULL
-""-"c:\data\scummvm\sdl.ini",FILENULL
-
-; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
-; It will remove the config file, std***.txt files & dirs on uninstall.
diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
deleted file mode 100644
index b846f6ada4..0000000000
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
+++ /dev/null
@@ -1,97 +0,0 @@
-;
-; 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.
-;
-;
-
-;;;
-;;; ScummVM .PKG file for .SIS gegeration
-;;;
-
-;Language - standard language definitions
-&EN
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]).
-; List must correspond to list of languages specified elsewhere in the .pkg
-%{"ScummVM"}
-; The non-localised, globally unique vendor name (mandatory)
-:"ScummVM"
-
-; UID is the app's UID
-#{"ScummVM S60v3"},(0xA0000657),1,80,0
-
-;Supports Series 60 v 3.0
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-;Supports Series 60 v 5.0
-[0x1028315F], 0, 0, 0, {"Series60ProductID"}
-
-; Launcher, Application, AIF & Resource file
-"\epoc32\release\gcce\urel\ScummVM.exe"- "!:\sys\bin\ScummVM.exe"
-"\epoc32\data\z\resource\apps\ScummVM.rsc"- "!:\resource\apps\ScummVM.rsc"
-"\epoc32\Data\Z\resource\apps\scummvm_loc.rsc"- "!:\resource\apps\scummvm_loc.rsc"
-"\epoc32\data\Z\resource\APPS\scummvm.MIF"- "!:\resource\apps\scummvm.MIF"
-"\epoc32\data\z\private\10003a3f\apps\scummvm_reg.rsc"-"!:\private\10003a3f\import\apps\scummvm_reg.rsc"
-
-"\epoc32\release\gcce\urel\ScummVM_A0000658.exe"- "!:\sys\bin\ScummVM_A0000658.exe"
-"\epoc32\data\z\resource\apps\ScummVM_A0000658.rsc"- "!:\resource\apps\ScummVM_A0000658.rsc"
-"\epoc32\Data\Z\resource\apps\ScummVM_A0000658_loc.rsc"- "!:\resource\apps\ScummVM_A0000658_loc.rsc"
-"\epoc32\data\z\private\10003a3f\apps\scummvm_A0000658_reg.rsc"-"!:\private\10003a3f\import\apps\scummvm_A0000658_reg.rsc"
-
-"..\..\..\..\dists\pred.dic"-"c:\data\scummvm\pred.dic"
-
-; Scummvm Documentation
-"..\..\..\..\COPYRIGHT"-"!:\resource\apps\scummvm\COPYRIGHT", FT, TC
-"..\..\..\..\COPYING"-"!:\resource\apps\scummvm\COPYING", FT, TC
-"..\README"-"!:\resource\apps\scummvm\SYMBIAN_README", FT, TC
-"..\..\..\..\AUTHORS"-"!:\resource\apps\scummvm\AUTHORS"
-"..\..\..\..\README"-"!:\resource\apps\scummvm\README"
-"..\..\..\..\NEWS"-"!:\resource\apps\scummvm\NEWS"
-
-; Scummvm help
-"..\help\ScummVM.hlp"-"!:\resource\help\ScummVM.hlp"
-
-; Common datafiles needed for some games
-"..\..\..\..\dists\engine-data\drascula.dat"-"c:\data\scummvm\drascula.dat"
-"..\..\..\..\dists\engine-data\encoding.dat"-"c:\data\scummvm\encoding.dat"
-"..\..\..\..\dists\engine-data\fonts.dat"-"c:\data\scummvm\fonts.dat"
-"..\..\..\..\dists\engine-data\hadesch_translations.dat"-"c:\data\scummvm\hadesch_translations.dat"
-"..\..\..\..\dists\engine-data\hugo.dat"-"c:\data\scummvm\hugo.dat"
-"..\..\..\..\dists\engine-data\kyra.dat"-"c:\data\scummvm\kyra.dat"
-"..\..\..\..\dists\engine-data\lure.dat"-"c:\data\scummvm\lure.dat"
-"..\..\..\..\dists\engine-data\mort.dat"-"c:\data\scummvm\mort.dat"
-"..\..\..\..\dists\engine-data\neverhood.dat"-"c:\data\scummvm\neverhood.dat"
-"..\..\..\..\dists\engine-data\queen.tbl"-"c:\data\scummvm\queen.tbl"
-"..\..\..\..\dists\engine-data\sky.cpt"-"c:\data\scummvm\sky.cpt"
-"..\..\..\..\dists\engine-data\teenagent.dat"-"c:\data\scummvm\teenagent.dat"
-"..\..\..\..\dists\engine-data\tony.dat"-"c:\data\scummvm\tony.dat"
-"..\..\..\..\dists\engine-data\toon.dat"-"c:\data\scummvm\toon.dat"
-"..\..\..\..\dists\engine-data\wintermute.zip"-"c:\data\scummvm\wintermute.zip"
-"..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\data\scummvm\vkeybd_default.zip"
-"..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\data\scummvm\vkeybd_small.zip"
-"..\..\..\..\gui\themes\translations.dat"-"c:\data\scummvm\translations.dat"
-"..\..\..\..\gui\themes\scummmodern.zip"-"c:\data\scummvm\scummmodern.zip"
-"..\..\..\..\gui\themes\scummremastered.zip"-"c:\data\scummvm\scummremastered.zip"
-
-; Config/log files: 'empty' will automagically be removed on uninstall
-""-"c:\data\scummvm\scummvm.ini",FILENULL
-""-"c:\data\scummvm\scummvm.stdout.txt",FILENULL
-""-"c:\data\scummvm\scummvm.stderr.txt",FILENULL
-""-"c:\data\scummvm\sdl.ini",FILENULL
-
-; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
-; It will remove the config file, std***.txt files & dirs on uninstall.
diff --git a/backends/platform/symbian/S60v3/scummvm_A0000658_loc.rss b/backends/platform/symbian/S60v3/scummvm_A0000658_loc.rss
deleted file mode 100644
index 849e0b017f..0000000000
--- a/backends/platform/symbian/S60v3/scummvm_A0000658_loc.rss
+++ /dev/null
@@ -1,21 +0,0 @@
-#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 2";
- // 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
deleted file mode 100644
index 031be012cd..0000000000
--- a/backends/platform/symbian/S60v3/scummvm_A0000658_reg.rss
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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/S60v3/scummvm_base.mmp b/backends/platform/symbian/S60v3/scummvm_base.mmp
deleted file mode 100644
index 86dc98030c..0000000000
--- a/backends/platform/symbian/S60v3/scummvm_base.mmp
+++ /dev/null
@@ -1,407 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- * Copyright (C) 2020 Stryzhniou Fiodar
- *
- * 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.
- *
- */
-
-//
-// EPOC MMP makefile project for ScummVM
-//
-
-// *** Definitions
-
-TARGET scummvm_base.lib
-TARGETTYPE lib
-#include "build_config.mmh"
-
-// compiler must use png.h from libpng.lib instead ScummVM's
-OPTION GCCE -I'/Symbian/S60_5th_Edition_SDK_v1.0/epoc32/include/png' -fstack-usage -fdump-ipa-cgraph
-
-// Note: the LIB:*.lib statements are used by AdaptAllMMPs.pl, so don't remove them!
-MACRO USE_SYSTEM_REMOVE
-//MACRO USE_LIBCURL
-//MACRO USE_CLOUD
-//START_AUTO_MACROS_MASTER// Updated @ Thu Dec 10 22:42:12 2015
-MACRO NONSTANDARD_PORT
-MACRO ENABLE_VKEYBD
-MACRO DISABLE_FANCY_THEMES
-MACRO USE_TRANSLATION
-MACRO USE_BINK
-// Features //
-MACRO USE_FAAD // LIB:libFAAD2.lib
-MACRO USE_FLAC // LIB:libflacdec.lib
-MACRO USE_FREETYPE2 // LIB:freetype.lib
-MACRO USE_JPEG // LIB:libjpeg.lib
-MACRO USE_MAD // LIB:libmad.lib
-MACRO USE_MPEG2 // LIB:libmpeg2.lib
-MACRO USE_PNG // LIB:libpng.lib
-MACRO USE_THEORADEC // LIB:theora.lib
-MACRO USE_TREMOR // LIB:libtremor.lib
-MACRO USE_ZLIB // LIB:zlib.lib
-MACRO USE_A52
-// Engines //
-#define SCUMMVM_PT_1
-#define SCUMMVM_PT_2
-#define SCUMMVM_PT_3
-#define SCUMMVM_PT_4
-#include "../mmp/macros.mmh"
-//STOP_AUTO_MACROS_MASTER//
-
-// *** Include paths
-
-USERINCLUDE ..\..\..\..\backends\fs ..\..\..\..\backends\platform\sdl
-USERINCLUDE \epoc32\include\mpeg2dec
-
-
-// *** SOURCE files
-
-
-SOURCEPATH ..\..\..\..\common
-SOURCE archive.cpp
-SOURCE base-str.cpp
-SOURCE config-manager.cpp
-SOURCE coroutines.cpp
-SOURCE dcl.cpp
-SOURCE debug.cpp
-SOURCE error.cpp
-SOURCE file.cpp
-SOURCE fs.cpp
-SOURCE gui_options.cpp
-SOURCE hashmap.cpp
-SOURCE iff_container.cpp
-SOURCE ini-file.cpp
-SOURCE installshield_cab.cpp
-SOURCE language.cpp
-SOURCE localization.cpp
-SOURCE macresman.cpp
-SOURCE memorypool.cpp
-SOURCE md5.cpp
-SOURCE mutex.cpp
-SOURCE platform.cpp
-SOURCE quicktime.cpp
-SOURCE random.cpp
-SOURCE rational.cpp
-SOURCE rendermode.cpp
-SOURCE str.cpp
-SOURCE stream.cpp
-SOURCE system.cpp
-SOURCE textconsole.cpp
-SOURCE tokenizer.cpp
-SOURCE translation.cpp
-SOURCE unarj.cpp
-SOURCE unzip.cpp
-SOURCE ustr.cpp
-SOURCE util.cpp
-SOURCE winexe.cpp
-SOURCE winexe_ne.cpp
-SOURCE winexe_pe.cpp
-SOURCE xmlparser.cpp
-SOURCE zlib.cpp
-SOURCE cosinetables.cpp
-SOURCE dct.cpp
-SOURCE fft.cpp
-SOURCE rdft.cpp
-SOURCE sinetables.cpp
-//STOP_AUTO_OBJECTS_COMMON_//
-
-
-SOURCEPATH ..\..\..\..\graphics
-//START_AUTO_OBJECTS_GRAPHICS_// Updated @ Thu Dec 10 22:42:12 2015
-SOURCE conversion.cpp
-SOURCE cursorman.cpp
-SOURCE font.cpp
-SOURCE fontman.cpp
-SOURCE fonts\bdf.cpp
-SOURCE fonts\consolefont.cpp
-SOURCE fonts\newfont_big.cpp
-SOURCE fonts\newfont.cpp
-SOURCE fonts\ttf.cpp
-SOURCE fonts\winfont.cpp
-SOURCE maccursor.cpp
-SOURCE pixelformat.cpp
-SOURCE primitives.cpp
-SOURCE scaler.cpp
-SOURCE scaler\thumbnail_intern.cpp
-SOURCE surface.cpp
-SOURCE transform_struct.cpp
-SOURCE transform_tools.cpp
-SOURCE transparent_surface.cpp
-SOURCE thumbnail.cpp
-SOURCE VectorRenderer.cpp
-SOURCE VectorRendererSpec.cpp
-SOURCE wincursor.cpp
-SOURCE yuv_to_rgb.cpp
-//STOP_AUTO_OBJECTS_GRAPHICS_//
-
-
-SOURCEPATH ..\..\..\..\image
-//START_AUTO_OBJECTS_IMAGE_// Updated @ Thu Dec 10 22:42:12 2015
-SOURCE bmp.cpp
-SOURCE iff.cpp
-SOURCE jpeg.cpp
-SOURCE pcx.cpp
-SOURCE pict.cpp
-SOURCE png.cpp
-SOURCE tga.cpp
-SOURCE codecs\bmp_raw.cpp
-SOURCE codecs\cdtoons.cpp
-SOURCE codecs\cinepak.cpp
-SOURCE codecs\codec.cpp
-SOURCE codecs\indeo3.cpp
-SOURCE codecs\mjpeg.cpp
-SOURCE codecs\msrle.cpp
-SOURCE codecs\msvideo1.cpp
-SOURCE codecs\qtrle.cpp
-SOURCE codecs\rpza.cpp
-SOURCE codecs\smc.cpp
-SOURCE codecs\svq1.cpp
-SOURCE codecs\truemotion1.cpp
-//STOP_AUTO_OBJECTS_IMAGE_//
-// add a few files manually, since they are not parsed from modules.mk files
-SOURCE codecs\mpeg.cpp
-
-SOURCEPATH ..\..\..\..\gui
-//START_AUTO_OBJECTS_GUI_// Updated @ Thu Dec 10 22:42:12 2015
-SOURCE about.cpp
-SOURCE chooser.cpp
-SOURCE console.cpp
-SOURCE debugger.cpp
-SOURCE dialog.cpp
-SOURCE error.cpp
-SOURCE EventRecorder.cpp
-SOURCE filebrowser-dialog.cpp
-SOURCE gui-manager.cpp
-SOURCE launcher.cpp
-SOURCE massadd.cpp
-SOURCE message.cpp
-SOURCE object.cpp
-SOURCE options.cpp
-SOURCE predictivedialog.cpp
-SOURCE saveload.cpp
-SOURCE saveload-dialog.cpp
-SOURCE themebrowser.cpp
-SOURCE ThemeEngine.cpp
-SOURCE ThemeEval.cpp
-SOURCE ThemeLayout.cpp
-SOURCE ThemeParser.cpp
-SOURCE Tooltip.cpp
-SOURCE widget.cpp
-SOURCE widgets\editable.cpp
-SOURCE widgets\edittext.cpp
-SOURCE widgets\list.cpp
-SOURCE widgets\popup.cpp
-SOURCE widgets\scrollbar.cpp
-SOURCE widgets\tab.cpp
-//STOP_AUTO_OBJECTS_GUI_//
-
-SOURCEPATH ..\..\..\..\audio
-//START_AUTO_OBJECTS_AUDIO_// Updated @ Thu Dec 10 22:42:12 2015
-SOURCE adlib.cpp
-SOURCE audiostream.cpp
-SOURCE fmopl.cpp
-SOURCE mididrv.cpp
-SOURCE midiparser_qt.cpp
-SOURCE midiparser_smf.cpp
-SOURCE midiparser_xmidi.cpp
-SOURCE midiparser.cpp
-SOURCE midiplayer.cpp
-SOURCE miles_adlib.cpp
-//SOURCE miles_mt32.cpp (excluded, @exclusions[mt32.*])
-SOURCE mixer.cpp
-SOURCE mpu401.cpp
-SOURCE musicplugin.cpp
-SOURCE null.cpp
-SOURCE rate.cpp
-SOURCE timestamp.cpp
-SOURCE decoders\3do.cpp
-SOURCE decoders\aac.cpp
-SOURCE decoders\adpcm.cpp
-SOURCE decoders\aiff.cpp
-SOURCE decoders\flac.cpp
-SOURCE decoders\iff_sound.cpp
-SOURCE decoders\mac_snd.cpp
-SOURCE decoders\mp3.cpp
-SOURCE decoders\qdm2.cpp
-SOURCE decoders\quicktime.cpp
-SOURCE decoders\raw.cpp
-SOURCE decoders\voc.cpp
-SOURCE decoders\vorbis.cpp
-SOURCE decoders\wave.cpp
-SOURCE decoders\xa.cpp
-SOURCE mods\infogrames.cpp
-SOURCE mods\maxtrax.cpp
-SOURCE mods\module.cpp
-SOURCE mods\protracker.cpp
-SOURCE mods\paula.cpp
-SOURCE mods\rjp1.cpp
-SOURCE mods\soundfx.cpp
-SOURCE mods\tfmx.cpp
-SOURCE softsynth\cms.cpp
-SOURCE softsynth\opl\dbopl.cpp
-SOURCE softsynth\opl\dosbox.cpp
-SOURCE softsynth\opl\mame.cpp
-SOURCE softsynth\fmtowns_pc98\towns_audio.cpp
-SOURCE softsynth\fmtowns_pc98\towns_euphony.cpp
-SOURCE softsynth\fmtowns_pc98\towns_pc98_driver.cpp
-//SOURCE softsynth\fmtowns_pc98\towns_pc98_fmsynth.cpp (excluded, @exclusions[synth.cpp])
-SOURCE softsynth\fmtowns_pc98\towns_pc98_plugins.cpp
-SOURCE softsynth\appleiigs.cpp
-//SOURCE softsynth\fluidsynth.cpp (excluded, @exclusions[fluidsynth.cpp])
-//SOURCE softsynth\mt32.cpp (excluded, @exclusions[mt32.*])
-SOURCE softsynth\eas.cpp
-SOURCE softsynth\pcspk.cpp
-SOURCE softsynth\sid.cpp
-SOURCE softsynth\wave6581.cpp
-//SOURCE Analog.cpp (excluded, @exclusions[Analog.cpp])
-//SOURCE BReverbModel.cpp (excluded, @exclusions[bReverbmodel.cpp])
-//SOURCE LA32Ramp.cpp (excluded, @exclusions[La32Ramp.cpp])
-//SOURCE LA32WaveGenerator.cpp (excluded, @exclusions[LA32WaveGenerator.cpp])
-//SOURCE Part.cpp (excluded, @exclusions[part.*])
-//SOURCE Partial.cpp (excluded, @exclusions[part.*])
-//SOURCE PartialManager.cpp (excluded, @exclusions[part.*])
-//SOURCE Poly.cpp (excluded, @exclusions[Poly.cpp])
-//SOURCE ROMInfo.cpp (excluded, @exclusions[ROMInfo.cpp])
-//SOURCE Synth.cpp (excluded, @exclusions[synth.cpp])
-//SOURCE Tables.cpp (excluded, @exclusions[tables.cpp])
-//SOURCE TVA.cpp (excluded, @exclusions[TVA.cpp])
-//SOURCE TVF.cpp (excluded, @exclusions[TVF.cpp])
-//SOURCE TVP.cpp (excluded, @exclusions[TVP.cpp])
-//STOP_AUTO_OBJECTS_AUDIO_//
-SOURCE softsynth\fmtowns_pc98\towns_pc98_fmsynth.cpp // Included since its excluded by filter
-
-SOURCEPATH ..\..\..\..\video
-//START_AUTO_OBJECTS_VIDEO_// Updated @ Thu Dec 10 22:42:12 2015
-SOURCE avi_decoder.cpp
-SOURCE coktel_decoder.cpp
-SOURCE dxa_decoder.cpp
-SOURCE flic_decoder.cpp
-SOURCE mpegps_decoder.cpp
-SOURCE psx_decoder.cpp
-SOURCE qt_decoder.cpp
-SOURCE smk_decoder.cpp
-SOURCE video_decoder.cpp
-SOURCE mve_decoder.cpp
-//STOP_AUTO_OBJECTS_VIDEO_//
-
-// add a few files manually, since they are not parsed from modules.mk files
-SOURCE theora_decoder.cpp
-SOURCE bink_decoder.cpp
-
-SOURCEPATH ..\..\..\..
-SOURCE backends\events\default\default-events.cpp
-SOURCE backends\timer\default\default-timer.cpp
-SOURCE backends\saves\savefile.cpp
-SOURCE backends\saves\default\default-saves.cpp
-SOURCE backends\base-backend.cpp
-SOURCE gui\browser.cpp
-SOURCE engines\engine.cpp
-SOURCE engines\dialogs.cpp
-SOURCE engines\game.cpp
-SOURCE engines\advanceddetector.cpp
-SOURCE engines\savestate.cpp
-// backend specific includes
-SOURCE backends\modular-backend.cpp
-SOURCE backends\audiocd\default\default-audiocd.cpp
-SOURCE backends\audiocd\sdl\sdl-audiocd.cpp
-SOURCE backends\events\sdl\sdl-events.cpp
-SOURCE backends\fs\abstract-fs.cpp
-SOURCE backends\fs\symbian\symbianstream.cpp
-SOURCE backends\graphics\sdl\sdl-graphics.cpp
-SOURCE backends\keymapper\action.cpp
-SOURCE backends\keymapper\keymap.cpp
-SOURCE backends\keymapper\keymapper.cpp
-SOURCE backends\mixer\sdl\sdl-mixer.cpp
-SOURCE backends\mixer\symbiansdl\symbiansdl-mixer.cpp
-SOURCE backends\mutex\sdl\sdl-mutex.cpp
-SOURCE backends\timer\sdl\sdl-timer.cpp
-SOURCE backends\log\log.cpp
-
-// Source files for virtual keyboard
-SOURCE backends\vkeybd\image-map.cpp
-SOURCE backends\vkeybd\polygon.cpp
-SOURCE backends\vkeybd\virtual-keyboard-gui.cpp
-SOURCE backends\vkeybd\virtual-keyboard-parser.cpp
-SOURCE backends\vkeybd\virtual-keyboard.cpp
-
-// Downscaler
-SOURCE graphics\scaler\downscaler.cpp
-SOURCE graphics\scaler\downscalerARM.s
-MACRO SDL_BACKEND
-
-SOURCEPATH ..\..\..\..\common
-SOURCE json.cpp osd_message_queue.cpp
-SOURCEPATH ..\..\..\..\graphics
-SOURCE nine_patch.cpp
-SOURCEPATH ..\..\..\..\gui
-SOURCE editgamedialog.cpp
-SOURCEPATH ..\..\..\..\image\codecs\indeo
-SOURCE indeo.cpp indeo_dsp.cpp mem.cpp vlc.cpp
-SOURCEPATH ..\..\..\..\image\codecs
-SOURCE indeo4.cpp indeo5.cpp msrle4.cpp
-SOURCEPATH ..\..\..\..\graphics
-SOURCE managed_surface.cpp screen.cpp
-SOURCEPATH ..\..\..\..\graphics\fonts
-SOURCE macfont.cpp
-SOURCEPATH ..\..\..\..\graphics\macgui
-SOURCE macfontmanager.cpp macmenu.cpp mactext.cpp mactextwindow.cpp macwindow.cpp macwindowborder.cpp macwindowmanager.cpp
-SOURCEPATH ..\..\..\..\audio\mods
-SOURCE mod_xm_s3m.cpp module_mod_xm_s3m.cpp
-SOURCEPATH ..\..\..\..\gui\widgets
-SOURCE scrollcontainer.cpp
-SOURCEPATH ..\..\..\..\gui\animation
-SOURCE Animation.cpp RepeatAnimationWrapper.cpp SequenceAnimationComposite.cpp
-
-SOURCEPATH ..\..\..\..\audio
-SOURCE miles_midi.cpp
-SOURCEPATH ..\..\..\..\audio\decoders
-SOURCE ac3.cpp
-SOURCEPATH ..\..\..\..\audio\softsynth\fmtowns_pc98
-SOURCE pc98_audio.cpp pcm_common.cpp sega_audio.cpp
-SOURCEPATH ..\..\..\..\audio\softsynth\opl
-SOURCE nuked.cpp
-SOURCEPATH ..\..\..\events\sdl
-SOURCE legacy-sdl-events.cpp
-SOURCEPATH ..\..\..\fs\posix
-SOURCE posix-iostream.cpp
-SOURCEPATH ..\..\..\keymapper
-SOURCE input-watcher.cpp remap-widget.cpp standard-actions.cpp virtual-mouse.cpp
-SOURCEPATH ..\..\..\..\base
-SOURCE test_new_standards.cpp
-SOURCEPATH ..\..\..\..\common
-SOURCE achievements.cpp events.cpp str-enc.cpp text-to-speech.cpp unicode-bidi.cpp
-SOURCEPATH ..\..\..\..\engines
-SOURCE metaengine.cpp
-SOURCEPATH ..\..\..\..\graphics
-SOURCE larryScale.cpp
-SOURCEPATH ..\..\..\..\graphics\macgui
-SOURCE datafiles.cpp macbutton.cpp macwidget.cpp
-SOURCEPATH ..\..\..\..\gui
-SOURCE unknown-game-dialog.cpp
-SOURCEPATH ..\..\..\..\image\codecs
-SOURCE jyv1.cpp
-SOURCEPATH ..\..\..\keymapper
-SOURCE hardware-input.cpp
-SOURCEPATH ..\..\..\..\audio\soundfont
-SOURCE rawfile.cpp rifffile.cpp sf2file.cpp synthfile.cpp
-SOURCE vgmcoll.cpp vgminstrset.cpp vgmitem.cpp vgmsamp.cpp
-SOURCEPATH ..\..\..\..\audio\soundfont\vab
-SOURCE psxspu.cpp vab.cpp
-SOURCEPATH ..\..\..\audiocd
-SOURCE audiocd-stream.cpp
diff --git a/backends/platform/symbian/S60v3/scummvm_reg.rss b/backends/platform/symbian/S60v3/scummvm_reg.rss
deleted file mode 100644
index b5617913d6..0000000000
--- a/backends/platform/symbian/S60v3/scummvm_reg.rss
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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 0xA0000657 // 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"; // filename of application binary (minus extension)
- // Specify the location of the localisable icon/caption definition file
- localisable_resource_file = "\\Resource\\Apps\\ScummVM_loc";
- }
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h
index a48873c525..c681a2b649 100644
--- a/backends/platform/symbian/src/portdefs.h
+++ b/backends/platform/symbian/src/portdefs.h
@@ -232,6 +232,10 @@ void *scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size
#define FORBIDDEN_SYMBOL_EXCEPTION_stdout
#define FORBIDDEN_SYMBOL_EXCEPTION_stderr
+#if defined(__GNUC__)
+# define va_copy(dst, src) __builtin_va_copy(dst, src)
+#endif
+
// we cannot include SymbianOS.h everywhere, but this works too (functions code is in SymbianOS.cpp)
namespace Symbian {
extern char* GetExecutablePath();
diff --git a/backends/platform/symbian/symbian_builder/__init__.py b/backends/platform/symbian/symbian_builder/__init__.py
index 376f3cf724..b912473cee 100644
--- a/backends/platform/symbian/symbian_builder/__init__.py
+++ b/backends/platform/symbian/symbian_builder/__init__.py
@@ -26,6 +26,7 @@ from build_apps import build_apps
from create_installers import create_installers
from datetime import datetime
import time
+
from piper import build_mmp
from parse_codecs import parse_codecs
from parse_base import parse_base
@@ -33,6 +34,8 @@ from common_names import *
from scummvm_hrh import Generate_ScummVm_hrh
from parse_lua import parse_lua
from parse_gamedata import parse_gamedata
+from pkg_generator import create_pkgs
+from source_patcher import fix_src
def minimal_whitelist(engine):
data = "#ifdef SCUMMVM_PT_1\nscummvm_base.mmp\nscummvm_codecs.mmp\n%s\n#endif // SCUMMVM_PT_%s\n" %engine
@@ -49,6 +52,8 @@ def run(build, pkgs, only_begotten_engine = None):
parse_base()
parse_lua()
parse_gamedata(build, pkgs)
+ create_pkgs(build, pkgs)
+ fix_src()
SafeWriteFile(build_log, log, 'a')
if only_begotten_engine:
diff --git a/backends/platform/symbian/symbian_builder/build_apps.py b/backends/platform/symbian/symbian_builder/build_apps.py
index e2c5062d6a..2d2dc7068d 100644
--- a/backends/platform/symbian/symbian_builder/build_apps.py
+++ b/backends/platform/symbian/symbian_builder/build_apps.py
@@ -20,21 +20,66 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-import subprocess
+from __future__ import with_statement
+import os, subprocess, Queue, threading, errno, time
+import multiprocessing as mp
+
from common_names import *
+prj_template = "PRJ_MMPFILES\n%s"
+prj_path = "paralell_build"
+
+
+def thread_func(q, plats):
+ while True:
+ fileName = q.get()
+ if fileName is None: # EOF?
+ return
+ pth = os.path.join(prj_path, plats)
+ pth = os.path.join(pth, fileName)
+ try:
+ os.makedirs(pth)
+ except OSError as e:
+ if e.errno == errno.EEXIST:
+ pass
+ else:
+ raise
+
+ fname = os.path.join(plats, fileName)
+ fname = os.path.join("..", fname)
+ fname = os.path.join("..", fname)
+ fname = os.path.join("..", fname) # point to mmp file in port specific folder
+ tmp = os.path.join(pth, "bld.inf")
+ SafeWriteFile(tmp, prj_template %fname)
+
+
+ #Needed because datetime.now() returns the same time for every call
+ start = time.strftime("%H:%M:%S")
+
+ cmd = subprocess.Popen('bldmake bldfiles', stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=pth, shell=True)
+ out, err = cmd.communicate()
+ cmd1 = subprocess.Popen('abld build gcce urel', stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=pth, shell=True)
+ out1, err1 = cmd1.communicate()
+ out = out + out1
+ err = err + err1
+ # I hope it correctly stores logs in parallel tasks
+ # after cmd.communicate() we have ugly 'crcrlf' line endings
+ SafeWriteFile(build_log, out.replace(u"\r", u""), 'a')
+ SafeWriteFile(build_err, err.replace(u"\r", u""), 'a')
+
+def build_apps(plats):
+ q = Queue.Queue()
+ fileNames = os.listdir(plats)
+ fileNames = [x for x in fileNames if ".mmp" in x]
-def build_apps(plats = "S60v3"):
- cmd = subprocess.Popen('bldmake bldfiles', stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=plats, shell=True)
- out, err = cmd.communicate()
- cmd1 = subprocess.Popen('abld build gcce urel', stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=plats, shell=True)
- out1, err1 = cmd1.communicate()
- out = out + out1
- err = err + err1
- # I hope it correctly stores logs in parallel tasks
- # after cmd.communicate() we have ugly 'crcrlf' line endings
- SafeWriteFile(build_log, out.replace(u"\r", u""), 'a')
- SafeWriteFile(build_err, err.replace(u"\r", u""), 'a')
+ for fileName in fileNames:
+ q.put(fileName)
+ print q.qsize()
+ print "Thread count: %s" %mp.cpu_count()
+ threads = [ threading.Thread(target=thread_func, args=(q, plats)) for i in range(mp.cpu_count()) ]
+ for thread in threads:
+ thread.start()
+ q.put(None) # one EOF marker for each thread
if __name__ == "__main__":
build_apps(plats = "S60v3")
diff --git a/backends/platform/symbian/symbian_builder/common_names.py b/backends/platform/symbian/symbian_builder/common_names.py
index 485f302d7c..f643db00c0 100644
--- a/backends/platform/symbian/symbian_builder/common_names.py
+++ b/backends/platform/symbian/symbian_builder/common_names.py
@@ -36,7 +36,7 @@ build = 'full'
# build = 'release'
#sis package version
-sis_major_version, sis_minor_version, sis_build_number = 2, 3, 0
+sis_major_version, sis_minor_version, sis_build_number = 2, '03', 0
uids = ("0xA0000657", "0xA0000658", "0x2006FE7C", "0x2006FE7D", "0x2006FE7E", "0x2006FE7F", "0x2006FE80")
@@ -57,6 +57,9 @@ def SafeWriteFile(path, data, mode = 'w'):
else:
f.write(data)
+def AppendToFile(path, data):
+ SafeWriteFile(path, data, mode = 'a')
+
active_config = ("DISABLE_NUKED_OPL", "USE_A52", "USE_MPEG2", "USE_BINK", "USE_THEORADEC", "USE_TINYGL",
"ENABLE_VKEYBD")
#activate USE_SCALERS USE_ARM_SCALER_ASM USE_TTS USE_SPEECH_DISPATCHER USE_CLOUD USE_LIBCURL
diff --git a/backends/platform/symbian/symbian_builder/create_installers.py b/backends/platform/symbian/symbian_builder/create_installers.py
index 4fe22b729f..027cd4d11b 100644
--- a/backends/platform/symbian/symbian_builder/create_installers.py
+++ b/backends/platform/symbian/symbian_builder/create_installers.py
@@ -26,12 +26,16 @@ from common_names import *
def makesis(pkg, path):
- t = "makesis -d%EPOCROOT% %s" %pkg
+ print "pkg: %s" %pkg
+ t = "makesis -c %s" %pkg
cmd = subprocess.Popen(t, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=path, shell=True)
out, err = cmd.communicate()
SafeWriteFile(build_log, out)
SafeWriteFile(build_err, err)
-def create_installers(path = "S60v3"):
+def create_installers(path):
t = os.listdir(path)
[makesis(pkg, path) for pkg in t if ".pkg" in pkg]
+
+if __name__ == "__main__":
+ create_installers(path = "S60v3")
diff --git a/backends/platform/symbian/symbian_builder/parse_gamedata.py b/backends/platform/symbian/symbian_builder/parse_gamedata.py
index 4b2d86b5b7..d1a9d5028d 100644
--- a/backends/platform/symbian/symbian_builder/parse_gamedata.py
+++ b/backends/platform/symbian/symbian_builder/parse_gamedata.py
@@ -54,12 +54,11 @@ pkg_template = """;;;
;Supports Series 60 v 5.0
[0x1028315F], 0, 0, 0, {"Series60ProductID"}
; Scummvm Documentation
-"..\..\..\..\COPYRIGHT"-"!:\\resource\\apps\\scummvm\\COPYRIGHT", FT, TC
-"..\..\..\..\COPYING"-"!:\\resource\\apps\\scummvm\\COPYING", FT, TC
-"..\README"-"!:\\resource\\apps\\scummvm\\SYMBIAN_README", FT, TC
-"..\..\..\..\AUTHORS"-"!:\\resource\\apps\scummvm\\AUTHORS"
-"..\..\..\..\README.md"-"!:\\resource\\apps\\scummvm\\README.md"
-"..\..\..\..\NEWS.md"-"!:\\resource\\apps\\scummvm\\NEWS.md"
+"..\..\..\..\COPYRIGHT"-"", FT, TC
+"..\..\..\..\COPYING"-"", FT, TC
+"..\..\..\..\COPYING.FREEFONT" - "", FT, TC
+"..\README"-"", FT, TC
+"..\..\..\..\AUTHORS"-""
; Scummvm help
"..\help\ScummVM.hlp"-"!:\\resource\help\ScummVM.hlp"
diff --git a/backends/platform/symbian/symbian_builder/piper.py b/backends/platform/symbian/symbian_builder/piper.py
index b4ae3bdafe..632d3aa2f7 100644
--- a/backends/platform/symbian/symbian_builder/piper.py
+++ b/backends/platform/symbian/symbian_builder/piper.py
@@ -86,7 +86,7 @@ def build_mmp(try_fix = False):
for fileName in fileNames:
q.put(fileName)
- print q.qsize()
+ print "Queve size: %s" %q.qsize()
print "Thread count: %s" %mp.cpu_count()
threads = [ threading.Thread(target=thread_func, args=(q, )) for i in range(mp.cpu_count()) ]
for thread in threads:
diff --git a/backends/platform/symbian/symbian_builder/pkg_generator.py b/backends/platform/symbian/symbian_builder/pkg_generator.py
new file mode 100644
index 0000000000..3883354b61
--- /dev/null
+++ b/backends/platform/symbian/symbian_builder/pkg_generator.py
@@ -0,0 +1,229 @@
+# ScummVM - Graphic Adventure Engine
+# Copyright (C) 2020 Stryzhniou Fiodar
+
+# 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.
+
+
+from __future__ import with_statement
+import os
+from common_names import *
+
+# Template args = (Package Name = filename + platform, Component name, UID, major version, minor version, build number)
+pkg_template = """
+;
+; Warning: autogenerated file
+;
+
+;Language - standard language definitions
+&EN
+
+; List of localised vendor names - one per language. At least one must be provided (English [EN]).
+; List must correspond to list of languages specified elsewhere in the .pkg
+%%{"ScummVM"}
+; The non-localised, globally unique vendor name (mandatory)
+:"ScummVM"
+
+; UID is the app's UID
+#{"%s"},(%s),%s,%s,%s
+
+;Supports Series 60 v 3.0
+[0x101F7961], 0, 0, 0, {"Series60ProductID"}
+;Supports Series 60 v 5.0
+[0x1028315F], 0, 0, 0, {"Series60ProductID"}
+"""
+
+# Template args = (UID from 1st package, major version, minor version, build number,
+# major version, minor version, build number, 1st package name)
+dependency = """
+
+;ScummVM1 dependency
+(%s), %s,%s,%s ~ %s,%s,%s, {"%s"}
+"""
+
+pkg_licenses_install = """
+
+; Scummvm Documentation
+"..\\..\\..\\..\\COPYRIGHT" - "!:\\data\\scummvm\\COPYRIGHT", FT, TC
+"..\\..\\..\\..\\COPYING.BSD" - "!:\\data\\scummvm\\COPYING.BSD", FT, TC
+"..\\..\\..\\..\\COPYING.ISC" - "!:\\data\\scummvm\\COPYING.ISC", FT, TC
+"..\\..\\..\\..\\COPYING.LGPL" - "!:\\data\\scummvm\\COPYING.LGPL", FT, TC
+"..\\..\\..\\..\\COPYING.LUA" - "!:\\data\\scummvm\\COPYING.LUA", FT, TC
+"..\\..\\..\\..\\COPYING.MIT" - "!:\\data\\scummvm\\COPYING.MIT", FT, TC
+"..\\..\\..\\..\\COPYING.OFL" - "!:\\data\\scummvm\\COPYING.OFL", FT, TC
+"..\\..\\..\\..\\COPYING.TINYGL" - "!:\\data\\scummvm\\COPYING.TINYGL", FT, TC
+"..\\..\\..\\..\\COPYING" - "!:\\data\\scummvm\\COPYING", FT, TC
+"..\\..\\..\\..\\AUTHORS" - "!:\\data\\scummvm\\AUTHORS"
+"..\\..\\..\\..\\README.md" - "!:\\data\\scummvm\\README.md"
+"..\\..\\..\\..\\NEWS.md" - "!:\\data\\scummvm\\NEWS.md"
+"..\\README" - "!:\\data\\scummvm\\SYMBIAN_README", FT, TC
+"""
+
+pkg_licenses_show = """
+
+; Scummvm Documentation
+"..\\..\\..\\..\COPYRIGHT" - "", FT, TC
+"..\\..\\..\\..\COPYING.BSD" - "", FT, TC
+"..\\..\\..\\..\COPYING.ISC" - "", FT, TC
+"..\\..\\..\\..\COPYING.LGPL" - "", FT, TC
+"..\\..\\..\\..\COPYING.LUA" - "", FT, TC
+"..\\..\\..\\..\COPYING.MIT" - "", FT, TC
+"..\\..\\..\\..\COPYING.OFL" - "", FT, TC
+"..\\..\\..\\..\COPYING.TINYGL" - "", FT, TC
+"..\\..\\..\\..\COPYING" - "", FT, TC
+"..\\README" - "", FT, TC
+"""
+
+# Template args = (extension, extension, extension, extension,
+# extension, extension, extension, extension )
+# where extension == (ordinal or (ordinal and "_test") )
+install_data = """
+; Launcher, Application, AIF & Resource file
+"$(EPOCROOT)epoc32\\release\\gcce\\urel\\ScummVM%s.exe" - "!:\\sys\\bin\\ScummVM%s.exe"
+"$(EPOCROOT)epoc32\\data\\z\\resource\\apps\\ScummVM%s.rsc" - "!:\\resource\\apps\\ScummVM%s.rsc"
+"$(EPOCROOT)epoc32\\data\\z\\resource\\apps\\ScummVM%s_loc.rsc"- "!:\\resource\\apps\\ScummVM%s_loc.rsc"
+"$(EPOCROOT)epoc32\\data\\z\\private\\10003a3f\\apps\\ScummVM%s_reg.rsc" -
+ "!:\\private\\10003a3f\\import\\apps\\ScummVM%s_reg.rsc"
+"""
+
+install_eclipse_data = """
+; Launcher, Application, AIF & Resource file
+"$(EPOCROOT)epoc32\\release\\$(PLATFORM)\\$(TARGET)\\ScummVM%s.exe" - "!:\\sys\\bin\\ScummVM%s.exe"
+"$(EPOCROOT)epoc32\\data\\z\\resource\\apps\\ScummVM%s.rsc" - "!:\\resource\\apps\\ScummVM%s.rsc"
+"$(EPOCROOT)epoc32\\data\\z\\resource\\apps\\ScummVM%s_loc.rsc"- "!:\\resource\\apps\\ScummVM%s_loc.rsc"
+"$(EPOCROOT)epoc32\\data\\z\\private\\10003a3f\\apps\\ScummVM%s_reg.rsc" -
+ "!:\\private\\10003a3f\\import\\apps\\ScummVM%s_reg.rsc"
+"""
+
+clear_uninstall = """
+
+; Config/log files: 'empty' will automagically be removed on uninstall
+""- "c:\data\scummvm\scummvm.ini",FILENULL
+""- "c:\data\scummvm\scummvm.stdout.txt",FILENULL
+""- "c:\data\scummvm\scummvm.stderr.txt",FILENULL
+""- "c:\data\scummvm\sdl.ini",FILENULL
+"""
+
+mif_install = """
+ \"$(EPOCROOT)epoc32\\data\\z\\resource\\apps\\ScummVM.mif\" - \"!:\\resource\\apps\\ScummVM.mif\"
+"""
+
+package_name = "ScummVM%s"
+
+def EPOCROOTAsPath():
+ return os.path.join( os.path.splitdrive(os.getcwd())[0], os.environ['EPOCROOT'])
+
+def ResolveEpocRoot(install_data):
+ return install_data.replace("$(EPOCROOT)", EPOCROOTAsPath())
+
+def SaveInstallData(pkg, build, ext, toResolve = True):
+ if build == 'full':
+ ext = str(ext) + "_test"
+ install = install_eclipse_data
+ if toResolve:
+ install = ResolveEpocRoot(install_data)
+ AppendToFile(pkg, install %(ext, ext, ext, ext, ext, ext, ext, ext) )
+
+def SaveDependency(build, pkg):
+ uid = get_UIDs(build)
+ dep_name = "ScummVM1.sisx"
+ if build == 'full':
+ dep_name = "ScummVM1_test.sisx"
+ AppendToFile(pkg, dependency %(uid[0], sis_major_version, sis_minor_version, sis_build_number, \
+ sis_major_version, sis_minor_version, sis_build_number, dep_name))
+
+def ResolvePackName(ordinal, target, build):
+ print int(ordinal) + 1
+ tmp = package_name %(str(ordinal +1) + " " + target)
+ if build == 'full':
+ tmp += " test"
+ return tmp
+
+def CreateLastPkg(install_uid, build, path, ordinal, target):
+ pkg = path %(ordinal +1)
+ pkg_cmdline = path %( str(ordinal +1) + "_cmdline")
+ pack_name = ResolvePackName(ordinal, target, build)
+
+ SafeWriteFile(pkg, pkg_template %(pack_name, install_uid, sis_major_version, sis_minor_version, sis_build_number) )
+ SafeWriteFile(pkg_cmdline, pkg_template %(pack_name, install_uid, sis_major_version, sis_minor_version, sis_build_number) )
+ SaveDependency(build, pkg)
+ SaveDependency(build, pkg_cmdline)
+
+ AppendToFile(pkg, pkg_licenses_show)
+ AppendToFile(pkg_cmdline, pkg_licenses_show)
+
+ SaveInstallData(pkg, build, ordinal*2 + 1, toResolve = False)
+ SaveInstallData(pkg_cmdline, build, ordinal*2 + 1)
+
+def CreatePkg(install_uid, build, path, ordinal, target):
+ pkg = path %(ordinal +1)
+ pkg_cmdline = path %( str(ordinal +1) + "_cmdline")
+ pack_name = ResolvePackName(ordinal, target, build)
+
+ SafeWriteFile(pkg, pkg_template %(pack_name, install_uid, sis_major_version, sis_minor_version, sis_build_number) )
+ SafeWriteFile(pkg_cmdline, pkg_template %(pack_name, install_uid, sis_major_version, sis_minor_version, sis_build_number) )
+ SaveDependency(build, pkg)
+ SaveDependency(build, pkg_cmdline)
+
+ AppendToFile(pkg, pkg_licenses_show)
+ AppendToFile(pkg_cmdline, pkg_licenses_show)
+
+ SaveInstallData(pkg, build, ordinal*2 + 1, toResolve = False)
+ SaveInstallData(pkg_cmdline, build, ordinal*2 + 1)
+ SaveInstallData(pkg, build, ordinal*2 + 2, toResolve = False)
+ SaveInstallData(pkg_cmdline, build, ordinal*2 + 2)
+
+def CreateFirstPkg(install_uid, build, path, target):
+ ext = 1
+ cmd = str(ext) + "_cmdline"
+
+ pkg = path %ext
+ pkg_cmdline = path %cmd
+ pack_name = ResolvePackName(0, target, build)
+
+ SafeWriteFile(pkg, pkg_template %(pack_name, install_uid, sis_major_version, sis_minor_version, sis_build_number) )
+ SafeWriteFile(pkg_cmdline, pkg_template %(pack_name, install_uid, sis_major_version, sis_minor_version, sis_build_number) )
+
+ AppendToFile(pkg, pkg_licenses_install)
+ AppendToFile(pkg_cmdline, pkg_licenses_install)
+ if build == 'release':
+ AppendToFile(pkg, mif_install)
+ AppendToFile(pkg_cmdline, ResolveEpocRoot(mif_install))
+
+ SaveInstallData(pkg, build, 1, toResolve = False)
+ SaveInstallData(pkg_cmdline, build, 1)
+ SaveInstallData(pkg, build, 2, toResolve = False)
+ SaveInstallData(pkg_cmdline, build, 2)
+ AppendToFile(pkg, clear_uninstall)
+ AppendToFile(pkg_cmdline, clear_uninstall)
+
+def create_pkgs(build, path):
+ uids = get_UIDs(build)
+ pairs = len(uids)/2
+ pkg_name = "ScummVM%s.pkg"
+ pkg_name = os.path.join(path, pkg_name)
+ for i in range(pairs):
+ if i == 0:
+ CreateFirstPkg(uids[0], build, pkg_name, path)
+ continue
+ CreatePkg(uids[i*2], build, pkg_name, i, path)
+ if len(uids)%2 == 1:
+ CreateLastPkg(uids[-1], build, pkg_name, pairs, path)
+
+if __name__ == "__main__":
+ create_pkgs(build = 'full', path = "S60v3")
diff --git a/backends/platform/symbian/symbian_builder/scummvm_hrh.py b/backends/platform/symbian/symbian_builder/scummvm_hrh.py
index 7910537c76..c3a8e248c8 100644
--- a/backends/platform/symbian/symbian_builder/scummvm_hrh.py
+++ b/backends/platform/symbian/symbian_builder/scummvm_hrh.py
@@ -42,7 +42,7 @@ hrh_template = """
#endif
"""
-macro_templatte = """#elif defined (SCUMMVM_PT_%s)
+macro_template = """#elif defined (SCUMMVM_PT_%s)
#define ScummUid %s
"""
@@ -50,12 +50,12 @@ def Generate_ScummVm_hrh(build):
uids = get_UIDs(build)
defines = ""
for i in range(len(uids)):
- if i > 1:
- defines += macro_templatte %(i, uids[i])
+ if i > 0:
+ defines += macro_template %(i+1, uids[i])
data = hrh_template %(uids[0], defines)
SafeWriteFile(os.path.join("src", "ScummVm.hrh"), data)
if __name__ == "__main__":
- Generate_ScummVm_hrh(build = "S60v3")
+ Generate_ScummVm_hrh(build = "full")
\ No newline at end of file
diff --git a/backends/platform/symbian/symbian_builder/source_patcher.py b/backends/platform/symbian/symbian_builder/source_patcher.py
new file mode 100644
index 0000000000..6e0d43e327
--- /dev/null
+++ b/backends/platform/symbian/symbian_builder/source_patcher.py
@@ -0,0 +1,31 @@
+#format - engine name and path to file
+va_macro_src = ("sci" : "resource_patcher.cpp", )
+
+def fix_va_string(file):
+ with open(file) as f;
+ x = f.read()
+ if x.find("ARGS"): return
+ x.replace("...", "ARGS...")
+ x.replace("__VA_ARGS__", "#ARGS")
+ with open(file) as f;
+ f.write(x)
+
+def find_file(folder, file):
+ result = []
+ for dirpath, dirnames, filenames in os.walk(folder):
+ for filename in [f for f in filenames]:
+ if file in os.path.join(dirpath, filename):
+ result += os.path.join(dirpath, filename)
+ return result
+
+def fix_va_macro(folder, file):
+"Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ os.dirwalk ищем файл в папке, ее подпапках"
+ files = find_file(folder, file)
+ if Not files: return
+ [fix_va_string(x) for x in files]
+
+def fix_src():
+ [fix_va_macro(folder, file) for folder, file in va_macro_src]
+
+if name == '__main__':
+ fix_src()
\ No newline at end of file
Commit: d48a14fd08fff1aebd51a0bbc73d4a00797a496a
https://github.com/scummvm/scummvm/commit/d48a14fd08fff1aebd51a0bbc73d4a00797a496a
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2021-07-12T11:48:29+02:00
Commit Message:
SYMBIAN: Add right source_patcher.py.
Changed paths:
backends/platform/symbian/symbian_builder/source_patcher.py
diff --git a/backends/platform/symbian/symbian_builder/source_patcher.py b/backends/platform/symbian/symbian_builder/source_patcher.py
index 6e0d43e327..c454a7839b 100644
--- a/backends/platform/symbian/symbian_builder/source_patcher.py
+++ b/backends/platform/symbian/symbian_builder/source_patcher.py
@@ -1,31 +1,47 @@
-#format - engine name and path to file
-va_macro_src = ("sci" : "resource_patcher.cpp", )
+from __future__ import with_statement
+import os
+from common_names import *
+from collections import defaultdict as defdict
+
+
+#format - engine name : list of source files
+va_macro_src = [("engines\\sci", "resource_patcher.cpp"), ("engines\\ags", "managed_object_pool.h"),
+("graphics\\macgui", "mactext.cpp")]
+
+pt = '..\..\..'
def fix_va_string(file):
- with open(file) as f;
- x = f.read()
- if x.find("ARGS"): return
- x.replace("...", "ARGS...")
- x.replace("__VA_ARGS__", "#ARGS")
- with open(file) as f;
+ print "File to process: %s" %file
+ with open(file) as d:
+ x = d.read()
+ if "#ARGS" in x: #Already patched
+ print "Already patched"
+ return
+ x = x.replace("...", "ARGS...")
+ x = x.replace("__VA_ARGS__", "#ARGS")
+ with open(file, 'w') as f:
f.write(x)
-def find_file(folder, file):
+def find_file(folder, files):
result = []
- for dirpath, dirnames, filenames in os.walk(folder):
- for filename in [f for f in filenames]:
- if file in os.path.join(dirpath, filename):
- result += os.path.join(dirpath, filename)
+ directory = os.path.join(pt, folder)
+ for dirpath, dirnames, filenames in os.walk(directory):
+ for filename in filenames:
+ if filename in files:
+ result.append(os.path.join(dirpath, filename))
return result
def fix_va_macro(folder, file):
-"Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ os.dirwalk ищем файл в папке, ее подпапках"
files = find_file(folder, file)
- if Not files: return
+ if not files:
+ return
[fix_va_string(x) for x in files]
def fix_src():
- [fix_va_macro(folder, file) for folder, file in va_macro_src]
+ d = defdict(list)
+ for k, v in va_macro_src:
+ d[k].append(v)
+ [fix_va_macro(folder, file) for folder, file in d.iteritems()]
-if name == '__main__':
+if __name__ == '__main__':
fix_src()
\ No newline at end of file
Commit: f992ae017b9b0d108ca37aaaef04b79b66ea57a3
https://github.com/scummvm/scummvm/commit/f992ae017b9b0d108ca37aaaef04b79b66ea57a3
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2021-07-12T11:48:29+02:00
Commit Message:
SYMBIAN: Fix exception in thread function for piper.py and build_apps.py
Allow build older version with current symbian_builder module in case regression.
Set verbose option in installer builder instead error-checking.
Fix ugly 'crcrlf' line endings.
Changed paths:
backends/platform/symbian/symbian_builder/build_apps.py
backends/platform/symbian/symbian_builder/create_installers.py
backends/platform/symbian/symbian_builder/parse_base.py
backends/platform/symbian/symbian_builder/piper.py
backends/platform/symbian/symbian_builder/pkg_generator.py
diff --git a/backends/platform/symbian/symbian_builder/build_apps.py b/backends/platform/symbian/symbian_builder/build_apps.py
index 2d2dc7068d..a73e463495 100644
--- a/backends/platform/symbian/symbian_builder/build_apps.py
+++ b/backends/platform/symbian/symbian_builder/build_apps.py
@@ -26,6 +26,10 @@ import multiprocessing as mp
from common_names import *
+#workaround for "threading bug in strptime"
+#see - https://stackoverflow.com/questions/32245560/module-object-has-no-attribute-strptime-with-several-threads-python/46401422
+import _strptime
+
prj_template = "PRJ_MMPFILES\n%s"
prj_path = "paralell_build"
@@ -44,7 +48,7 @@ def thread_func(q, plats):
pass
else:
raise
-
+
fname = os.path.join(plats, fileName)
fname = os.path.join("..", fname)
fname = os.path.join("..", fname)
@@ -52,7 +56,7 @@ def thread_func(q, plats):
tmp = os.path.join(pth, "bld.inf")
SafeWriteFile(tmp, prj_template %fname)
-
+
#Needed because datetime.now() returns the same time for every call
start = time.strftime("%H:%M:%S")
@@ -60,12 +64,19 @@ def thread_func(q, plats):
out, err = cmd.communicate()
cmd1 = subprocess.Popen('abld build gcce urel', stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=pth, shell=True)
out1, err1 = cmd1.communicate()
+
+ end = time.strftime("%H:%M:%S" )
+ start_dt = datetime.strptime(start, '%H:%M:%S')
+ end_dt = datetime.strptime(end, '%H:%M:%S')
+ diff = (end_dt - start_dt)
+
out = out + out1
err = err + err1
# I hope it correctly stores logs in parallel tasks
# after cmd.communicate() we have ugly 'crcrlf' line endings
- SafeWriteFile(build_log, out.replace(u"\r", u""), 'a')
- SafeWriteFile(build_err, err.replace(u"\r", u""), 'a')
+ AppendToFile(build_log, out.replace(u"\r", u""))
+ AppendToFile(build_err, err.replace(u"\r", u""))
+ AppendToFile(build_time, "Engine %s build time: %s.\n" %(fileName, str(diff)) )
def build_apps(plats):
q = Queue.Queue()
diff --git a/backends/platform/symbian/symbian_builder/create_installers.py b/backends/platform/symbian/symbian_builder/create_installers.py
index 027cd4d11b..2256265f99 100644
--- a/backends/platform/symbian/symbian_builder/create_installers.py
+++ b/backends/platform/symbian/symbian_builder/create_installers.py
@@ -27,11 +27,11 @@ from common_names import *
def makesis(pkg, path):
print "pkg: %s" %pkg
- t = "makesis -c %s" %pkg
- cmd = subprocess.Popen(t, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=path, shell=True)
+ cmd = subprocess.Popen("makesis -v %s" %pkg, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=path, shell=True)
out, err = cmd.communicate()
- SafeWriteFile(build_log, out)
- SafeWriteFile(build_err, err)
+ #After cmd.communicate() we have ugly 'crcrlf' line endings
+ AppendToFile(build_log, out.replace(u"\r", u""))
+ AppendToFile(build_err, err.replace(u"\r", u""))
def create_installers(path):
t = os.listdir(path)
diff --git a/backends/platform/symbian/symbian_builder/parse_base.py b/backends/platform/symbian/symbian_builder/parse_base.py
index dc663c50b7..6ea572cdb8 100644
--- a/backends/platform/symbian/symbian_builder/parse_base.py
+++ b/backends/platform/symbian/symbian_builder/parse_base.py
@@ -65,8 +65,11 @@ def checkMacro(macro, active_conf = active_config):
def processModule_mk(folder, mmp_file, active_conf = active_config):
pth = os.path.join('..\..\..', folder)
- with open(os.path.join(pth, "module.mk")) as ff:
- f = ff.readlines()
+ try:
+ with open(os.path.join(pth, "module.mk")) as ff:
+ f = ff.readlines()
+ except IOError: #folder added in newer version
+ return
pth = os.path.join('..\..\..\..', folder)
SafeWriteFile(mmp_file, "\nSOURCEPATH %s\n" %pth, 'a')
diff --git a/backends/platform/symbian/symbian_builder/piper.py b/backends/platform/symbian/symbian_builder/piper.py
index 632d3aa2f7..0ab6d88b48 100644
--- a/backends/platform/symbian/symbian_builder/piper.py
+++ b/backends/platform/symbian/symbian_builder/piper.py
@@ -26,6 +26,10 @@ import multiprocessing as mp
from common_names import *
+#workaround for "threading bug in strptime"
+#see - https://stackoverflow.com/questions/32245560/module-object-has-no-attribute-strptime-with-several-threads-python/46401422
+import _strptime
+
prj_template = "PRJ_MMPFILES\n%s"
prj_path = "paralell_build"
diff --git a/backends/platform/symbian/symbian_builder/pkg_generator.py b/backends/platform/symbian/symbian_builder/pkg_generator.py
index 3883354b61..b502188f93 100644
--- a/backends/platform/symbian/symbian_builder/pkg_generator.py
+++ b/backends/platform/symbian/symbian_builder/pkg_generator.py
@@ -148,7 +148,6 @@ def SaveDependency(build, pkg):
sis_major_version, sis_minor_version, sis_build_number, dep_name))
def ResolvePackName(ordinal, target, build):
- print int(ordinal) + 1
tmp = package_name %(str(ordinal +1) + " " + target)
if build == 'full':
tmp += " test"
@@ -158,15 +157,15 @@ def CreateLastPkg(install_uid, build, path, ordinal, target):
pkg = path %(ordinal +1)
pkg_cmdline = path %( str(ordinal +1) + "_cmdline")
pack_name = ResolvePackName(ordinal, target, build)
-
+
SafeWriteFile(pkg, pkg_template %(pack_name, install_uid, sis_major_version, sis_minor_version, sis_build_number) )
SafeWriteFile(pkg_cmdline, pkg_template %(pack_name, install_uid, sis_major_version, sis_minor_version, sis_build_number) )
SaveDependency(build, pkg)
SaveDependency(build, pkg_cmdline)
-
+
AppendToFile(pkg, pkg_licenses_show)
AppendToFile(pkg_cmdline, pkg_licenses_show)
-
+
SaveInstallData(pkg, build, ordinal*2 + 1, toResolve = False)
SaveInstallData(pkg_cmdline, build, ordinal*2 + 1)
@@ -174,12 +173,12 @@ def CreatePkg(install_uid, build, path, ordinal, target):
pkg = path %(ordinal +1)
pkg_cmdline = path %( str(ordinal +1) + "_cmdline")
pack_name = ResolvePackName(ordinal, target, build)
-
+
SafeWriteFile(pkg, pkg_template %(pack_name, install_uid, sis_major_version, sis_minor_version, sis_build_number) )
SafeWriteFile(pkg_cmdline, pkg_template %(pack_name, install_uid, sis_major_version, sis_minor_version, sis_build_number) )
SaveDependency(build, pkg)
SaveDependency(build, pkg_cmdline)
-
+
AppendToFile(pkg, pkg_licenses_show)
AppendToFile(pkg_cmdline, pkg_licenses_show)
@@ -191,20 +190,20 @@ def CreatePkg(install_uid, build, path, ordinal, target):
def CreateFirstPkg(install_uid, build, path, target):
ext = 1
cmd = str(ext) + "_cmdline"
-
+
pkg = path %ext
pkg_cmdline = path %cmd
pack_name = ResolvePackName(0, target, build)
-
+
SafeWriteFile(pkg, pkg_template %(pack_name, install_uid, sis_major_version, sis_minor_version, sis_build_number) )
SafeWriteFile(pkg_cmdline, pkg_template %(pack_name, install_uid, sis_major_version, sis_minor_version, sis_build_number) )
-
+
AppendToFile(pkg, pkg_licenses_install)
AppendToFile(pkg_cmdline, pkg_licenses_install)
if build == 'release':
AppendToFile(pkg, mif_install)
AppendToFile(pkg_cmdline, ResolveEpocRoot(mif_install))
-
+
SaveInstallData(pkg, build, 1, toResolve = False)
SaveInstallData(pkg_cmdline, build, 1)
SaveInstallData(pkg, build, 2, toResolve = False)
Commit: 1783836a0f38845dbcc54f7bf58b3814e700f45b
https://github.com/scummvm/scummvm/commit/1783836a0f38845dbcc54f7bf58b3814e700f45b
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2021-07-12T11:48:29+02:00
Commit Message:
SYMBIAN: symbian_builder can apply single line patches.
Changed paths:
backends/platform/symbian/symbian_builder/source_patcher.py
diff --git a/backends/platform/symbian/symbian_builder/source_patcher.py b/backends/platform/symbian/symbian_builder/source_patcher.py
index c454a7839b..1eae6027f7 100644
--- a/backends/platform/symbian/symbian_builder/source_patcher.py
+++ b/backends/platform/symbian/symbian_builder/source_patcher.py
@@ -8,6 +8,14 @@ from collections import defaultdict as defdict
va_macro_src = [("engines\\sci", "resource_patcher.cpp"), ("engines\\ags", "managed_object_pool.h"),
("graphics\\macgui", "mactext.cpp")]
+#Format: "file to edit" = "parent folder", src, dst
+oneline_patch_src = [
+("ptr.h", ["common", r'#include <cstddef>', r'//#include <cstddef>']),
+
+("object.cpp", ["gui", r'error("Unable to load widget position for \'%s\'. Please check your theme files", _name.c_str());', r'warning("Unable to load widget position for \'%s\'. Please check your theme files", _name.c_str());']),
+# ("", ["", "", ""]),
+]
+
pt = '..\..\..'
def fix_va_string(file):
@@ -42,6 +50,34 @@ def fix_src():
for k, v in va_macro_src:
d[k].append(v)
[fix_va_macro(folder, file) for folder, file in d.iteritems()]
+ one_line_patch()
+
+def apply_patch(file, val):
+ print "File to process: %s\n" %file
+ with open(file) as d:
+ x = d.read()
+ if val[-1] in x: #Already patched
+ print "Already patched"
+ return
+ x = x.replace(val[1], val[-1])
+ with open(file, 'w') as f:
+ f.write(x)
+
+def patch_line(file, val):
+ val = val[0] #get nested list
+ folder = val[0]
+ if not folder:
+ raise "Prent folder for file %s not set!" %file
+ files = find_file(folder, file)
+ if not files:
+ return
+ [apply_patch(x, val) for x in files]
+
+def one_line_patch():
+ d = defdict(list)
+ for k, v in oneline_patch_src:
+ d[k].append(v)
+ [patch_line(file, val) for file, val in d.iteritems()]
if __name__ == '__main__':
- fix_src()
\ No newline at end of file
+ fix_src()
More information about the Scummvm-git-logs
mailing list