From 44544a65d23de1c3d618c65198a22fc3b51ea107 Mon Sep 17 00:00:00 2001
From: Cameron Cawley <ccawley2011@gmail.com>
Date: Tue, 20 Oct 2020 17:33:36 +0100
Subject: [PATCH] RISC OS port

---
 .gitignore                 |   7 +++----
 CMakeLists.txt             |   4 ++++
 assets/riscos/!Boot,feb    |   2 ++
 assets/riscos/!Run,feb     |   2 ++
 assets/riscos/!Sprites,ff9 | Bin 0 -> 996 bytes
 cmake/RISCOSApp.cmake      |  22 ++++++++++++++++++++++
 src/Config.cpp             |   2 ++
 7 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 assets/riscos/!Boot,feb
 create mode 100644 assets/riscos/!Run,feb
 create mode 100644 assets/riscos/!Sprites,ff9
 create mode 100644 cmake/RISCOSApp.cmake

diff --git a/.gitignore b/.gitignore
index 89807ac3..3d053adb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 /obj
 
 # Exclude the (recommended) CMake build directory
-/build
+/build*
 
 # Exclude executables
 /game_english/CSE2_debug.exe
@@ -15,6 +15,7 @@
 /game_english/DoConfig
 /game_english/CSE2_debug.rpx
 /game_english/CSE2.rpx
+/game_english/\!CSE2
 /game_japanese/CSE2_debug.exe
 /game_japanese/DoConfig_debug.exe
 /game_japanese/CSE2.exe
@@ -25,6 +26,7 @@
 /game_japanese/DoConfig
 /game_japanese/CSE2_debug.rpx
 /game_japanese/CSE2.rpx
+/game_japanese/\!CSE2
 
 # Exclude MSVC debug data
 /game_english/CSE2_debug.ilk
@@ -97,8 +99,5 @@
 # Portable branch #
 ###################
 
-# Exclude Wii U build directory
-/buildwiiu
-
 # Exclude converted resource files
 /src/Resource
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63ad6011..1d075d49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -775,3 +775,7 @@ if(DOCONFIG)
 		RUNTIME_OUTPUT_DIRECTORY_DEBUG ${BUILD_DIRECTORY}
 	)
 endif()
+
+if(RISCOS)
+	include(RISCOSApp)
+endif()
diff --git a/assets/riscos/!Boot,feb b/assets/riscos/!Boot,feb
new file mode 100644
index 00000000..c156edab
--- /dev/null
+++ b/assets/riscos/!Boot,feb
@@ -0,0 +1,2 @@
+Set CSE2$Dir <Obey$Dir>
+IconSprites <CSE2$Dir>.!Sprites
diff --git a/assets/riscos/!Run,feb b/assets/riscos/!Run,feb
new file mode 100644
index 00000000..9cab7e0b
--- /dev/null
+++ b/assets/riscos/!Run,feb
@@ -0,0 +1,2 @@
+Set CSE2$Dir <Obey$Dir>
+Run <CSE2$Dir>.CSE2 ><CSE2$Dir>.Log 2>&1
diff --git a/assets/riscos/!Sprites,ff9 b/assets/riscos/!Sprites,ff9
new file mode 100644
index 0000000000000000000000000000000000000000..631ddd2a51c9191bf547f5890b45d5c52fd4d063
GIT binary patch
literal 996
zcmd5)%}T>S5FQ(YM?F}2ET#l69!i$Qt03Za+wJND6pw;6%3Sk6eTY1cZ&AOQ-82aZ
zo&<+XX1@7$e%PG}5nVvPGNS#2=xSTPRKOw#(OkV~_wYq8Q!JSVwxI+5qD|ANc7e8S
zN%R0R>H$_x{;h<O5RG5}Hr5yqH6E1kHiRKI)_QM)7rN&yq7jSdtrQtyWJHWy)a!Xf
zd--9WL^AWW_Onu;EJW7Q9~iAl;nq)rWxx<t%qzD6_99`kW8U5AyvlzZF%E;zQJ<ai
zNXAD?nMKsg4TO+A<0m)?y+uqe20HAV20jZu@*2Ukn(u<kC8I2kSomB^59-UAVZVfb
z*^ZkNqWZPpRzNyWIdj<mw5!;$B=5L<xC?#NYP*nYsLXvfWu9VFPG`)shh!g($>gz?
dNFd5dOVln_I*ZVBmWx{@7DeQXDq13>e*+)d#o+(|

literal 0
HcmV?d00001

diff --git a/cmake/RISCOSApp.cmake b/cmake/RISCOSApp.cmake
new file mode 100644
index 00000000..803df9b7
--- /dev/null
+++ b/cmake/RISCOSApp.cmake
@@ -0,0 +1,22 @@
+# Use the following commands to build for RISC OS:
+# cmake -B build-riscos -DCMAKE_BUILD_TYPE=Release -DBACKEND_PLATFORM=SDL1 -DBACKEND_RENDERER=Software -DBACKEND_AUDIO=SDL1 -DDOCONFIG=OFF -DCMAKE_TOOLCHAIN_FILE=$GCCSDK_INSTALL_ENV/toolchain-riscos.cmake -DRISCOS=ON -DPKG_CONFIG_STATIC_LIBS=ON
+# cmake --build build-riscos
+# (cd game_english && $GCCSDK_INSTALL_ENV/bin/zip -,9r cse2-riscos.zip \!CSE2)
+
+function(elf_to_aif)
+	cmake_parse_arguments(ELFTOAIF "" "TARGET;OUTPUT" "" ${ARGN})
+	get_filename_component(ELFTOAIF_OUTPUT_DIR "${ELFTOAIF_OUTPUT}" DIRECTORY)
+	add_custom_command(OUTPUT "${ELFTOAIF_OUTPUT}"
+	                   COMMAND ${CMAKE_COMMAND} -E make_directory ${ELFTOAIF_OUTPUT_DIR}
+	                   COMMAND elf2aif $<TARGET_FILE:${ELFTOAIF_TARGET}> ${ELFTOAIF_OUTPUT}
+	                   DEPENDS ${ELFTOAIF_TARGET})
+	add_custom_target(${ELFTOAIF_TARGET}-aif ALL DEPENDS ${ELFTOAIF_OUTPUT})
+endfunction(elf_to_aif)
+
+elf_to_aif(TARGET CSE2 OUTPUT ${BUILD_DIRECTORY}/!CSE2/CSE2,ff8)
+
+configure_file(${ASSETS_DIRECTORY}/riscos/!Boot,feb ${BUILD_DIRECTORY}/!CSE2/!Boot,feb COPYONLY)
+configure_file(${ASSETS_DIRECTORY}/riscos/!Run,feb ${BUILD_DIRECTORY}/!CSE2/!Run,feb COPYONLY)
+configure_file(${ASSETS_DIRECTORY}/riscos/!Sprites,ff9 ${BUILD_DIRECTORY}/!CSE2/!Sprites,ff9 COPYONLY)
+configure_file(${BUILD_DIRECTORY}/licence.txt ${BUILD_DIRECTORY}/!CSE2/Licence COPYONLY)
+file(COPY ${BUILD_DIRECTORY}/data DESTINATION ${BUILD_DIRECTORY}/!CSE2)
diff --git a/src/Config.cpp b/src/Config.cpp
index 4e355d80..c85a62bd 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -65,6 +65,8 @@ void DefaultConfigData(CONFIGDATA *conf)
 
 #ifdef _3DS
 	conf->display_mode = 1;
+#elif defined(__riscos__)
+	conf->display_mode = 2;
 #endif
 
 	// Reset joystick settings (as these can't simply be set to 0)