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

[sev-]

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:
3d46c5ecf9 BASE: Rearrange the dynamic detection code


Commit: 3d46c5ecf91fa17f65908327b20c6c4209172785
    https://github.com/scummvm/scummvm/commit/3d46c5ecf91fa17f65908327b20c6c4209172785
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-12-06T19:56:44+01:00

Commit Message:
BASE: Rearrange the dynamic detection code

Changed paths:
  A base/detection/detection.cpp
  A base/detection/detection.h
  A base/detection/module.mk
  R engines/detect_modules.mk
  R engines/detection.cpp
  R engines/detection.h
    Makefile.common
    base/plugins.cpp


diff --git a/Makefile.common b/Makefile.common
index a2fe53f131..a967efdbaf 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -81,7 +81,7 @@ KYRARPG_COMMON_OBJ := $(KYRARPG_COMMON_OBJ_ORIG)
 LOAD_RULES_MK := 1
 
 ifneq ($(DETECTION_STATIC), 1)
--include $(srcdir)/engines/detect_modules.mk
+-include $(srcdir)/base/detection/module.mk
 else
 MODULE_DIRS += $(sort $(dir $(DETECT_OBJS)))
 endif
diff --git a/engines/detection.cpp b/base/detection/detection.cpp
similarity index 97%
rename from engines/detection.cpp
rename to base/detection/detection.cpp
index 11b8323fac..6274e87113 100644
--- a/engines/detection.cpp
+++ b/base/detection/detection.cpp
@@ -23,9 +23,9 @@
 #ifndef DETECTION_STATIC
 
 #include "base/plugins.h"
+#include "base/detection/detection.h"
 #include "engines/metaengine.h"
 #include "engines/advancedDetector.h"
-#include "engines/detection.h"
 
 
 class DetectionDynamic : public Detection {
diff --git a/engines/detection.h b/base/detection/detection.h
similarity index 100%
rename from engines/detection.h
rename to base/detection/detection.h
diff --git a/engines/detect_modules.mk b/base/detection/module.mk
similarity index 65%
rename from engines/detect_modules.mk
rename to base/detection/module.mk
index e5dec7a937..c713d205ff 100644
--- a/engines/detect_modules.mk
+++ b/base/detection/module.mk
@@ -1,9 +1,9 @@
-MODULE := detection
+MODULE := base/detection
 
-DETECT_OBJS_DYNAMIC=$(addprefix ../,$(DETECT_OBJS))
+DETECT_OBJS_DYNAMIC=$(addprefix ../../,$(DETECT_OBJS))
 
 MODULE_OBJS := \
-	../engines/detection.o \
+	detection.o \
 	$(DETECT_OBJS_DYNAMIC)
 
 # Reset detect objects, so none of them build into the executable.
diff --git a/base/plugins.cpp b/base/plugins.cpp
index 819dcb30b3..f0f4d6f028 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -30,7 +30,7 @@
 #include "common/fs.h"
 #endif
 
-#include "engines/detection.h"
+#include "base/detection/detection.h"
 
 // Plugin versioning