Bring up-to-date with AppEngine changes

dpt · Jan 21, 2024 · 0a8298e · 0a8298e
1 parent 5d935e0
commit 0a8298e
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # The Great Escape in C
 #
-# Copyright (c) David Thomas, 2017-2022
+# Copyright (c) David Thomas, 2017-2024
 #
 # vim: sw=4 ts=8 et
 
@@ -32,7 +32,7 @@ set(EMAIL dave@davespace.co.uk)
 set(CODE_IDENTIFIER uk.co.davespace.TheGreatEscape)
 #set(CODE_SIGN_IDENTITY )
 set(VERSION 1.0.0)
-set(COPYRIGHT "Copyright 1986 Ocean Software Ltd. (The Great Escape). Copyright 2012-2021 David Thomas &lt;dave@davespace.co.uk&gt; (this version).")
+set(COPYRIGHT "Copyright 1986 Ocean Software Ltd. (The Great Escape). Copyright 2012-2024 David Thomas &lt;dave@davespace.co.uk&gt; (this version).")
 
 
 option(TGE_SAVES "Enable loading and saving of games" ON)

diff --git a/build-riscos.sh b/build-riscos.sh
@@ -20,7 +20,7 @@ fi
 
 mkdir -p $BUILDDIR && cd $BUILDDIR
 echo "Configuring..."
-cmake $GENERATOR -DCMAKE_TOOLCHAIN_FILE=../cmake/riscos.cmake ..
+cmake $GENERATOR -DCMAKE_TOOLCHAIN_FILE==${APPENGINE_ROOT}/cmake/riscos.cmake ..
 echo "Building..."
 cmake --build . $PARALLEL
 echo "Installing..."

diff --git a/platform/riscos/!GtEscape/CMakeLists.txt b/platform/riscos/!GtEscape/CMakeLists.txt
@@ -76,7 +76,7 @@ set(LIBS_DIR ${APPENGINE_REPO_ROOT}/libs)
 # Import DPTLib
 FetchContent_Declare(DPTLib
     GIT_REPOSITORY https://github.com/dpt/DPTLib
-    GIT_TAG 0.3.0)
+    GIT_TAG 0.4.1)
 # Expanding out FetchContent_MakeAvailable(DPTLib) here so I can use EXCLUDE_FROM_ALL
 FetchContent_GetProperties(DPTLib)
 if(NOT DPTLib_POPULATED)

diff --git a/platform/riscos/!GtEscape/dataxfer.c b/platform/riscos/!GtEscape/dataxfer.c
@@ -96,8 +96,7 @@ static int message_data_save_ack(wimp_message *message, void *handle)
   message->action   = message_DATA_LOAD;
   wimp_send_message(wimp_USER_MESSAGE_RECORDED, message, message->sender);
 
-  if (save_should_close_menu())
-    wimp_create_menu(wimp_CLOSE_MENU, 0, 0);
+  save_done(); /* closes the dialogue if required */
 
   return event_HANDLED;
 }

diff --git a/platform/riscos/!GtEscape/zxgame.c b/platform/riscos/!GtEscape/zxgame.c
@@ -1741,7 +1741,7 @@ result_t zxgame_create(zxgame_t **new_zxgame, const char *startup_game)
   zxgame->speed = NORMSPEED;
   zxgame->border_size = GAMEBORDER;
 
-  sprareasz = sprite_size(GAMEWIDTH, GAMEHEIGHT, 2, TRUE);
+  sprareasz = sprite_bytes(GAMEWIDTH, GAMEHEIGHT, 2, TRUE);
 
   zxgame->sprite = malloc(sprareasz);
   if (zxgame->sprite == NULL)

diff --git a/platform/riscos/!GtEscape/zxsave.c b/platform/riscos/!GtEscape/zxsave.c
@@ -23,7 +23,7 @@
 
 dialogue_t *zxgamesave_dlg;
 
-static bits save_type; /* 1 for game, else screenshot */
+static bits save_type; /* file type */
 
 /* ----------------------------------------------------------------------- */
 
@@ -43,8 +43,7 @@ static void zxgamesave_dlg_fillout(dialogue_t *d, void *opaque)
   else
     file_name = "Screenshot";
 
-  save_set_file_name(d, file_name);
-  save_set_file_type(d, save_type);
+  save_set_info(d, file_name, save_type, 10000 /* est_size */);
 }
 
 /* Called on 'Save' button clicks, but not on drag saves. */

diff --git a/riscos-ci-build.sh b/riscos-ci-build.sh
@@ -34,7 +34,6 @@ source /home/riscos/gccsdk-params
 if [[ ! -d PrivateEye ]] ; then
     git clone https://github.com/dpt/PrivateEye
     cd PrivateEye
-    git checkout 5c36b46 # just before PNG changes
 fi
 export APPENGINE_ROOT=${scriptdir}/PrivateEye