[Scummvm-git-logs] scummvm master -> f2be482cd02c4e195c096e7c651179d5cd865e6a

[spleen1981]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
25a65e555b LIBRETRO: fix mapper_get_mapper_key_index loop
efae51003f LIBRETRO: BUILD: disable opengl for osx
f2be482cd0 LIBRETRO: BUILD: fix ctr defines


Commit: 25a65e555be19e2286b95921bd62966ac4094e2f
    https://github.com/scummvm/scummvm/commit/25a65e555be19e2286b95921bd62966ac4094e2f
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2025-02-23T17:08:11+01:00

Commit Message:
LIBRETRO: fix mapper_get_mapper_key_index loop

Changed paths:
    backends/platform/libretro/src/libretro-mapper.cpp


diff --git a/backends/platform/libretro/src/libretro-mapper.cpp b/backends/platform/libretro/src/libretro-mapper.cpp
index b694523c7ac..3e7bfaac37f 100644
--- a/backends/platform/libretro/src/libretro-mapper.cpp
+++ b/backends/platform/libretro/src/libretro-mapper.cpp
@@ -58,7 +58,7 @@ static int16 mapper_get_retro_key_index(const char *retro_key_value) {
 
 int8 mapper_get_mapper_key_index(int16 key_retro_id, uint8 start_index) {
 	uint8 i = start_index;
-	while (i < RETRO_DEVICE_ID_JOYPAD_LAST - 1) {
+	while (i < RETRO_DEVICE_ID_JOYPAD_LAST) {
 		if (mapper_keys[i].retro_id == key_retro_id)
 			return i;
 		++i;


Commit: efae51003f79ae193be0f13435e1bc3a88822e8d
    https://github.com/scummvm/scummvm/commit/efae51003f79ae193be0f13435e1bc3a88822e8d
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2025-02-23T17:08:31+01:00

Commit Message:
LIBRETRO: BUILD: disable opengl for osx

Changed paths:
    backends/platform/libretro/Makefile


diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile
index ac74c23ee09..afd56c6e2a7 100644
--- a/backends/platform/libretro/Makefile
+++ b/backends/platform/libretro/Makefile
@@ -536,7 +536,7 @@ else ifeq ($(platform), osx)
    DEFINES += -fPIC -Wno-undefined-var-template -Wno-pragma-pack -DHAVE_POSIX_MEMALIGN=1 -DUSE_CXX11
    LDFLAGS += -dynamiclib -fPIC
    CXXFLAGS := -std=c++11
-   HAVE_OPENGL := 1
+   HAVE_OPENGL := 0 # cocoagl does not support GLAD
    ifeq ($(CROSS_COMPILE),1)
       TARGET_RULE   = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
       CFLAGS   += $(TARGET_RULE)


Commit: f2be482cd02c4e195c096e7c651179d5cd865e6a
    https://github.com/scummvm/scummvm/commit/f2be482cd02c4e195c096e7c651179d5cd865e6a
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2025-02-23T17:08:47+01:00

Commit Message:
LIBRETRO: BUILD: fix ctr defines

Changed paths:
    backends/platform/libretro/Makefile


diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile
index afd56c6e2a7..0181825bfbb 100644
--- a/backends/platform/libretro/Makefile
+++ b/backends/platform/libretro/Makefile
@@ -223,7 +223,7 @@ else ifeq ($(platform), ctr)
    ifeq ($(strip $(CTRULIB)),)
       $(error "Please set CTRULIB in your environment. export CTRULIB=<path to>libctru")
    endif
-   DEFINES += -DARM11 -D_3DS -I$(CTRULIB)/include
+   DEFINES += -DARM11 -D_3DS -D__3DS__ -DARM -I$(CTRULIB)/include
    DEFINES += -march=armv6k -mtune=mpcore -mfloat-abi=hard
    DEFINES += -Wall -mword-relocations
    DEFINES += -fomit-frame-pointer -ffast-math -DDEFAULT_PERF_TUNER