RISCOS: Add RISC OS support

.gitignore

@@ -21,6 +21,8 @@
 /ScummVM Tools.app
 /scummvm-tools
 /scummvm-tools-cli
+/\!ScummTool
+/*,e1f
 /config.mk
 /config.h
 /config.log

Makefile

@@ -260,3 +260,47 @@ endif
 	cp $(srcdir)/COPYING $(AMIGAOS4PATH)/tools/COPYING.txt
 	cp $(srcdir)/README $(AMIGAOS4PATH)/tools/README.txt
 	cp $(srcdir)/NEWS $(AMIGAOS4PATH)/tools/NEWS.txt
+
+#
+# RISC OS specific
+#
+
+# Special target to create an RISC OS snapshot installation
+riscosdist: all
+	mkdir -p !ScummTool
+	cp ${srcdir}/dists/riscos/!Boot,feb !ScummTool/!Boot,feb
+	cp ${srcdir}/dists/riscos/!Run,feb !ScummTool/!Run,feb
+	cp ${srcdir}/dists/riscos/!Sprites,ff9 !ScummTool/!Sprites,ff9
+	cp ${srcdir}/dists/riscos/!Sprites11,ff9 !ScummTool/!Sprites11,ff9
+	cp $(srcdir)/README !ScummTool/!Help,fff
+	cp $(srcdir)/COPYING !ScummTool/COPYING,fff
+	cp $(srcdir)/NEWS !ScummTool/NEWS,fff
+	mkdir -p !ScummTool/bin
+	elf2aif construct_mohawk$(EXEEXT) !ScummTool/bin/construct_mohawk,ff8
+	elf2aif decine$(EXEEXT) !ScummTool/bin/decine,ff8
+	elf2aif degob$(EXEEXT) !ScummTool/bin/degob,ff8
+	elf2aif dekyra$(EXEEXT) !ScummTool/bin/dekyra,ff8
+	elf2aif deriven$(EXEEXT) !ScummTool/bin/deriven,ff8
+	elf2aif descumm$(EXEEXT) !ScummTool/bin/descumm,ff8
+	elf2aif desword2$(EXEEXT) !ScummTool/bin/desword2,ff8
+	elf2aif extract_mohawk$(EXEEXT) !ScummTool/bin/extract_mohawk,ff8
+	elf2aif gob_loadcalc$(EXEEXT) !ScummTool/bin/gob_loadcalc,ff8
+	elf2aif scummvm-tools-cli$(EXEEXT) !ScummTool/bin/scummvm-tools-cli,ff8
+ifeq "$(USE_FREETYPE)" "1"
+ifeq "$(USE_ICONV)" "1"
+	elf2aif create_sjisfnt$(EXEEXT) !ScummTool/bin/create_sjisfnt,ff8
+	echo "Set Alias\$$create_sjisfnt <ScummTool\$$Dir>.bin.create_sjisfnt %%*0" >> !ScummTool/!Boot,feb
+endif
+endif
+ifeq "$(USE_BOOST)" "1"
+	elf2aif decompile$(EXEEXT) !ScummTool/bin/decompile,ff8
+	echo "Set Alias\$$decompile <ScummTool\$$Dir>.bin.decompile %%*0" >> !ScummTool/!Boot,feb
+endif
+ifeq "$(USE_WXWIDGETS)" "1"
+	elf2aif scummvm-tools$(EXEEXT) !ScummTool/bin/scummvm-tools,ff8
+	echo "Set Alias\$$scummvm-tools <ScummTool\$$Dir>.bin.scummvm-tools %%*0" >> !ScummTool/!Boot,feb
+	mkdir -p !ScummTool/bin/media
+	cp $(srcdir)/gui/media/detaillogo.jpg !ScummTool/bin/media/detaillogo.jpg,c85
+	cp $(srcdir)/gui/media/logo.jpg !ScummTool/bin/media/logo.jpg,c85
+	cp $(srcdir)/gui/media/tile.gif !ScummTool/bin/media/tile.gif,695
+endif

configure

@@ -269,8 +269,8 @@ find_wxconfig() {
 #
 get_system_exe_extension() {
 	case $1 in
-	arm-riscos)
-		_exeext=",ff8"
+	riscos)
+		_exeext=",e1f"
 		;;
 	dreamcast | ds | gamecube | n64 | ps2 | psp | wii)
 		_exeext=".elf"
@@ -517,10 +517,6 @@ android | android-v7a)
 	_host_cpu=arm
 	_host_alias=arm-linux-androideabi
 	;;
-arm-riscos)
-	_host_os=riscos
-	_host_cpu=arm
-	;;
 bada)
 	_host_os=bada
 	if test "$_debug_build" = yes; then
@@ -1244,6 +1240,14 @@ case $_host_os in
 	mint*)
 		DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		;;
+	riscos)
+		DEFINES="$DEFINES -DRISCOS"
+		add_line_to_config_mk 'RISCOS = 1'
+		LDFLAGS="$LDFLAGS -L$GCCSDK_INSTALL_ENV/lib"
+		CXXFLAGS="$CXXFLAGS -I$GCCSDK_INSTALL_ENV/include"
+		_wxconfig=$GCCSDK_INSTALL_ENV/bin/wx-config
+		LDFLAGS="$LDFLAGS -static"
+		;;
 	solaris*)
 		DEFINES="$DEFINES -DSOLARIS"
 		DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
@@ -1258,13 +1262,20 @@ if test -n "$_host"; then
 	case "$_host" in
 		arm-linux|arm*-linux-gnueabi|arm-*-linux)
 			;;
-		arm-riscos|linupy)
-			DEFINES="$DEFINES -DLINUPY"
+		arm-*riscos)
+			# toolchain binaries prefixed by host
+			_ranlib=$_host-ranlib
+			_strip=$_host-strip
+			_ar="$_host-ar cru"
+			_as="$_host-as"
 			;;
 		*darwin*)
 			_ranlib=$_host-ranlib
 			_strip=$_host-strip
 			;;
+		linupy)
+			DEFINES="$DEFINES -DLINUPY"
+			;;
 		m68k-atari-mint)
 			DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 			_ranlib=m68k-atari-mint-ranlib
@@ -1310,7 +1321,7 @@ case $_host_os in
 	amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | psp | wii | wince)
 		_posix=no
 		;;
-	android | beos* | bsd* | darwin* | freebsd* | gph-linux | haiku* | hpux* | iphone | irix* | linux* | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
+	android | beos* | bsd* | darwin* | freebsd* | gph-linux | haiku* | hpux* | iphone | irix* | linux* | mint* | netbsd* | openbsd* | riscos | solaris* | sunos* | uclinux* | webos)
 		_posix=yes
 		;;
 	os2-emx*)

dists/riscos/!Boot,feb

@@ -0,0 +1,13 @@
+Set ScummTool$Dir <Obey$Dir>
+IconSprites <ScummTool$Dir>.!Sprites
+
+Set Alias$scummvm-tools-cli <ScummTool$Dir>.bin.scummvm-tools-cli %%*0
+Set Alias$construct_mohawk <ScummTool$Dir>.bin.construct_mohawk %%*0
+Set Alias$extract_mohawk <ScummTool$Dir>.bin.extract_mohawk %%*0
+Set Alias$gob_loadcalc <ScummTool$Dir>.bin.gob_loadcalc %%*0
+Set Alias$decine <ScummTool$Dir>.bin.decine %%*0
+Set Alias$degob <ScummTool$Dir>.bin.degob %%*0
+Set Alias$dekyra <ScummTool$Dir>.bin.dekyra %%*0
+Set Alias$deriven <ScummTool$Dir>.bin.deriven %%*0
+Set Alias$descumm <ScummTool$Dir>.bin.descumm %%*0
+Set Alias$desword2 <ScummTool$Dir>.bin.desword2 %%*0

dists/riscos/!Run,feb

@@ -0,0 +1,2 @@
+Run <Obey$Dir>.!Boot
+scummvm-tools-cli %*0