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

[lephilousophe]

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:
b2c8c0dc8f HPL1: Fix engine declaration
a69094c45e HPL1: Allow building without TinyGL


Commit: b2c8c0dc8f466eb5ba5f8329d411498a4bbb75ee
    https://github.com/scummvm/scummvm/commit/b2c8c0dc8f466eb5ba5f8329d411498a4bbb75ee
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-12-27T08:50:34+01:00

Commit Message:
HPL1: Fix engine declaration

Several fields were missing and dependencies were seen as subengines

Changed paths:
    engines/hpl1/configure.engine


diff --git a/engines/hpl1/configure.engine b/engines/hpl1/configure.engine
index 88ed8e7a105..4c98651bedc 100644
--- a/engines/hpl1/configure.engine
+++ b/engines/hpl1/configure.engine
@@ -1,3 +1,3 @@
 # This file is included from the main "configure" script
 # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine hpl1 "Hpl1" no "16bit highres jpeg gif png opengl_game_shaders"
+add_engine hpl1 "Hpl1" no "" "" "16bit highres jpeg gif png opengl_game_shaders"


Commit: a69094c45e263abb11bf164df125166962d48fb0
    https://github.com/scummvm/scummvm/commit/a69094c45e263abb11bf164df125166962d48fb0
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-12-27T08:53:05+01:00

Commit Message:
HPL1: Allow building without TinyGL

Changed paths:
    engines/hpl1/engine/game/low_level_game_setup.cpp
    engines/hpl1/engine/impl/low_level_graphics_tgl.h
    engines/hpl1/engine/impl/occlusion_query_tgl.h
    engines/hpl1/engine/impl/texture_tgl.h
    engines/hpl1/engine/impl/vertex_buffer_tgl.h
    engines/hpl1/module.mk


diff --git a/engines/hpl1/engine/game/low_level_game_setup.cpp b/engines/hpl1/engine/game/low_level_game_setup.cpp
index ee663751f02..45eb63136da 100644
--- a/engines/hpl1/engine/game/low_level_game_setup.cpp
+++ b/engines/hpl1/engine/game/low_level_game_setup.cpp
@@ -40,7 +40,11 @@ static iLowLevelGraphics *createLowLevelGfx()
 	if (Hpl1::useOpenGL())
 		return hplNew(cLowLevelGraphicsSDL, ());
 #endif
+#ifdef USE_TINYGL
 	return hplNew(LowLevelGraphicsTGL, ());
+#else
+	error("Can't find a valid renderer: TinyGL is not supported");
+#endif
 }
 
 LowLevelGameSetup::LowLevelGameSetup() {
diff --git a/engines/hpl1/engine/impl/low_level_graphics_tgl.h b/engines/hpl1/engine/impl/low_level_graphics_tgl.h
index 09f160fd4ff..95f87737362 100644
--- a/engines/hpl1/engine/impl/low_level_graphics_tgl.h
+++ b/engines/hpl1/engine/impl/low_level_graphics_tgl.h
@@ -29,6 +29,8 @@
 #include "common/ptr.h"
 #include "graphics/tinygl/tinygl.h"
 
+#ifdef USE_TINYGL
+
 namespace hpl {
 
 TGLenum ColorFormatToTGL(eColorDataFormat format);
@@ -277,4 +279,6 @@ private:
 
 }     // namespace hpl
 
-#endif // HPL_LOWLEVELGRAPHICS_TGL_H
\ No newline at end of file
+#endif // USE_TINYGL
+
+#endif // HPL_LOWLEVELGRAPHICS_TGL_H
diff --git a/engines/hpl1/engine/impl/occlusion_query_tgl.h b/engines/hpl1/engine/impl/occlusion_query_tgl.h
index fd69c0b86be..77e36355959 100644
--- a/engines/hpl1/engine/impl/occlusion_query_tgl.h
+++ b/engines/hpl1/engine/impl/occlusion_query_tgl.h
@@ -25,6 +25,8 @@
 #include "hpl1/engine/graphics/OcclusionQuery.h"
 #include "common/scummsys.h"
 
+#ifdef USE_TINYGL
+
 namespace hpl {
 
 class OcclusionQueryTGL : public iOcclusionQuery {
@@ -40,4 +42,6 @@ public:
 
 }     // namespace hpl
 
-#endif // HPL_OCCLUSION_QUERY_TGL_H
\ No newline at end of file
+#endif // USE_TINYGL
+
+#endif // HPL_OCCLUSION_QUERY_TGL_H
diff --git a/engines/hpl1/engine/impl/texture_tgl.h b/engines/hpl1/engine/impl/texture_tgl.h
index 6fcd90ead30..b966ebae62e 100644
--- a/engines/hpl1/engine/impl/texture_tgl.h
+++ b/engines/hpl1/engine/impl/texture_tgl.h
@@ -26,6 +26,8 @@
 #include "hpl1/engine/impl/low_level_graphics_tgl.h"
 #include "hpl1/engine/graphics/bitmap2D.h"
 
+#ifdef USE_TINYGL
+
 namespace hpl {
 
 class TGLTexture : public iTexture {
@@ -92,4 +94,6 @@ private:
 
 }     // namespace hpl
 
-#endif // HPL_TEXTURE_TGL_H
\ No newline at end of file
+#endif // USE_TINYGL
+
+#endif // HPL_TEXTURE_TGL_H
diff --git a/engines/hpl1/engine/impl/vertex_buffer_tgl.h b/engines/hpl1/engine/impl/vertex_buffer_tgl.h
index e9e31221f6a..61c3c3adf21 100644
--- a/engines/hpl1/engine/impl/vertex_buffer_tgl.h
+++ b/engines/hpl1/engine/impl/vertex_buffer_tgl.h
@@ -24,6 +24,8 @@
 
 #include "hpl1/engine/graphics/VertexBuffer.h"
 
+#ifdef USE_TINYGL
+
 namespace hpl {
 
 class VertexBufferTGL : public iVertexBuffer {
@@ -83,4 +85,6 @@ private:
 
 }     // namespace hpl
 
-#endif // HPL_RENDERER3D_OGL_H
\ No newline at end of file
+#endif // USE_TINYGL
+
+#endif // HPL_RENDERER3D_OGL_H
diff --git a/engines/hpl1/module.mk b/engines/hpl1/module.mk
index 7e97a865dd4..5089b27358f 100644
--- a/engines/hpl1/module.mk
+++ b/engines/hpl1/module.mk
@@ -98,9 +98,6 @@ MODULE_OBJS := \
 	engine/impl/CollideShapeNewton.o \
 	engine/impl/KeyboardSDL.o \
 	engine/impl/LowLevelGraphicsSDL.o \
-	engine/impl/low_level_graphics_tgl.o \
-	engine/impl/texture_tgl.o \
-	engine/impl/vertex_buffer_tgl.o \
 	engine/impl/LowLevelInputSDL.o \
 	engine/impl/LowLevelPhysicsNewton.o \
 	engine/impl/LowLevelSoundOpenAL.o \
@@ -392,6 +389,13 @@ MODULE_OBJS := \
 	engine/libraries/angelscript/sources/as_typeinfo.o \
 	engine/libraries/angelscript/sources/as_variablescope.o
 
+ifdef USE_TINYGL
+MODULE_OBJS += \
+	engine/impl/low_level_graphics_tgl.o \
+	engine/impl/texture_tgl.o \
+	engine/impl/vertex_buffer_tgl.o
+endif
+
 # This module can be built as a plugin
 ifeq ($(ENABLE_HPL1), DYNAMIC_PLUGIN)
 PLUGIN := 1