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

[spleen1981]

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

Summary:
1369aaa3b4 LIBRETRO: BUILD: set -O1 for ios and osx builds
c2f97be777 LIBRETRO: add terminator element to retro_input_descriptor array


Commit: 1369aaa3b4c7e6fb2b65d9e3d04bce67b51f2372
    https://github.com/scummvm/scummvm/commit/1369aaa3b4c7e6fb2b65d9e3d04bce67b51f2372
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-10-13T14:02:13+02:00

Commit Message:
LIBRETRO: BUILD: set -O1 for ios and osx builds

Changed paths:
    backends/platform/libretro/Makefile


diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile
index b398526ddd7..3e4e85388cd 100644
--- a/backends/platform/libretro/Makefile
+++ b/backends/platform/libretro/Makefile
@@ -484,9 +484,9 @@ endif
 
 ifeq ($(platform), wiiu)
    DEFINES += -Os
-else ifeq ($(platform),genode)
-   DEFINES += -O2
-else ifneq (,$(findstring msvc,$(platform)))
+else ifneq (,$(findstring $(platform), ios osx))
+   DEFINES += -O1
+else ifneq (,$(findstring $(platform), msvc genode))
    DEFINES += -O2
 else
    DEFINES += -O3


Commit: c2f97be7773ca5b20ea52b070b19a9e546f1c876
    https://github.com/scummvm/scummvm/commit/c2f97be7773ca5b20ea52b070b19a9e546f1c876
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-10-13T14:02:50+02:00

Commit Message:
LIBRETRO: add terminator element to retro_input_descriptor array

Changed paths:
    backends/platform/libretro/include/libretro-mapper.h


diff --git a/backends/platform/libretro/include/libretro-mapper.h b/backends/platform/libretro/include/libretro-mapper.h
index 82c607b0395..959e4107abd 100644
--- a/backends/platform/libretro/include/libretro-mapper.h
+++ b/backends/platform/libretro/include/libretro-mapper.h
@@ -245,7 +245,8 @@ static struct retro_input_descriptor retro_input_desc[] = {
 	{0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X, "Left Analog X"},
 	{0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y, "Left Analog Y"},
 	{0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X, "Right Analog X"},
-	{0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y, "Right Analog Y"}
+	{0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y, "Right Analog Y"},
+	{0}
 };
 
 void mapper_poll_device(void);