thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RISCOS: Use makerun to calculate the wimpslot

Browse source
This commit is contained in:
Cameron Cawley 2022-07-08 22:07:32 +01:00
parent d1062bf9dd
commit 80f90a15a5
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backends/platform/sdl/riscos/riscos.mk
View file

@ -14,7 +14,12 @@ riscosdist: all
mkdir -p $(APP_NAME) mkdir -p $(APP_NAME)
elf2aif $(EXECUTABLE) $(APP_NAME)/scummvm,ff8 elf2aif $(EXECUTABLE) $(APP_NAME)/scummvm,ff8
cp ${srcdir}/dists/riscos/!Help,feb $(APP_NAME)/!Help,feb 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 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)) ifeq ($(APP_NAME),$(BASE_APP_NAME))
cp ${srcdir}/dists/riscos/!Boot,feb $(APP_NAME)/!Boot,feb cp ${srcdir}/dists/riscos/!Boot,feb $(APP_NAME)/!Boot,feb
cp ${srcdir}/dists/riscos/!Sprites,ff9 $(APP_NAME)/!Sprites,ff9 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)/!Sprites,ff9 $(APP_NAME)/!Sprites,ff9
cp ${srcdir}/dists/riscos/$(APP_NAME)/!Sprites11,ff9 $(APP_NAME)/!Sprites11,ff9 cp ${srcdir}/dists/riscos/$(APP_NAME)/!Sprites11,ff9 $(APP_NAME)/!Sprites11,ff9
endif 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 mkdir -p $(BASE_APP_NAME)/data
cp $(DIST_FILES_THEMES) $(BASE_APP_NAME)/data/ cp $(DIST_FILES_THEMES) $(BASE_APP_NAME)/data/
ifdef DIST_FILES_NETWORKING ifdef DIST_FILES_NETWORKING

6
configure vendored
View file

@ -1857,6 +1857,12 @@ riscos)
elif `which tokenize >/dev/null 2>&1`; then elif `which tokenize >/dev/null 2>&1`; then
add_line_to_config_mk "TOKENIZE := tokenize" add_line_to_config_mk "TOKENIZE := tokenize"
fi 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!
;; ;;
*) *)
;; ;;

2
dists/riscos/!Run,feb
View file

@ -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 If "<Wimp$State>"="commands" Then Set Alias$Run_ScummVM Run <Obey$Dir>.scummvm %%*0
CDir <Choices$Write>.ScummVM CDir <Choices$Write>.ScummVM
|WimpSlot WIMPSLOT
Run_ScummVM %*0 Run_ScummVM %*0
Unset Alias$Run_ScummVM Unset Alias$Run_ScummVM