From 1f0aad77b859e33c44b12427d4324b297860af46 Mon Sep 17 00:00:00 2001
From: scribam <scribam@users.noreply.github.com>
Date: Sun, 23 Jul 2023 16:49:20 +0200
Subject: [PATCH] ci: use devkitpro/devkita64:latest

---
 .github/workflows/switch.yml | 4 ++--
 CMakeLists.txt               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml
index 7d27e21b2a..158c66da81 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:20220128
+    container: devkitpro/devkita64:latest
 
     strategy:
       matrix:
@@ -18,7 +18,7 @@ jobs:
       - name: Set up build environment
         run: |
           sudo apt-get update
-          sudo apt-get -y install awscli ccache ninja-build
+          sudo apt-get -y install awscli ccache
 
       - uses: actions/checkout@v3
         with:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 543d102f2e..30d5d6ee44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1764,8 +1764,8 @@ if(NINTENDO_SWITCH)
 			COMMAND ${CMAKE_AR} -x $<TARGET_FILE:zip>
 			COMMAND ${CMAKE_AR} -x $<TARGET_FILE:elf>
 			COMMAND ${CMAKE_AR} -x $<TARGET_FILE:flycast::res>
-			COMMAND ${CMAKE_AR} -rs flycast_libretro_libnx.a *.obj
-			COMMAND rm *.obj
+			COMMAND ${CMAKE_AR} -rs flycast_libretro_libnx.a *.o
+			COMMAND rm *.o
 			WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
 			DEPENDS xxHash::xxhash chdr-static zip ${PROJECT_NAME})
 	else()