[Scummvm-git-logs] scummvm master -> 663a07c68989dacccc1e2d8ede4964331057af5f
lotharsm
mail at serra.me
Wed Dec 2 20:47:37 UTC 2020
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:
f8e3dafb19 AMIGAOS: Update configure
dc29fd513a AMIGAOS: Update amigaos-main.cpp
795bc3f583 AMIGAOS: Fix whitespace and revert a change not yet ripe
663a07c689 AMIGAOS: Reflect changes in NEWS.md
Commit: f8e3dafb19f925b16e3833014b7c9f35c2bba8fc
https://github.com/scummvm/scummvm/commit/f8e3dafb19f925b16e3833014b7c9f35c2bba8fc
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2020-12-02T21:47:31+01:00
Commit Message:
AMIGAOS: Update configure
Changed paths:
configure
diff --git a/configure b/configure
index c9d2589b36..5510fd9a91 100755
--- a/configure
+++ b/configure
@@ -2702,19 +2702,27 @@ case $_host_os in
append_var LIBS "-lcitro3d"
;;
amigaos*)
+ # On building dynamic, everything (possible) should be built as plugin.
+ if test "$_dynamic_modules" = yes ; then
+ _detection_features_static=no
+ _plugins_default=dynamic
+ fi
+ # We have to use 'long' for our 4 byte typedef, because AmigaOS
+ # already typedefs (u)int32 as (unsigned) long and consequently we'd
+ # get a compiler error otherwise.
+ type_4_byte='long'
+ # Supress format warnings as the long 4 byte causes noisy warnings.
+ append_var CXXFLAGS "-Wno-format"
+ # Enable optimizations for non-debug builds
if test "$_debug_build" = no; then
_optimization_level=-O2
fi
append_var LDFLAGS "-Wl,--export-dynamic"
append_var LDFLAGS "-L/sdk/local/newlib/lib"
- # We have to use 'long' for our 4 byte typedef because AmigaOS already typedefs (u)int32
- # as (unsigned) long, and consequently we'd get a compiler error otherwise.
- type_4_byte='long'
- # Supress format warnings as the long 4 byte causes noisy warnings.
- append_var CXXFLAGS "-Wno-format"
add_line_to_config_mk 'AMIGAOS = 1'
_port_mk="backends/platform/sdl/amigaos/amigaos.mk"
- _nuked_opl=no
+ # Leave out resources by default, save binary size.
+ _builtin_resources=no
;;
android)
case $_host in
Commit: dc29fd513a4b87aded221eb8d4c4eb7fd405c148
https://github.com/scummvm/scummvm/commit/dc29fd513a4b87aded221eb8d4c4eb7fd405c148
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2020-12-02T21:47:31+01:00
Commit Message:
AMIGAOS: Update amigaos-main.cpp
Changed paths:
backends/platform/sdl/amigaos/amigaos-main.cpp
diff --git a/backends/platform/sdl/amigaos/amigaos-main.cpp b/backends/platform/sdl/amigaos/amigaos-main.cpp
index c598c3117f..e97d22a750 100644
--- a/backends/platform/sdl/amigaos/amigaos-main.cpp
+++ b/backends/platform/sdl/amigaos/amigaos-main.cpp
@@ -31,38 +31,34 @@
int main(int argc, char *argv[]) {
- // The following will gather ScummVM's system application name
- // and add the binary path to a variable in AmigaOS ENV(ARC) system.
- // It will be added to AppPaths, so ScummVM becomes AmiUpdate aware.
+ // Update support (AmiUpdate):
+ // This will save ScummVM's system application name and add it's binary
+ // path to a variable in the platforms native ENV(ARC) system.
const char *const appname = "ScummVM";
BPTR lock;
- APTR oldwin;
+ APTR reqwin;
- // Obtain a lock to the home directory.
+ // Obtain a lock to it's home directory.
if ((lock = IDOS->GetProgramDir())) {
TEXT progpath[2048];
TEXT apppath[1024] = "AppPaths";
- if (IDOS->DevNameFromLock(lock,
- progpath,
- sizeof(progpath),
- DN_FULLPATH)) {
+ if (IDOS->DevNameFromLock(lock, progpath, sizeof(progpath), DN_FULLPATH)) {
+ // Stop any "Please insert volume ..." type system requester.
+ reqwin = IDOS->SetProcWindow((APTR)-1);
- // Stop any "Insert volume..." type requesters.
- oldwin = IDOS->SetProcWindow((APTR)-1);
+ // Set the AppPaths variable to the path the binary was run from.
+ IDOS->AddPart(apppath, appname, 1024);
+ IDOS->SetVar(apppath, progpath, -1, GVF_GLOBAL_ONLY|GVF_SAVE_VAR );
- // Finally, set the variable to the path the executable was run from.
- IDOS->AddPart( apppath, appname, 1024);
- IDOS->SetVar( apppath, progpath, -1, GVF_GLOBAL_ONLY|GVF_SAVE_VAR );
-
- // Turn system requesters back on.
- IDOS->SetProcWindow( oldwin );
+ // Turn system requester back on.
+ IDOS->SetProcWindow(reqwin);
}
}
- // Set up a stack cookie to avoid crashes from a stack set too low.
- static const char *stack_cookie __attribute__((used)) = "$STACK: 2048000";
+ // Set a stack cookie to avoid crashes from a too low stack.
+ static const char *stack_cookie __attribute__((used)) = "$STACK: 20971520";
// Create our OSystem instance.
g_system = new OSystem_AmigaOS();
Commit: 795bc3f5830b96f16ab1c86dc916d90586c4999d
https://github.com/scummvm/scummvm/commit/795bc3f5830b96f16ab1c86dc916d90586c4999d
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2020-12-02T21:47:31+01:00
Commit Message:
AMIGAOS: Fix whitespace and revert a change not yet ripe
Changed paths:
backends/platform/sdl/amigaos/amigaos-main.cpp
diff --git a/backends/platform/sdl/amigaos/amigaos-main.cpp b/backends/platform/sdl/amigaos/amigaos-main.cpp
index e97d22a750..337d8e1c9b 100644
--- a/backends/platform/sdl/amigaos/amigaos-main.cpp
+++ b/backends/platform/sdl/amigaos/amigaos-main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char *argv[]) {
// Set the AppPaths variable to the path the binary was run from.
IDOS->AddPart(apppath, appname, 1024);
- IDOS->SetVar(apppath, progpath, -1, GVF_GLOBAL_ONLY|GVF_SAVE_VAR );
+ IDOS->SetVar(apppath, progpath, -1, GVF_GLOBAL_ONLY|GVF_SAVE_VAR);
// Turn system requester back on.
IDOS->SetProcWindow(reqwin);
@@ -58,7 +58,7 @@ int main(int argc, char *argv[]) {
}
// Set a stack cookie to avoid crashes from a too low stack.
- static const char *stack_cookie __attribute__((used)) = "$STACK: 20971520";
+ static const char *stack_cookie __attribute__((used)) = "$STACK: 2048000";
// Create our OSystem instance.
g_system = new OSystem_AmigaOS();
Commit: 663a07c68989dacccc1e2d8ede4964331057af5f
https://github.com/scummvm/scummvm/commit/663a07c68989dacccc1e2d8ede4964331057af5f
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2020-12-02T21:47:31+01:00
Commit Message:
AMIGAOS: Reflect changes in NEWS.md
Changed paths:
NEWS.md
diff --git a/NEWS.md b/NEWS.md
index 52c2a31e2a..3576d09a7b 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -80,6 +80,10 @@ For a more comprehensive changelog of the latest experimental code, see:
- Fixed occasional border corruption during fights.
- Improvements to cutscenes to better match the original games.
+ AmigaOS port:
+ - Add native system file browser feature
+ - Re-activate nuked OPL Adlib driver
+
MorphOS port:
- Add native system file browser feature
- Add Cloud feature
More information about the Scummvm-git-logs
mailing list