[Scummvm-git-logs] scummvm branch-2-6 -> 3d9eb53c5b1e06f7412de82d8fa655b173c58af2

[ccawley2011]

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

Summary:
3d9eb53c5b RISCOS: Use makerun to calculate the wimpslot


Commit: 3d9eb53c5b1e06f7412de82d8fa655b173c58af2
    https://github.com/scummvm/scummvm/commit/3d9eb53c5b1e06f7412de82d8fa655b173c58af2
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-07-08T22:08:37+01:00

Commit Message:
RISCOS: Use makerun to calculate the wimpslot

Changed paths:
    backends/platform/sdl/riscos/riscos.mk
    configure
    dists/riscos/!Run,feb


diff --git a/backends/platform/sdl/riscos/riscos.mk b/backends/platform/sdl/riscos/riscos.mk
index 155ef488e7b..aa97bd9e652 100644
--- a/backends/platform/sdl/riscos/riscos.mk
+++ b/backends/platform/sdl/riscos/riscos.mk
@@ -14,7 +14,12 @@ riscosdist: all
 	mkdir -p $(APP_NAME)
 	elf2aif $(EXECUTABLE) $(APP_NAME)/scummvm,ff8
 	cp ${srcdir}/dists/riscos/!Help,feb $(APP_NAME)/!Help,feb
+ifdef MAKERUN
+	$(MAKERUN) $(APP_NAME)/scummvm,ff8 ${srcdir}/dists/riscos/!Run,feb $(APP_NAME)/!Run,feb
+else
 	cp ${srcdir}/dists/riscos/!Run,feb $(APP_NAME)/!Run,feb
+	sed -i -e "s/WIMPSLOT/WimpSlot -min `du -k $(APP_NAME)/scummvm,ff8 | cut -f1`K/g" $(APP_NAME)/!Run,feb
+endif
 ifeq ($(APP_NAME),$(BASE_APP_NAME))
 	cp ${srcdir}/dists/riscos/!Boot,feb $(APP_NAME)/!Boot,feb
 	cp ${srcdir}/dists/riscos/!Sprites,ff9 $(APP_NAME)/!Sprites,ff9
@@ -24,7 +29,6 @@ else
 	cp ${srcdir}/dists/riscos/$(APP_NAME)/!Sprites,ff9 $(APP_NAME)/!Sprites,ff9
 	cp ${srcdir}/dists/riscos/$(APP_NAME)/!Sprites11,ff9 $(APP_NAME)/!Sprites11,ff9
 endif
-	sed -i -e "s/|WimpSlot/WimpSlot -min `du -k $(APP_NAME)/scummvm,ff8 | cut -f1`K/g" $(APP_NAME)/!Run,feb
 	mkdir -p $(BASE_APP_NAME)/data
 	cp $(DIST_FILES_THEMES) $(BASE_APP_NAME)/data/
 ifdef DIST_FILES_NETWORKING
diff --git a/configure b/configure
index 0f876776413..003fd9182bd 100755
--- a/configure
+++ b/configure
@@ -1860,6 +1860,12 @@ riscos)
 	elif `which tokenize >/dev/null 2>&1`; then
 		add_line_to_config_mk "TOKENIZE := tokenize"
 	fi
+	if test -e "$GCCSDK_INSTALL_ENV/bin/makerun"; then
+		add_line_to_config_mk "MAKERUN := $GCCSDK_INSTALL_ENV/bin/makerun"
+	elif `which makerun >/dev/null 2>&1`; then
+		add_line_to_config_mk "MAKERUN := makerun"
+	fi
+	echo Over here!
 	;;
 *)
 	;;
diff --git a/dists/riscos/!Run,feb b/dists/riscos/!Run,feb
index ffe66f19c87..7f467f217c9 100644
--- a/dists/riscos/!Run,feb
+++ b/dists/riscos/!Run,feb
@@ -18,7 +18,7 @@ Set Alias$Run_ScummVM Run <Obey$Dir>.scummvm %%*0 ><Choices$Write>.ScummVM.stdou
 If "<Wimp$State>"="commands" Then Set Alias$Run_ScummVM Run <Obey$Dir>.scummvm %%*0
 CDir <Choices$Write>.ScummVM
 
-|WimpSlot
+WIMPSLOT
 Run_ScummVM %*0
 
 Unset Alias$Run_ScummVM