[Scummvm-git-logs] scummvm master -> 7f55b1016b537af1a2ba0b6d285497199cdfd66b
bluegr
noreply at scummvm.org
Sat May 21 19:13:19 UTC 2022
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
dc0a7ccd19 AMIGAOS: Configure - Streamline platform target
a3d0edd57e EMSCRIPTEN: Configure - Sort emscripten target alphabetically
f53966e72c AMIGAOS/MORPHOS: Configure - Use DL and "strip" flag
b8e0236f95 AMIGAOS: Remove old installs before installing release builds
21150d398f AMIGAOS/MORPHOS: Split dynamic targets
7f55b1016b AMIGAOS: Revert automatically added flags
Commit: dc0a7ccd19abbe4038ff819f4d5129a2e7f8e89c
https://github.com/scummvm/scummvm/commit/dc0a7ccd19abbe4038ff819f4d5129a2e7f8e89c
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-05-21T22:13:14+03:00
Commit Message:
AMIGAOS: Configure - Streamline platform target
- Add some gcc safeguard switches
- Comments and typo
Changed paths:
configure
diff --git a/configure b/configure
index 79c7f9bcbec..38e70698bb1 100755
--- a/configure
+++ b/configure
@@ -2569,25 +2569,32 @@ case $_host_os in
append_var LIBS "-lcitro3d"
;;
amigaos*)
- # On building dynamic, everything (possible) should be built as plugin.
+ # Leave out resources by default to save binary size
+ _builtin_resources=no
+ # AmigaOS (PPC) target
+ _port_mk="backends/platform/sdl/amigaos/amigaos.mk"
+ add_line_to_config_mk 'AMIGAOS = 1'
+ append_var CXXFLAGS "-mlongcall"
+ # Enable optimizations for non-debug builds
+ if test "$_debug_build" = no; then
+ _optimization_level=-O2
+ append_var CXXFLAGS "-fomit-frame-pointer"
+ append_var CXXFLAGS "-fstrict-aliasing"
+ else
+ _optimization_level=-O0
+ append_var CXXFLAGS "-fno-omit-frame-pointer"
+ append_var CXXFLAGS "-fno-strict-aliasing"
+ fi
+ # When building dynamic, add everything possible 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.
+ # Use 'long' for ScummVM's 4 byte typedef, because
+ # AmigaOS already typedefs (u)int32 as (unsigned) long
type_4_byte='long'
- # Supress format warnings, as the 'long' 4 byte causes noisy ones.
+ # Suppress format warnings as the 'long' 4 byte causes noisy ones
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"
- add_line_to_config_mk 'AMIGAOS = 1'
- _port_mk="backends/platform/sdl/amigaos/amigaos.mk"
- # Leave out resources by default, save binary size.
- _builtin_resources=no
;;
android)
case $_host in
Commit: a3d0edd57e85e9b55ce0acc42ffe5797e15f3c57
https://github.com/scummvm/scummvm/commit/a3d0edd57e85e9b55ce0acc42ffe5797e15f3c57
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-05-21T22:13:14+03:00
Commit Message:
EMSCRIPTEN: Configure - Sort emscripten target alphabetically
Changed paths:
configure
diff --git a/configure b/configure
index 38e70698bb1..9c4b75690e1 100755
--- a/configure
+++ b/configure
@@ -4041,18 +4041,6 @@ _mak_plugins=
if test "$_dynamic_modules" = yes ; then
echo_n "Checking whether building plugins is supported... "
case $_host_os in
- emscripten)
- _plugin_prefix="lib"
- _plugin_suffix=".wasm"
- append_var CXXFLAGS "-fPIC"
- append_var LIBS ""
-_mak_plugins='
-PLUGIN_EXTRA_DEPS =
-PLUGIN_LDFLAGS += -s SIDE_MODULE=1 -s EXPORT_ALL=1
-PRE_OBJS_FLAGS := -s MAIN_MODULE=1 -s EXPORT_ALL=1
-POST_OBJS_FLAGS :=
-'
- ;;
3ds)
_elf_loader=yes
append_var DEFINES "-DUNCACHED_PLUGINS"
@@ -4121,6 +4109,18 @@ POST_OBJS_FLAGS := -Wl,--no-whole-archive
append_var DEFINES "-DELF_NO_MEM_MANAGER"
_mak_plugins='
PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/ds/plugin.ld -mthumb -mthumb-interwork -mfloat-abi=soft
+'
+ ;;
+ emscripten)
+ _plugin_prefix="lib"
+ _plugin_suffix=".wasm"
+ append_var CXXFLAGS "-fPIC"
+ append_var LIBS ""
+_mak_plugins='
+PLUGIN_EXTRA_DEPS =
+PLUGIN_LDFLAGS += -s SIDE_MODULE=1 -s EXPORT_ALL=1
+PRE_OBJS_FLAGS := -s MAIN_MODULE=1 -s EXPORT_ALL=1
+POST_OBJS_FLAGS :=
'
;;
freebsd* | openbsd*)
Commit: f53966e72c871d6a3940cc9c210d2a2f5e64b755
https://github.com/scummvm/scummvm/commit/f53966e72c871d6a3940cc9c210d2a2f5e64b755
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-05-21T22:13:14+03:00
Commit Message:
AMIGAOS/MORPHOS: Configure - Use DL and "strip" flag
@BeWorld2018
- Change plugin naming
- Add using dl library for dynamic
- Add "x" flag for strip to preserve global symbols with dynamic (honestly stolen from @dwatteau and #3877) ;-)
I'd like to get your confirmation on this, since it also touches MorphOS.
Otherwise i'll have to split targets.
Conforming to many of the other platforms use of plugin naming
and to distinguish between ScummVM's engine plugins and the OS'
shared objects/libraries names.
Changed paths:
configure
diff --git a/configure b/configure
index 9c4b75690e1..0c7d45742f7 100755
--- a/configure
+++ b/configure
@@ -4049,10 +4049,12 @@ PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/3ds/plugin.ld -march=armv6k
'
;;
amigaos | morphos)
- _plugin_prefix="lib"
- _plugin_suffix=".so"
+ _plugin_prefix=""
+ _plugin_suffix=".plugin"
append_var CXXFLAGS "-fPIC"
append_var LIBS "-use-dynld"
+ append_var LIBS "-ldl -lauto"
+ append_var _strip "-x"
_mak_plugins='
PLUGIN_EXTRA_DEPS =
PLUGIN_LDFLAGS += -shared
Commit: b8e0236f956ebcc9fca50904ba7a5e85b5d9431a
https://github.com/scummvm/scummvm/commit/b8e0236f956ebcc9fca50904ba7a5e85b5d9431a
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-05-21T22:13:14+03:00
Commit Message:
AMIGAOS: Remove old installs before installing release builds
Changed paths:
backends/platform/sdl/amigaos/amigaos.mk
diff --git a/backends/platform/sdl/amigaos/amigaos.mk b/backends/platform/sdl/amigaos/amigaos.mk
index 8285c6f2473..5152711e984 100644
--- a/backends/platform/sdl/amigaos/amigaos.mk
+++ b/backends/platform/sdl/amigaos/amigaos.mk
@@ -3,12 +3,15 @@
# WORKAROUNDS:
#
# 'mkdir' seems to incorrectly set permissions to path/dirs on AmigaOS.
-# Once a vanilla installation was created, none of the special subdirectories
-# are found/accessible (extras, themes, plugins), instead ScummVM reports
-# missing theme files and a missing valid translation.dat.
+# Once a vanilla installation is created, none of the corresponding subdirs
+# are found or accessible (extras, themes, plugins), instead ScummVM will
+# report missing theme files and a missing valid translation.dat. Same with
+# cross-partition access (which make we wonder if it's a FS bug afterall).
# Switching to AmigaOS' own "makedir" until there is a fix or other solution.
#
amigaosdist: $(EXECUTABLE) $(PLUGINS)
+ # Releases should always be completely fresh installs.
+ rm -rf $(AMIGAOSPATH)
makedir all $(AMIGAOSPATH)
cp ${srcdir}/dists/amigaos/scummvm_drawer.info $(patsubst %/,%,$(AMIGAOSPATH)).info
cp ${srcdir}/dists/amigaos/scummvm.info $(AMIGAOSPATH)/$(EXECUTABLE).info
@@ -16,13 +19,11 @@ ifdef DIST_FILES_DOCS
makedir all $(AMIGAOSPATH)/doc
cp $(DIST_FILES_DOCS) $(AMIGAOSPATH)/doc
$(foreach lang, $(DIST_FILES_DOCS_languages), makedir all $(AMIGAOSPATH)/doc/$(lang); cp $(DIST_FILES_DOCS_$(lang)) $(AMIGAOSPATH)/doc/$(lang);)
- # README.md must be in the current working directory
+ # README.md and corresponding scripts must be in cwd
# when building out of tree.
cp ${srcdir}/README.md README.tmp
- # AmigaOS AREXX will error with a "Program not found" message
- # if srcdir is '.'. Copy the script to cwd instead.
cp ${srcdir}/dists/amigaos/md2ag.rexx .
- # LC_ALL is here to workaround Debian bug #973647
+ # (buildbot) LC_ALL is here to work around Debian bug #973647
LC_ALL=C rx md2ag.rexx README.tmp $(AMIGAOSPATH)/doc/
rm -f md2ag.rexx README.tmp
endif
@@ -45,19 +46,16 @@ ifneq ($(DIST_FILES_SHADERS),)
makedir all $(AMIGAOSPATH)/extras/shaders
cp $(DIST_FILES_SHADERS) $(AMIGAOSPATH)/extras/shaders
endif
- # Strip and copy engine plugins.
ifdef DYNAMIC_MODULES
makedir all $(AMIGAOSPATH)/plugins
$(foreach plugin, $(PLUGINS), $(STRIP) $(plugin) -o $(AMIGAOSPATH)/$(plugin);)
- # Shared objects get updates. To avoid conflicts with obsolete
- # or outdated .so's, always remove and install them completely.
- rm -rf $(AMIGAOSPATH)/sobjs
makedir all $(AMIGAOSPATH)/sobjs
- # Extract and install compiled-in shared libraries.
- # Not every AmigaOS install, especially vanilla ones, will have
- # every mandatory shared library, in the correct place, available.
+ # AmigaOS installations, especially vanilla ones, won't have every
+ # mandatory shared library in place, let alone the correct versions.
+ # Extract and install compiled-in shared libraries to their own subdir.
cp ${srcdir}/dists/amigaos/Ext_Inst_so.rexx .
rx Ext_Inst_so.rexx $(EXECUTABLE) $(AMIGAOSPATH)
rm -f Ext_Inst_so.rexx
endif
$(STRIP) $(EXECUTABLE) -o $(AMIGAOSPATH)/$(EXECUTABLE)
+
Commit: 21150d398f056a342dcb561c0cb941e8ffbb0748
https://github.com/scummvm/scummvm/commit/21150d398f056a342dcb561c0cb941e8ffbb0748
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-05-21T22:13:14+03:00
Commit Message:
AMIGAOS/MORPHOS: Split dynamic targets
I think it´s better to split the targets, that way i can break my target without bothering the MorphOS maintainer
Changed paths:
configure
diff --git a/configure b/configure
index 0c7d45742f7..6c99ec3ced1 100755
--- a/configure
+++ b/configure
@@ -4048,12 +4048,13 @@ _mak_plugins='
PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/3ds/plugin.ld -march=armv6k -mfloat-abi=hard
'
;;
- amigaos | morphos)
+ amigaos)
_plugin_prefix=""
_plugin_suffix=".plugin"
append_var CXXFLAGS "-fPIC"
append_var LIBS "-use-dynld"
- append_var LIBS "-ldl -lauto"
+ append_var LIBS "-ldl"
+ append_var LIBS "-lauto"
append_var _strip "-x"
_mak_plugins='
PLUGIN_EXTRA_DEPS =
@@ -4189,6 +4190,18 @@ PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
PLUGIN_LDFLAGS := -Wl,--enable-auto-import -shared ./libscummvm.a
PRE_OBJS_FLAGS := -Wl,--whole-archive
POST_OBJS_FLAGS := -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libscummvm.a
+'
+ ;;
+ morphos)
+ _plugin_prefix="lib"
+ _plugin_suffix=".so"
+ append_var CXXFLAGS "-fPIC"
+ append_var LIBS "-use-dynld"
+_mak_plugins='
+PLUGIN_EXTRA_DEPS =
+PLUGIN_LDFLAGS += -shared
+PRE_OBJS_FLAGS := -Wl,-export-dynamic -Wl,-whole-archive
+POST_OBJS_FLAGS := -Wl,-no-whole-archive
'
;;
psp)
Commit: 7f55b1016b537af1a2ba0b6d285497199cdfd66b
https://github.com/scummvm/scummvm/commit/7f55b1016b537af1a2ba0b6d285497199cdfd66b
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-05-21T22:13:14+03:00
Commit Message:
AMIGAOS: Revert automatically added flags
As it seems those two optimizations flags are already automatically added by using -O2
Changed paths:
configure
diff --git a/configure b/configure
index 6c99ec3ced1..2a64fa25fae 100755
--- a/configure
+++ b/configure
@@ -2578,8 +2578,6 @@ case $_host_os in
# Enable optimizations for non-debug builds
if test "$_debug_build" = no; then
_optimization_level=-O2
- append_var CXXFLAGS "-fomit-frame-pointer"
- append_var CXXFLAGS "-fstrict-aliasing"
else
_optimization_level=-O0
append_var CXXFLAGS "-fno-omit-frame-pointer"
@@ -2590,10 +2588,10 @@ case $_host_os in
_detection_features_static=no
_plugins_default=dynamic
fi
- # Use 'long' for ScummVM's 4 byte typedef, because
- # AmigaOS already typedefs (u)int32 as (unsigned) long
+ # Use 'long' for ScummVM's 4 byte typedef, because AmigaOS
+ # already typedefs (u)int32 as (unsigned) long and suppress
+ # those noisy format warnings caused by the 'long' 4 byte
type_4_byte='long'
- # Suppress format warnings as the 'long' 4 byte causes noisy ones
append_var CXXFLAGS "-Wno-format"
;;
android)
More information about the Scummvm-git-logs
mailing list