thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BACKENDS: More renames in GFX backends

Browse source
This commit is contained in:
Pawel Kolodziejski 2020-09-25 10:35:26 +02:00
parent 677c072c3c
commit 11b9f5d81c
13 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/events/sdl/resvm-sdl-events.cpp
View file

@ -25,7 +25,7 @@
#if defined(SDL_BACKEND) #if defined(SDL_BACKEND)
#include "backends/events/sdl/resvm-sdl-events.h" #include "backends/events/sdl/resvm-sdl-events.h"
#include "backends/graphics/sdl/resvm-sdl-graphics.h" #include "backends/graphics/resvm-sdl/resvm-sdl-graphics.h"
#include "engines/engine.h" #include "engines/engine.h"
#include "gui/gui-manager.h" #include "gui/gui-manager.h"
#include "common/config-manager.h" #include "common/config-manager.h"

2
backends/events/sdl/sdl-events.h
View file

@ -24,7 +24,7 @@
#define BACKEND_EVENTS_SDL_H #define BACKEND_EVENTS_SDL_H
#include "backends/platform/sdl/sdl-sys.h" #include "backends/platform/sdl/sdl-sys.h"
#include "backends/graphics/sdl/sdl-graphics.h" #include "backends/graphics/resvm-sdl/resvm-sdl-graphics.h"
#include "common/events.h" #include "common/events.h"

2
backends/graphics/resvmopenglsdl/resvmopenglsdl-graphics.cpp → backends/graphics/resvm-openglsdl/resvm-openglsdl-graphics.cpp
View file

@ -24,7 +24,7 @@
#if defined(SDL_BACKEND) #if defined(SDL_BACKEND)
#include "backends/graphics/resvmopenglsdl/resvmopenglsdl-graphics.h" #include "backends/graphics/resvm-openglsdl/resvm-openglsdl-graphics.h"
#include "backends/events/sdl/resvm-sdl-events.h" #include "backends/events/sdl/resvm-sdl-events.h"
#include "common/config-manager.h" #include "common/config-manager.h"

6
backends/graphics/resvmopenglsdl/resvmopenglsdl-graphics.h → backends/graphics/resvm-openglsdl/resvm-openglsdl-graphics.h
View file

@ -20,10 +20,10 @@
* *
*/ */
#ifndef BACKENDS_GRAPHICS_RESVMOPENGLSDL_GRAPHICS_H #ifndef BACKENDS_GRAPHICS_RESVM_OPENGLSDL_GRAPHICS_H
#define BACKENDS_GRAPHICS_RESVMOPENGLSDL_GRAPHICS_H #define BACKENDS_GRAPHICS_RESVM_OPENGLSDL_GRAPHICS_H
#include "backends/graphics/sdl/resvm-sdl-graphics.h" #include "backends/graphics/resvm-sdl/resvm-sdl-graphics.h"
namespace OpenGL { namespace OpenGL {
class FrameBuffer; class FrameBuffer;

2
backends/graphics/sdl/resvm-sdl-graphics.cpp → backends/graphics/resvm-sdl/resvm-sdl-graphics.cpp
View file

@ -20,7 +20,7 @@
* *
*/ */
#include "backends/graphics/sdl/resvm-sdl-graphics.h" #include "backends/graphics/resvm-sdl/sdl-graphics.h"
#include "backends/platform/sdl/sdl-sys.h" #include "backends/platform/sdl/sdl-sys.h"
#include "backends/events/sdl/resvm-sdl-events.h" #include "backends/events/sdl/resvm-sdl-events.h"

6
backends/graphics/sdl/resvm-sdl-graphics.h → backends/graphics/resvm-sdl/resvm-sdl-graphics.h
View file

@ -20,10 +20,10 @@
* *
*/ */
#ifndef BACKENDS_GRAPHICS_SDL_RESVMSDLGRAPHICS_H #ifndef BACKENDS_GRAPHICS_SDL_RESVM_SDLGRAPHICS_H
#define BACKENDS_GRAPHICS_SDL_RESVMSDLGRAPHICS_H #define BACKENDS_GRAPHICS_SDL_RESVM_SDLGRAPHICS_H
#include "backends/graphics/sdl/sdl-graphics.h" #include "backends/graphics/resvm-sdl/sdl-graphics.h"
#include "common/events.h" #include "common/events.h"
#include "common/rect.h" #include "common/rect.h"

2
backends/graphics/sdl/sdl-graphics.cpp → backends/graphics/resvm-sdl/sdl-graphics.cpp
View file

@ -20,7 +20,7 @@
* *
*/ */
#include "backends/graphics/sdl/sdl-graphics.h" #include "backends/graphics/resvm-sdl/sdl-graphics.h"
#include "backends/platform/sdl/sdl-sys.h" #include "backends/platform/sdl/sdl-sys.h"
#include "backends/platform/sdl/sdl.h" #include "backends/platform/sdl/sdl.h"
#include "backends/events/sdl/resvm-sdl-events.h" #include "backends/events/sdl/resvm-sdl-events.h"

0
backends/graphics/sdl/sdl-graphics.h → backends/graphics/resvm-sdl/sdl-graphics.h
View file

2
backends/graphics/resvmsurfacesdl/resvmsurfacesdl-graphics.cpp → backends/graphics/resvm-surfacesdl/resvm-surfacesdl-graphics.cpp
View file

@ -24,7 +24,7 @@
#if defined(SDL_BACKEND) #if defined(SDL_BACKEND)
#include "backends/graphics/resvmsurfacesdl/resvmsurfacesdl-graphics.h" #include "backends/graphics/resvm-surfacesdl/resvm-surfacesdl-graphics.h"
#include "backends/events/sdl/resvm-sdl-events.h" #include "backends/events/sdl/resvm-sdl-events.h"
#include "common/config-manager.h" #include "common/config-manager.h"
#include "common/file.h" #include "common/file.h"

6
backends/graphics/resvmsurfacesdl/resvmsurfacesdl-graphics.h → backends/graphics/resvm-surfacesdl/resvm-surfacesdl-graphics.h
View file

@ -20,10 +20,10 @@
* *
*/ */
#ifndef BACKENDS_GRAPHICS_RESVMSURFACESDL_GRAPHICS_H #ifndef BACKENDS_GRAPHICS_RESVM_SURFACESDL_GRAPHICS_H
#define BACKENDS_GRAPHICS_RESVMSURFACESDL_GRAPHICS_H #define BACKENDS_GRAPHICS_RESVM_SURFACESDL_GRAPHICS_H
#include "backends/graphics/sdl/resvm-sdl-graphics.h" #include "backends/graphics/resvm-sdl/resvm-sdl-graphics.h"
/** /**
* SDL Surface based graphics manager * SDL Surface based graphics manager

8
backends/module.mk
View file

@ -119,9 +119,9 @@ ifdef SDL_BACKEND
MODULE_OBJS += \ MODULE_OBJS += \
events/sdl/sdl-events.o \ events/sdl/sdl-events.o \
events/sdl/resvm-sdl-events.o \ events/sdl/resvm-sdl-events.o \
graphics/sdl/sdl-graphics.o \ graphics/resvm-sdl/sdl-graphics.o \
graphics/sdl/resvm-sdl-graphics.o \ graphics/resvm-sdl/resvm-sdl-graphics.o \
graphics/resvmsurfacesdl/resvmsurfacesdl-graphics.o \ graphics/resvm-surfacesdl/resvm-surfacesdl-graphics.o \
mixer/sdl/sdl-mixer.o \ mixer/sdl/sdl-mixer.o \
mutex/sdl/sdl-mutex.o \ mutex/sdl/sdl-mutex.o \
plugins/sdl/sdl-provider.o \ plugins/sdl/sdl-provider.o \
@ -135,7 +135,7 @@ endif
ifdef USE_OPENGL ifdef USE_OPENGL
MODULE_OBJS += \ MODULE_OBJS += \
graphics/resvmopenglsdl/resvmopenglsdl-graphics.o graphics/resvm-openglsdl/resvm-openglsdl-graphics.o
endif endif
ifdef USE_DISCORD ifdef USE_DISCORD

4
backends/platform/sdl/sdl.cpp
View file

@ -52,10 +52,10 @@
#include "backends/keymapper/hardware-input.h" #include "backends/keymapper/hardware-input.h"
#include "backends/mutex/sdl/sdl-mutex.h" #include "backends/mutex/sdl/sdl-mutex.h"
#include "backends/timer/sdl/sdl-timer.h" #include "backends/timer/sdl/sdl-timer.h"
#include "backends/graphics/resvmsurfacesdl/resvmsurfacesdl-graphics.h" // ResidualVM specific #include "backends/graphics/resvm-surfacesdl/resvm-surfacesdl-graphics.h" // ResidualVM specific
#ifdef USE_OPENGL #ifdef USE_OPENGL
#include "backends/graphics/resvmopenglsdl/resvmopenglsdl-graphics.h" // ResidualVM specific #include "backends/graphics/resvm-openglsdl/resvm-openglsdl-graphics.h" // ResidualVM specific
//#include "graphics/cursorman.h" // ResidualVM specific //#include "graphics/cursorman.h" // ResidualVM specific
#include "graphics/opengl/context.h" // ResidualVM specific #include "graphics/opengl/context.h" // ResidualVM specific
#endif #endif

2
backends/platform/sdl/sdl.h
View file

@ -38,7 +38,7 @@ class DiscordPresence;
#endif #endif
// ResidualVM - Start // ResidualVM - Start
#ifdef USE_OPENGL #ifdef USE_OPENGL
#include "backends/graphics/resvmopenglsdl/resvmopenglsdl-graphics.h" #include "backends/graphics/resvm-openglsdl/resvm-openglsdl-graphics.h"
#endif #endif
// ResidualVM - End // ResidualVM - End