[Scummvm-git-logs] scummvm master -> 910f5107d8df7877afc3399baed9aa03b8fe67c8
aquadran
aquadran at gmail.com
Mon Oct 26 21:11:54 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
910f5107d8 WINTERMUTE: Fixed compilation for GLES2 only target
Commit: 910f5107d8df7877afc3399baed9aa03b8fe67c8
https://github.com/scummvm/scummvm/commit/910f5107d8df7877afc3399baed9aa03b8fe67c8
Author: PaweÅ KoÅodziejski (aquadran at users.sourceforge.net)
Date: 2020-10-26T22:11:45+01:00
Commit Message:
WINTERMUTE: Fixed compilation for GLES2 only target
Changed paths:
engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
diff --git a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
index 338fbfe2dc..f28e6e34a2 100644
--- a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
@@ -24,7 +24,7 @@
#include "engines/wintermute/base/gfx/base_image.h"
#include "graphics/transparent_surface.h"
-#if (defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)) && !defined(USE_GLES2)
+#if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"
#include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
diff --git a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
index 19878144d0..dadde302f5 100644
--- a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
+++ b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
@@ -26,7 +26,7 @@
#include "engines/wintermute/base/gfx/base_surface.h"
#include "graphics/opengl/texture.h"
-#if (defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)) && !defined(USE_GLES2)
+#if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
namespace Wintermute {
More information about the Scummvm-git-logs
mailing list