[Scummvm-git-logs] scummvm master -> a6b97165ed6357a50fc77c090e5dd11ce4722a23

[sev-]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
12aa035034 SYMBIAN: Add ARM assembly to project file from Scumm engine
b74448f679 SYMBIAN: Avoid compiling ARM assembly for x86 emulator
a6b97165ed SYMBIAN: Fix command order


Commit: 12aa035034140d029eabe79cbe26b5f6c542cddf
    https://github.com/scummvm/scummvm/commit/12aa035034140d029eabe79cbe26b5f6c542cddf
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2021-08-20T19:45:01+02:00

Commit Message:
SYMBIAN: Add ARM assembly to project file from Scumm engine

Changed paths:
    backends/platform/symbian/symbian_builder/mmp_gen.py


diff --git a/backends/platform/symbian/symbian_builder/mmp_gen.py b/backends/platform/symbian/symbian_builder/mmp_gen.py
index bae1351b15..f1c836e95a 100644
--- a/backends/platform/symbian/symbian_builder/mmp_gen.py
+++ b/backends/platform/symbian/symbian_builder/mmp_gen.py
@@ -197,15 +197,28 @@ def FilterUltima(src):
    print "Exclude nuvie and ultima4 engines from detection_tables.h and detection.cpp!"
    return src
 
+
 def FilterGrim(src):
    src += ["SOURCE   movie/codecs/blocky8ARM.s"]
    return src
 
+
+def FilterScumm(src):
+   src += ["#if !defined(WINS)"]
+   src += ["SOURCE   proc3ARM.s"]
+   src += ["SOURCE   gfxARM.s"]
+   src += ["SOURCE   smush/codec47ARM.s"]
+   src += ["#endif"]
+   return src
+
+
 def FilterSrcs(src, engine):
    if "grim" in engine:
       return FilterGrim(src)
    if "ultima" in engine:
       return FilterUltima(src)
+   if "scumm" in engine:
+      return FilterScumm(src)
    # if "" in engine:
       # return Filter(src)
    return src


Commit: b74448f679246f918a645ea02355c2b053bee05e
    https://github.com/scummvm/scummvm/commit/b74448f679246f918a645ea02355c2b053bee05e
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2021-08-20T19:45:01+02:00

Commit Message:
SYMBIAN: Avoid compiling ARM assembly for x86 emulator

Changed paths:
    backends/platform/symbian/symbian_builder/mmp_gen.py


diff --git a/backends/platform/symbian/symbian_builder/mmp_gen.py b/backends/platform/symbian/symbian_builder/mmp_gen.py
index f1c836e95a..f1fd1d6659 100644
--- a/backends/platform/symbian/symbian_builder/mmp_gen.py
+++ b/backends/platform/symbian/symbian_builder/mmp_gen.py
@@ -199,7 +199,9 @@ def FilterUltima(src):
 
 
 def FilterGrim(src):
+   src += ["#if !defined(WINS)"]
    src += ["SOURCE   movie/codecs/blocky8ARM.s"]
+   src += ["#endif"]
    return src
 
 


Commit: a6b97165ed6357a50fc77c090e5dd11ce4722a23
    https://github.com/scummvm/scummvm/commit/a6b97165ed6357a50fc77c090e5dd11ce4722a23
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2021-08-20T19:45:01+02:00

Commit Message:
SYMBIAN: Fix command order

Changed paths:
    backends/platform/symbian/symbian_builder/mmp_gen.py


diff --git a/backends/platform/symbian/symbian_builder/mmp_gen.py b/backends/platform/symbian/symbian_builder/mmp_gen.py
index f1fd1d6659..5957d90bb7 100644
--- a/backends/platform/symbian/symbian_builder/mmp_gen.py
+++ b/backends/platform/symbian/symbian_builder/mmp_gen.py
@@ -247,6 +247,7 @@ def MakeMMP(engine):
    staticlib = tt[1]
 
    src = processModule_mk(pth, macrolist)
+   src = ProcessDup(src)
    src = FilterSrcs(src, engine)
 
    mmp = """TARGET scummvm_%s.lib
@@ -265,8 +266,6 @@ SOURCEPATH   ..\..\..\..\engines\%s\n
    if mmp is None:
       return
 
-   src = ProcessDup(src)
-
    plugins_table = """
 #if PLUGIN_ENABLED_STATIC(%s)
 LINK_PLUGIN(%s)