[Scummvm-git-logs] scummvm master -> 9f3ec07fa7330fa3de81b8e9ee96a608c779af7a

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
9f3ec07fa7 COMMON: Move default PrintingManager implementation to common/


Commit: 9f3ec07fa7330fa3de81b8e9ee96a608c779af7a
    https://github.com/scummvm/scummvm/commit/9f3ec07fa7330fa3de81b8e9ee96a608c779af7a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-02-16T19:02:04+01:00

Commit Message:
COMMON: Move default PrintingManager implementation to common/

This should resolve the circular dependency.

Also, reverting hack to Makefile.common introduced in 9d8dada5253aa2f7864b131e01

Changed paths:
  A common/printman.cpp
  A common/printman.h
  R backends/printing/printman.cpp
  R backends/printing/printman.h
    Makefile.common
    backends/base-backend.cpp
    backends/module.mk
    common/module.mk
    common/system.cpp
    engines/scumm/he/wiz_he.cpp
    engines/testbed/printing.cpp
    gui/printing-dialog.cpp


diff --git a/Makefile.common b/Makefile.common
index 88351b73af9..21b7e4392fe 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -129,7 +129,7 @@ endif
 
 # The build rule for the ScummVM executable
 $(EXECUTABLE): $(DETECT_OBJS) $(OBJS)
-	+$(QUIET_LINK)$(LD) $(LDFLAGS) -Wl,--start-group $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) -Wl,--end-group $(LIBS) -o $@
+	+$(QUIET_LINK)$(LD) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
 	+$(QUIET)$(LS) $@
 
 ifdef SPLIT_DWARF
diff --git a/backends/base-backend.cpp b/backends/base-backend.cpp
index eb4a6066daa..7b8fc994f93 100644
--- a/backends/base-backend.cpp
+++ b/backends/base-backend.cpp
@@ -33,7 +33,7 @@
 
 
 #include "gui/message.h"
-#include "backends/printing/printman.h"
+#include "common/printman.h"
 
 bool BaseBackend::setScaler(const char *name, int factor) {
 	if (!name)
diff --git a/backends/module.mk b/backends/module.mk
index 1363a8d5b04..95f428db387 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -23,7 +23,6 @@ MODULE_OBJS := \
 	midi/sndio.o \
 	midi/stmidi.o \
 	midi/timidity.o \
-	printing/printman.o \
 	saves/savefile.o \
 	saves/default/default-saves.o \
 	timer/default/default-timer.o
diff --git a/common/module.mk b/common/module.mk
index 315ef171341..3a1e22f9f2e 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -26,6 +26,7 @@ MODULE_OBJS := \
 	osd_message_queue.o \
 	path.o \
 	platform.o \
+	printman.o \
 	punycode.o \
 	random.o \
 	rational.o \
diff --git a/backends/printing/printman.cpp b/common/printman.cpp
similarity index 98%
rename from backends/printing/printman.cpp
rename to common/printman.cpp
index baf716b052b..ad0d68b2db4 100644
--- a/backends/printing/printman.cpp
+++ b/common/printman.cpp
@@ -22,10 +22,9 @@
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/savefile.h"
+#include "common/printman.h"
 #include "common/system.h"
 
-#include "backends/printing/printman.h"
-
 #include "gui/printing-dialog.h"
 
 #ifdef USE_PNG
diff --git a/backends/printing/printman.h b/common/printman.h
similarity index 96%
rename from backends/printing/printman.h
rename to common/printman.h
index 2ada7a8e2f0..62bc1ece9a3 100644
--- a/backends/printing/printman.h
+++ b/common/printman.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef BACKENDS_PRINTING_PRINTMAN_H
-#define BACKENDS_PRINTING_PRINTMAN_H
+#ifndef COMMON_PRINTMAN_H
+#define COMMON_PRINTMAN_H
 
 #include "common/scummsys.h"
 #include "common/str.h"
diff --git a/common/system.cpp b/common/system.cpp
index 4f74e223314..2d75be5628a 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -25,6 +25,7 @@
 #include "common/events.h"
 #include "common/fs.h"
 #include "common/file.h"
+#include "common/printman.h"
 #include "common/savefile.h"
 #include "common/str.h"
 #include "common/taskbar.h"
@@ -37,7 +38,6 @@
 
 #include "backends/audiocd/default/default-audiocd.h"
 #include "backends/fs/fs-factory.h"
-#include "backends/printing/printman.h"
 #include "backends/timer/default/default-timer.h"
 #include "backends/dlc/store.h"
 
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index c30c57fbe24..575f3ba95a8 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -22,6 +22,7 @@
 #ifdef ENABLE_HE
 
 #include "common/archive.h"
+#include "common/printman.h"
 #include "common/ptr.h"
 #include "common/system.h"
 #include "graphics/cursorman.h"
@@ -29,8 +30,6 @@
 #include "graphics/primitives.h"
 #include "scumm/he/font_he.h"
 
-#include "backends/printing/printman.h"
-
 #include "scumm/he/logic_he.h"
 #include "scumm/he/intern_he.h"
 #include "scumm/resource.h"
diff --git a/engines/testbed/printing.cpp b/engines/testbed/printing.cpp
index c283811d5b9..a56b1d190b0 100644
--- a/engines/testbed/printing.cpp
+++ b/engines/testbed/printing.cpp
@@ -21,6 +21,7 @@
 
 #include "base/version.h"
 
+#include "common/printman.h"
 #include "common/rect.h"
 #include "common/str.h"
 #include "common/system.h"
@@ -33,8 +34,6 @@
 
 #include "gui/gui-manager.h"
 
-#include "backends/printing/printman.h"
-
 #include "testbed/printing.h"
 
 namespace Testbed {
diff --git a/gui/printing-dialog.cpp b/gui/printing-dialog.cpp
index 21de830328c..340d333a09e 100644
--- a/gui/printing-dialog.cpp
+++ b/gui/printing-dialog.cpp
@@ -19,11 +19,10 @@
  *
  */
 
+#include "common/printman.h"
 #include "common/translation.h"
 #include "common/system.h"
 
-#include "backends/printing/printman.h"
-
 #include "gui/printing-dialog.h"
 #include "gui/widget.h"
 #include "gui/widgets/popup.h"