From 75dd5305c4b17036e49efccddf4232102d40fe02 Mon Sep 17 00:00:00 2001
From: Flyinghead <raphael.jean@gmail.com>
Date: Tue, 15 Nov 2022 17:52:12 +0100
Subject: [PATCH] Revert "ci: use devkitpro/devkita64:latest (#672)" due to
 regression

Several games are freezing at start up
Issue #783
This reverts commit 3d00ac338b77cf74cd7f567857dfce16d75519f8.
---
 .github/workflows/switch.yml | 2 +-
 CMakeLists.txt               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml
index eea1b98ae..fcf56f1a9 100644
--- a/.github/workflows/switch.yml
+++ b/.github/workflows/switch.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     name: ${{ matrix.config.name }}
     runs-on: ubuntu-latest
-    container: devkitpro/devkita64:latest
+    container: devkitpro/devkita64:20220128
 
     strategy:
       matrix:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a11343127..80a0f67bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1584,8 +1584,8 @@ if(NINTENDO_SWITCH)
 			COMMAND ${CMAKE_AR} -x $<TARGET_FILE:xxHash::xxhash>
 			COMMAND ${CMAKE_AR} -x $<TARGET_FILE:chdr-static>
 			COMMAND ${CMAKE_AR} -x $<TARGET_FILE:zip>
-			COMMAND ${CMAKE_AR} -rs flycast_libretro_libnx.a *.o
-			COMMAND rm *.o
+			COMMAND ${CMAKE_AR} -rs flycast_libretro_libnx.a *.obj
+			COMMAND rm *.obj
 			WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
 			DEPENDS xxHash::xxhash chdr-static zip ${PROJECT_NAME})
 	else()