From 2578f12456ffd4648a5acdb0cd00cdfbb56dfbe2 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Sun, 6 Oct 2024 02:56:57 +0300
Subject: [PATCH] deal with some platform-specific warnings

---
 Makefile.libretro     | 6 ++++--
 libpcsxcore/misc.c    | 2 +-
 plugins/dfsound/spu.c | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index cf976ba0..37bcd84b 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -62,6 +62,10 @@ else ifeq ($(platform), ctr)
 	CC = $(DEVKITARM)/bin/arm-none-eabi-gcc$(EXE_EXT)
 	CXX = $(DEVKITARM)/bin/arm-none-eabi-g++$(EXE_EXT)
 	AR = $(DEVKITARM)/bin/arm-none-eabi-ar$(EXE_EXT)
+else ifeq ($(platform), libnx)
+	export DEPSDIR := $(CURDIR)/
+	include $(DEVKITPRO)/libnx/switch_rules
+	SHELL := PATH=$(PATH) $(SHELL)
 else ifeq ($(platform), xenon)
 	CC = xenon-gcc$(EXE_EXT)
 	AR = xenon-ar$(EXE_EXT)
@@ -237,8 +241,6 @@ endif
 
 # Nintendo Switch (libnx)
 else ifeq ($(platform), libnx)
-   export DEPSDIR := $(CURDIR)/
-   include $(DEVKITPRO)/libnx/switch_rules
    TARGET := $(TARGET_NAME)_libretro_$(platform).a
    ARCH := arm64
    HAVE_VFS_FD = 0
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 68982abd..39665872 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -432,7 +432,7 @@ int CheckCdrom() {
 		for (i = 0; i < len; ++i) {
 			if (exename[i] == ';' || c >= sizeof(CdromId) - 1)
 				break;
-			if (isalnum(exename[i]))
+			if (isalnum((int)exename[i]))
 				CdromId[c++] = exename[i];
 		}
 	}
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index ed5b4b5c..bc9cbf11 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -1723,6 +1723,9 @@ void spu_get_debug_info(int *chans_out, int *run_chans, int *fmod_chans_out, int
  *run_chans = ~spu.dwChannelsAudible & ~spu.dwChannelDead & irq_chans;
  *fmod_chans_out = fmod_chans;
  *noise_chans_out = noise_chans;
+ // sometimes unused
+ (void)do_samples_skip_fmod;
+ (void)SkipADSR;
 }
 
 // vim:shiftwidth=1:expandtab
-- 
2.39.5