diff --git a/.ci_scripts/setup_environment.sh b/.ci_scripts/setup_environment.sh index 130394807c..092a1f7555 100755 --- a/.ci_scripts/setup_environment.sh +++ b/.ci_scripts/setup_environment.sh @@ -5,7 +5,7 @@ case "$BUILD_TARGET" in # Note: Using a tagged version of the container to make sure that it's not updated unexpectedly # You can update the tag by obtaining a recent one from here: https://hub.docker.com/r/gnuton/vitasdk-docker/tags # Make sure that it compiles correctly and runs on a Vita prior to pushing the change - docker run -d --name vitasdk --workdir /build/git -v "${PWD}:/build/git" gnuton/vitasdk-docker:20230823 tail -f /dev/null + docker run -d --name vitasdk --workdir /build/git -v "${PWD}:/build/git" gnuton/vitasdk-docker:20240412 tail -f /dev/null ;; "switch") # You can obtain a recent devkitA64 image from https://hub.docker.com/repository/docker/devkitpro/devkita64/general diff --git a/CMakeLists.txt b/CMakeLists.txt index 83999e36f7..f45fc86f36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.27.0) +cmake_minimum_required(VERSION 3.1) include(CMakeDependentOption) set(TARGET_PLATFORM "default" CACHE STRING "Platform to cross-compile for. Options: vita switch android emscripten. Leave blank for no cross compilation") diff --git a/src/platform/file_manager_cache.c b/src/platform/file_manager_cache.c index be73244282..3aeb510cc5 100644 --- a/src/platform/file_manager_cache.c +++ b/src/platform/file_manager_cache.c @@ -97,14 +97,6 @@ const dir_info *platform_file_manager_cache_get_dir_info(const char *dir) // This is effectively a hack, and definitely not full-proof, but the performance gains are well worth it if (!*file_item->extension) { static char full_name[FILE_NAME_MAX]; - if (!dir_name_offset) { - strncpy(full_name, info->name, FILE_NAME_MAX); - dir_name_offset = strlen(info->name); - if (full_name[dir_name_offset - 1] != '/') { - full_name[dir_name_offset++] = '/'; - full_name[dir_name_offset] = 0; - } - } strncpy(full_name + dir_name_offset, name, FILE_NAME_MAX - 1 - dir_name_offset); DIR *file_d = opendir(full_name); if (file_d) { diff --git a/src/platform/julius.c b/src/platform/julius.c index d55efa9ed6..01892de2a3 100644 --- a/src/platform/julius.c +++ b/src/platform/julius.c @@ -463,7 +463,7 @@ static int pre_init(const char *custom_data_dir) SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", "Julius requires the original files from Caesar 3.\n\n" - "Please insert the proper directory or copy the files to the selected directory.", + "Please enter the proper directory or copy the files to the selected directory.", NULL); return 0; }