[Scummvm-git-logs] scummvm master -> 5c0b76ec34dd690b57a9b1e9dfb03f38ab46768d

[bluegr]

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:
5c0b76ec34 SCUMM: Add some missing includes


Commit: 5c0b76ec34dd690b57a9b1e9dfb03f38ab46768d
    https://github.com/scummvm/scummvm/commit/5c0b76ec34dd690b57a9b1e9dfb03f38ab46768d
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-04-05T08:52:23+03:00

Commit Message:
SCUMM: Add some missing includes

Pre-included files are not reliable.

Changed paths:
    devtools/md5table.cpp
    engines/scumm/detection_internal.h
    engines/scumm/detection_steam.h
    engines/scumm/detection_tables.h
    engines/scumm/scumm-md5.h


diff --git a/devtools/md5table.cpp b/devtools/md5table.cpp
index de084121bb..48fed4706a 100644
--- a/devtools/md5table.cpp
+++ b/devtools/md5table.cpp
@@ -136,6 +136,12 @@ static const char *c_header =
 	"  DO NOT EDIT MANUALLY!\n"
 	" */\n"
 	"\n"
+	"#ifndef SCUMM_MD5_INTERNAL_H\n"
+	"#define SCUMM_MD5_INTERNAL_H\n"
+	"\n"
+	"#include \"common/language.h\"\n"
+	"#include \"common/platform.h\"\n"
+	"\n"
 	"struct MD5Table {\n"
 	"	const char *md5;\n"
 	"	const char *gameid;\n"
@@ -150,7 +156,9 @@ static const char *c_header =
 
 static const char *c_footer =
 	"	{ 0, 0, 0, 0, 0, Common::UNK_LANG, Common::kPlatformUnknown }\n"
-	"};\n";
+	"};\n"
+	"\n"
+	"#endif\n";
 
 static void parseEntry(Entry *entry, char *line) {
 	assert(entry);
diff --git a/engines/scumm/detection_internal.h b/engines/scumm/detection_internal.h
index 5452ec37de..2fe897e912 100644
--- a/engines/scumm/detection_internal.h
+++ b/engines/scumm/detection_internal.h
@@ -23,6 +23,13 @@
 #ifndef SCUMM_DETECTION_INTERNAL_H
 #define SCUMM_DETECTION_INTERNAL_H
 
+#include "common/debug.h"
+#include "common/md5.h"
+
+#include "scumm/detection_tables.h"
+#include "scumm/scumm-md5.h"
+#include "scumm/file_nes.h"
+
 // Includes some shared functionalities, which is required by multiple TU's.
 // Mark it as static in the header, so visibility for function is limited by the TU, and we can use it whereever required.
 // This is being done, because it's necessary in detection, creating an instance, as well as in initiliasing the ScummEngine.
diff --git a/engines/scumm/detection_steam.h b/engines/scumm/detection_steam.h
index 83a802a581..cb51506868 100644
--- a/engines/scumm/detection_steam.h
+++ b/engines/scumm/detection_steam.h
@@ -23,6 +23,8 @@
 #ifndef SCUMM_DETECTION_STEAM_H
 #define SCUMM_DETECTION_STEAM_H
 
+#include "scumm/file.h"
+
 namespace Scumm {
 
 // The following table includes all the index files, which are embedded in the
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 7c8d94d515..06f110a104 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -28,6 +28,7 @@
 #include "common/rect.h"
 #include "common/util.h"
 
+#include "audio/mididrv.h"
 #include "scumm/detection.h"
 
 #include "scumm/scumm-md5.h"
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 2f208c86ad..d03b386617 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -3,6 +3,12 @@
   DO NOT EDIT MANUALLY!
  */
 
+#ifndef SCUMM_MD5_INTERNAL_H
+#define SCUMM_MD5_INTERNAL_H
+
+#include "common/language.h"
+#include "common/platform.h"
+
 struct MD5Table {
 	const char *md5;
 	const char *gameid;
@@ -730,3 +736,5 @@ static const MD5Table md5table[] = {
 	{ "ff05c07990061d97647f059c48c1d05a", "zak", "V2", "V2", -1, Common::DE_DEU, Common::kPlatformAtariST },
 	{ 0, 0, 0, 0, 0, Common::UNK_LANG, Common::kPlatformUnknown }
 };
+
+#endif