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

sev- noreply at scummvm.org
Sun Dec 3 12:00:07 UTC 2023


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

Summary:
8d8875159f BUILD: Cleanup plugin files on RiscOS and PSP2. Bug #13902
b88dba59c3 CONFIGURE: Implement sanity check of dynamic detection vs static plugins mismatch. Bug #13746


Commit: 8d8875159f558fc047283450d6ff538e21b01d76
    https://github.com/scummvm/scummvm/commit/8d8875159f558fc047283450d6ff538e21b01d76
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-12-03T12:59:49+01:00

Commit Message:
BUILD: Cleanup plugin files on RiscOS and PSP2. Bug #13902

Changed paths:
    Makefile.common
    configure


diff --git a/Makefile.common b/Makefile.common
index 491a036e3dd..a9d8568362d 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -153,7 +153,7 @@ distclean: clean clean-devtools clean-test
 clean: clean-toplevel
 clean-toplevel:
 	$(RM_REC) $(DEPDIRS)
-	$(RM) $(OBJS) $(DETECT_OBJS) $(EXECUTABLE)
+	$(RM) $(OBJS) $(DETECT_OBJS) $(EXECUTABLE) $(PLUGIN_OBJ_FILES)
 ifdef SPLIT_DWARF
 	$(RM) $(OBJS:.o=.dwo) $(DETECT_OBJS:.o=.dwo)
 	$(RM) $(EXECUTABLE).dwp
diff --git a/configure b/configure
index e8cba710fa0..537acc08449 100755
--- a/configure
+++ b/configure
@@ -4945,6 +4945,7 @@ PLUGIN_LDFLAGS		+= -Wl,-T$(srcdir)/backends/plugins/psp/plugin.ld -Wl,-zmax-page
 		append_var DEFINES "-DUNCACHED_PLUGINS"
 _mak_plugins='
 PLUGIN_EXTRA_DEPS	= $(EXECUTABLE) backends/plugins/psp2/plugin.o
+PLUGIN_OBJ_FILES    += backends/plugins/psp2/plugin.o
 PLUGIN_LDFLAGS		+= -nostartfiles -nodefaultlibs backends/plugins/psp2/plugin.o -Wl,-q -Xlinker --just-symbols -Xlinker $(EXECUTABLE) -lgcc
 PRE_OBJS_FLAGS		:= -Wl,--whole-archive
 POST_OBJS_FLAGS		:= -Wl,--no-whole-archive
@@ -4958,6 +4959,7 @@ POST_OBJS_FLAGS		:= -Wl,--no-whole-archive
 		append_var DEFINES "-DELF_NO_MEM_MANAGER"
 _mak_plugins='
 PLUGIN_EXTRA_DEPS	+= backends/plugins/riscos/plugin.o
+PLUGIN_OBJ_FILES    += backends/plugins/riscos/plugin.o
 PLUGIN_LDFLAGS		+= -static -Wl,-T$(srcdir)/backends/plugins/riscos/plugin.ld backends/plugins/riscos/plugin.o -Wl,--wrap=__rt_stkovf_split_small -Wl,--wrap=__rt_stkovf_split_big
 '
 		;;


Commit: b88dba59c312ec2c01d321f903c9d1883dd0fc98
    https://github.com/scummvm/scummvm/commit/b88dba59c312ec2c01d321f903c9d1883dd0fc98
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-12-03T12:59:52+01:00

Commit Message:
CONFIGURE: Implement sanity check of dynamic detection vs static plugins mismatch. Bug #13746

This patches the problem instead of enforcing dynamic plugins. However, we explicitely
disable dynamic plugins on many platform (mainly when those are not implemented),
thus, by this sanity check, we enforce the developer to test explicit configuration.

Changed paths:
    configure


diff --git a/configure b/configure
index 537acc08449..b8a943b6ae8 100755
--- a/configure
+++ b/configure
@@ -4999,6 +4999,15 @@ if test "$_dynamic_modules" = yes ; then
 	add_line_to_config_mk "PLUGIN_SUFFIX := $_plugin_suffix"
 fi
 
+if test "$_detection_features_static" = no ; then
+	if test "$_dynamic_modules" = no ; then
+		echo "Inconsistency detected: dynamic detection plugin enabled while static plugins are requested."
+		echo "   ...forcing detection plugin to be static too. Add --enable-plugins if you really want it"
+
+		_detection_features_static=yes
+	fi
+fi
+
 #
 # Set up a define for detection to be used as static or not
 #




More information about the Scummvm-git-logs mailing list