[Scummvm-git-logs] scummvm master -> 3df20dd9c6d2d9bba7e5af221c8f3ace53b1cd4f

[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:
b8dac3f5b0 LIBRETRO: add common/translation.h includes
3df20dd9c6 LIBRETRO: BUILD: add FORCE_OPENGL*


Commit: b8dac3f5b07edc95371e7875ace9e4170fca1549
    https://github.com/scummvm/scummvm/commit/b8dac3f5b07edc95371e7875ace9e4170fca1549
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2024-05-31T18:21:42+02:00

Commit Message:
LIBRETRO: add common/translation.h includes

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


diff --git a/backends/platform/libretro/src/libretro-mapper.cpp b/backends/platform/libretro/src/libretro-mapper.cpp
index b694523c7ac..bb9a713a1ee 100644
--- a/backends/platform/libretro/src/libretro-mapper.cpp
+++ b/backends/platform/libretro/src/libretro-mapper.cpp
@@ -17,6 +17,7 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_strcpy
 #define FORBIDDEN_SYMBOL_EXCEPTION_strcat
 
+#include "common/translation.h"
 #include "backends/platform/libretro/include/libretro-mapper.h"
 
 struct retro_keymap mapper_keys[RETRO_DEVICE_ID_JOYPAD_LAST] = {0};
diff --git a/backends/platform/libretro/src/libretro-os-utils.cpp b/backends/platform/libretro/src/libretro-os-utils.cpp
index 5b4da1bb356..4302dff0105 100644
--- a/backends/platform/libretro/src/libretro-os-utils.cpp
+++ b/backends/platform/libretro/src/libretro-os-utils.cpp
@@ -20,6 +20,7 @@
 
 #include "common/tokenizer.h"
 #include "common/config-manager.h"
+#include "common/translation.h"
 #include "base/commandLine.h"
 
 #include "backends/platform/libretro/include/libretro-defs.h"


Commit: 3df20dd9c6d2d9bba7e5af221c8f3ace53b1cd4f
    https://github.com/scummvm/scummvm/commit/3df20dd9c6d2d9bba7e5af221c8f3ace53b1cd4f
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2024-05-31T18:21:58+02:00

Commit Message:
LIBRETRO: BUILD: add FORCE_OPENGL*

Changed paths:
    backends/platform/libretro/Makefile.common


diff --git a/backends/platform/libretro/Makefile.common b/backends/platform/libretro/Makefile.common
index c03d83750f9..ff24b44065d 100644
--- a/backends/platform/libretro/Makefile.common
+++ b/backends/platform/libretro/Makefile.common
@@ -34,6 +34,9 @@ USE_LIBCO        ?= 1
 USE_MT32EMU      ?= 1
 USE_CLOUD        ?= 0
 DEBUG            ?= 0
+FORCE_OPENGL     ?= 0
+FORCE_OPENGLES2  ?= 0
+FORCE_OPENGLNONE ?= 0
 
 DEBUG_ALLOW_DIRTY_SUBMODULES ?= 0
 
@@ -112,21 +115,36 @@ else
    DEFINES += -DDISABLE_TEXT_CONSOLE -DRELEASE_BUILD
 endif
 
+ifeq ($(FORCE_OPENGL), 1)
+   HAVE_OPENGL := 1
+   HAVE_OPENGLES2 :=
+endif
+
+ifeq ($(FORCE_OPENGLES2), 1)
+   HAVE_OPENGL :=
+   HAVE_OPENGLES2 := 1
+endif
+
+ifeq ($(FORCE_OPENGLNONE), 1)
+   HAVE_OPENGL :=
+   HAVE_OPENGLES2 :=
+endif
+
 ifeq ($(or $(HAVE_OPENGL), $(HAVE_OPENGLES2)), 1)
-	USE_OPENGL := 1
-	USE_OPENGL_GAME := 1
-	USE_OPENGL_SHADERS := 1
-	DEFINES += -DUSE_OPENGL -DUSE_GLAD -DUSE_OPENGL_GAME -DUSE_OPENGL_SHADERS
+   USE_OPENGL := 1
+   USE_OPENGL_GAME := 1
+   USE_OPENGL_SHADERS := 1
+   DEFINES += -DUSE_OPENGL -DUSE_GLAD -DUSE_OPENGL_GAME -DUSE_OPENGL_SHADERS
 ifeq ($(HAVE_OPENGL), 1)
-	DEFINES += -DHAVE_OPENGL
-        $(info Support for OpenGL requested)
+   DEFINES += -DHAVE_OPENGL
+   $(info Support for OpenGL requested)
 else
-	DEFINES += -DHAVE_OPENGLES2
-        $(info Support for OpenGLES2 requested)
+   DEFINES += -DHAVE_OPENGLES2
+   $(info Support for OpenGLES2 requested)
 endif
 else
-	UNAVAILABLE_DEPS += opengl_game_shaders
-        $(info No support for OpenGL/OpenGLES2 requested)
+   UNAVAILABLE_DEPS += opengl_game_shaders
+   $(info No support for OpenGL/OpenGLES2 requested)
 endif
 
 ######################################################################