Moved base/engine.cpp and .h to engines/ (main motivation: helps untangle the linker dependency graph). Porters will have to update project files

svn-id: r23974

Makefile.common

@@ -33,10 +33,11 @@ DEPDIR := .deps
 
 MODULES := test tools base $(MODULES)
 
--include $(srcdir)/engines/module.mk
+-include $(srcdir)/engines/engines.mk
 
 # After the game specific modules follow the shared modules
 MODULES += \
+	engines \
 	gui \
 	graphics \
 	sound \

backends/fs/amigaos4/amigaos4-fs.cpp

@@ -36,7 +36,7 @@
 
 #include "common/util.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "backends/fs/abstract-fs.h"
 
 #define ENTER() /* debug(6, "Enter") */

backends/fs/morphos/abox-fs.cpp

@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "backends/fs/abstract-fs.h"
 
 /*

backends/fs/psp/psp_fs.cpp

@@ -23,7 +23,7 @@
  */
 
 #ifdef __PSP__
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "backends/fs/abstract-fs.h"
 

backends/platform/dc/audio.cpp

@@ -23,7 +23,7 @@
 
 #include <common/stdafx.h>
 #include <common/scummsys.h>
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "dc.h"
 
 EXTERN_C void *memcpy4s(void *s1, const void *s2, unsigned int n);

backends/platform/dc/softkbd.cpp

@@ -23,7 +23,7 @@
 
 #include <common/stdafx.h>
 #include <common/scummsys.h>
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include <ronin/ronin.h>
 #include <string.h>

backends/platform/dc/vmsave.cpp

@@ -23,7 +23,7 @@
 
 #include <common/stdafx.h>
 #include <common/scummsys.h>
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "dc.h"
 #include "icon.h"
 #include <common/savefile.h>

backends/platform/gp32/gp32_launcher.cpp

@@ -26,7 +26,7 @@
 #include "common/scummsys.h"
 #include "common/file.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "gp32std.h"
 #include "gp32std_grap.h"

backends/platform/gp32/gp32_osys.h

@@ -32,7 +32,7 @@
 #include "common/system.h"
 #include "backends/intern.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "gp32std.h"
 #include "gp32std_grap.h"

backends/platform/gp32/gp32std.cpp

@@ -29,7 +29,7 @@
 #include "common/system.h"
 #include "backends/intern.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "gp32std.h"
 #include "gp32std_grap.h"

backends/platform/gp32/gp32std_memory.cpp

@@ -29,7 +29,7 @@
 #include "common/system.h"
 #include "backends/intern.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "gp32std.h"
 #include "gp32std_grap.h"

backends/platform/morphos/morphos.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "common/util.h"
 #include "scumm/scumm.h"
 

backends/platform/morphos/morphos_scaler.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include <exec/types.h>
 #include <cybergraphics/cybergraphics.h>

backends/platform/morphos/morphos_sound.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include <dos/dos.h>
 #include <exec/memory.h>

backends/platform/morphos/morphos_timer.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include <exec/memory.h>
 #include <exec/semaphores.h>

backends/platform/ps2/fileio.cpp

@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <string.h>
 #include "backends/platform/ps2/asyncfio.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "common/file.h"
 #include "eecodyvdfs.h"
 #include "common/config-manager.h"

backends/platform/ps2/systemps2.cpp

@@ -33,7 +33,7 @@
 #include <iopheap.h>
 #include "common/scummsys.h"
 #include "../intern.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "backends/platform/ps2/systemps2.h"
 #include "backends/platform/ps2/Gs2dScreen.h"
 #include "backends/platform/ps2/ps2input.h"

backends/platform/wince/CELauncherDialog.cpp

@@ -26,7 +26,7 @@
 
 #include "CELauncherDialog.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "gui/newgui.h"
 #include "gui/widget.h"

backends/platform/wince/wince-sdl.cpp

@@ -24,7 +24,7 @@
 #include "wince-sdl.h"
 
 #include "common/util.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "base/main.h"
 #include "base/plugins.h"
 #include "common/timer.h"

base/commandLine.cpp

@@ -23,7 +23,7 @@
 
 #include "common/stdafx.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "base/commandLine.h"
 #include "base/plugins.h"
 #include "base/version.h"

base/main.cpp

@@ -30,7 +30,7 @@
  */
 
 #include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "base/commandLine.h"
 #include "base/plugins.h"
 #include "base/version.h"

base/module.mk

@@ -1,7 +1,6 @@
 MODULE := base
 
 MODULE_OBJS := \
-	engine.o \
 	main.o \
 	commandLine.o \
 	plugins.o \

base/plugins.cpp

@@ -23,7 +23,7 @@
 
 #include "common/stdafx.h"
 #include "base/plugins.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "common/util.h"
 #include "common/fs.h"
 

common/util.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "common/util.h"
 
 namespace Common {

engines/agi/agi.h

@@ -33,7 +33,7 @@
 #include "common/savefile.h"
 #include "common/system.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 namespace Agi {
 

engines/cine/cine.h

@@ -29,7 +29,7 @@
 #include "common/scummsys.h"
 #include "common/util.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "cine/texte.h"
 #include "cine/rel.h"

engines/engine.cpp

@@ -23,7 +23,7 @@
 #if defined(WIN32) && !defined (__SYMBIAN32__)
 #include <malloc.h>
 #endif
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/timer.h"

engines/engines.mk

@@ -0,0 +1,81 @@
+ifdef DISABLE_SCUMM
+DEFINES += -DDISABLE_SCUMM
+else
+MODULES += engines/scumm
+
+ifdef DISABLE_SCUMM_7_8
+DEFINES += -DDISABLE_SCUMM_7_8
+endif
+
+ifdef DISABLE_HE
+DEFINES += -DDISABLE_HE
+endif
+
+endif
+
+ifdef DISABLE_SIMON
+DEFINES += -DDISABLE_SIMON
+else
+MODULES += engines/simon
+endif
+
+ifdef DISABLE_SKY
+DEFINES += -DDISABLE_SKY
+else
+MODULES += engines/sky
+endif
+
+ifdef DISABLE_SWORD1
+DEFINES += -DDISABLE_SWORD1
+else
+MODULES += engines/sword1
+endif
+
+ifdef DISABLE_SWORD2
+DEFINES += -DDISABLE_SWORD2
+else
+MODULES += engines/sword2
+endif
+
+ifdef DISABLE_QUEEN
+DEFINES += -DDISABLE_QUEEN
+else
+MODULES += engines/queen
+endif
+
+ifdef DISABLE_SAGA
+DEFINES += -DDISABLE_SAGA
+else 
+MODULES += engines/saga
+endif
+
+ifdef DISABLE_KYRA
+DEFINES += -DDISABLE_KYRA
+else 
+MODULES += engines/kyra
+endif
+
+ifdef DISABLE_GOB
+DEFINES += -DDISABLE_GOB
+else 
+MODULES += engines/gob
+endif
+
+ifdef DISABLE_LURE
+DEFINES += -DDISABLE_LURE
+else
+MODULES += engines/lure
+endif
+
+ifdef DISABLE_CINE
+DEFINES += -DDISABLE_CINE
+else 
+MODULES += engines/cine
+endif
+
+ifdef DISABLE_AGI
+DEFINES += -DDISABLE_AGI
+else 
+MODULES += engines/agi
+endif
+

engines/gob/gob.h

@@ -26,7 +26,7 @@
 #include "common/stdafx.h"
 #include "common/system.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 namespace Gob {
 

engines/kyra/kyra.h

@@ -23,7 +23,7 @@
 #ifndef KYRA_H
 #define KYRA_H
 
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "common/rect.h"
 
 namespace Kyra {

engines/kyra/seqplayer.cpp

@@ -23,7 +23,7 @@
 #include "common/stdafx.h"
 #include "common/system.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "kyra/kyra.h"
 #include "kyra/resource.h"

engines/lure/game.h

@@ -24,7 +24,7 @@
 #define LURE_GAME_H
 
 #include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "lure/luredefs.h"
 #include "lure/menu.h"
 #include "lure/palette.h"

engines/lure/lure.h

@@ -23,7 +23,7 @@
 #ifndef LURE_H
 #define LURE_H
 
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "common/rect.h"
 #include "sound/mixer.h"
 #include "common/file.h"

engines/lure/screen.h

@@ -24,7 +24,7 @@
 #define LURE_SCREEN_H
 
 #include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "lure/luredefs.h"
 #include "lure/palette.h"
 #include "lure/disk.h"

engines/module.mk

@@ -1,81 +1,7 @@
-ifdef DISABLE_SCUMM
+MODULE := engines
-DEFINES += -DDISABLE_SCUMM
-else
-MODULES += engines/scumm
 
-ifdef DISABLE_SCUMM_7_8
+MODULE_OBJS := \
-DEFINES += -DDISABLE_SCUMM_7_8
+	engine.o
-endif
-
-ifdef DISABLE_HE
-DEFINES += -DDISABLE_HE
-endif
-
-endif
-
-ifdef DISABLE_SIMON
-DEFINES += -DDISABLE_SIMON
-else
-MODULES += engines/simon
-endif
-
-ifdef DISABLE_SKY
-DEFINES += -DDISABLE_SKY
-else
-MODULES += engines/sky
-endif
-
-ifdef DISABLE_SWORD1
-DEFINES += -DDISABLE_SWORD1
-else
-MODULES += engines/sword1
-endif
-
-ifdef DISABLE_SWORD2
-DEFINES += -DDISABLE_SWORD2
-else
-MODULES += engines/sword2
-endif
-
-ifdef DISABLE_QUEEN
-DEFINES += -DDISABLE_QUEEN
-else
-MODULES += engines/queen
-endif
-
-ifdef DISABLE_SAGA
-DEFINES += -DDISABLE_SAGA
-else 
-MODULES += engines/saga
-endif
-
-ifdef DISABLE_KYRA
-DEFINES += -DDISABLE_KYRA
-else 
-MODULES += engines/kyra
-endif
-
-ifdef DISABLE_GOB
-DEFINES += -DDISABLE_GOB
-else 
-MODULES += engines/gob
-endif
-
-ifdef DISABLE_LURE
-DEFINES += -DDISABLE_LURE
-else
-MODULES += engines/lure
-endif
-
-ifdef DISABLE_CINE
-DEFINES += -DDISABLE_CINE
-else 
-MODULES += engines/cine
-endif
-
-ifdef DISABLE_AGI
-DEFINES += -DDISABLE_AGI
-else 
-MODULES += engines/agi
-endif
 
+# Include common rules 
+include $(srcdir)/rules.mk

engines/queen/queen.h

@@ -23,7 +23,7 @@
 #ifndef QUEEN_H
 #define QUEEN_H
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 namespace Common {
 	class InSaveFile;

engines/saga/saga.h

@@ -25,7 +25,7 @@
 #ifndef SAGA_H
 #define SAGA_H
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "common/stream.h"
 

engines/scumm/imuse/imuse_player.cpp

@@ -23,7 +23,7 @@
 #include "common/stdafx.h"
 
 #include "common/util.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "scumm/imuse/imuse_internal.h"
 #include "scumm/saveload.h"

engines/scumm/insane/insane.cpp

@@ -23,7 +23,7 @@
 
 #include "common/stdafx.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "common/system.h"
 

engines/scumm/insane/insane.h

@@ -23,7 +23,7 @@
 #if !defined(INSANE_H) && !defined(DISABLE_SCUMM_7_8)
 #define INSANE_H
 
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "scumm/intern.h"
 #include "scumm/nut_renderer.h"
 

engines/scumm/insane/insane_ben.cpp

@@ -23,7 +23,7 @@
 
 #include "common/stdafx.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "scumm/insane/insane.h"
 

engines/scumm/insane/insane_enemy.cpp

@@ -23,7 +23,7 @@
 
 #include "common/stdafx.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "scumm/insane/insane.h"
 

engines/scumm/insane/insane_iact.cpp

@@ -23,7 +23,7 @@
 
 #include "common/stdafx.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "scumm/scumm.h"
 

engines/scumm/insane/insane_scenes.cpp

@@ -23,7 +23,7 @@
 
 #include "common/stdafx.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "common/config-manager.h"
 

engines/scumm/player_nes.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "scumm/player_nes.h"
 #include "scumm/scumm.h"
 #include "sound/mixer.h"

engines/scumm/player_v1.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "scumm/player_v1.h"
 #include "scumm/scumm.h"
 

engines/scumm/player_v2.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "scumm/player_v2.h"
 #include "scumm/scumm.h"
 #include "sound/mididrv.h"

engines/scumm/player_v2a.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "scumm/player_v2a.h"
 #include "scumm/scumm.h"
 

engines/scumm/player_v3a.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "scumm/player_v3a.h"
 #include "scumm/scumm.h"
 

engines/scumm/script.h

@@ -24,7 +24,7 @@
 #ifndef SCRIPT_H
 #define SCRIPT_H
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 namespace Scumm {
 

engines/scumm/scumm.h

@@ -24,7 +24,7 @@
 #ifndef SCUMM_H
 #define SCUMM_H
 
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "common/endian.h"
 #include "common/file.h"
 #include "common/rect.h"

engines/scumm/smush/smush_player.cpp

@@ -22,7 +22,7 @@
 
 #include "common/stdafx.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "common/config-manager.h"
 #include "common/file.h"

engines/simon/simon.h

@@ -24,7 +24,7 @@
 #ifndef SIMON_H
 #define SIMON_H
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "common/rect.h"
 #include "common/util.h"

engines/sky/sky.h

@@ -24,7 +24,7 @@
 #define SKYMAIN_H
 
 #include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 
 namespace Sky {
 

engines/sword1/resman.cpp

@@ -26,7 +26,7 @@
 #include "common/util.h"
 #include "common/str.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "sword1/memman.h"
 #include "sword1/resman.h"

engines/sword1/sword1.h

@@ -23,7 +23,7 @@
 #ifndef BSSWORD1_H
 #define BSSWORD1_H
 
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "common/util.h"
 #include "sword1/sworddefs.h"
 

engines/sword2/sword2.h

@@ -29,7 +29,7 @@
 
 #define RIGHT_CLICK_CLEARS_LUGGAGE 0
 
-#include "base/engine.h"
+#include "engines/engine.h"
 
 #include "common/util.h"
 

gui/PopUpWidget.cpp

@@ -25,7 +25,7 @@
 #include "gui/eval.h"
 #include "gui/newgui.h"
 #include "gui/PopUpWidget.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 
 namespace GUI {
 

gui/about.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "common/stdafx.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "base/plugins.h"
 #include "base/version.h"
 #include "common/system.h"

gui/console.cpp

@@ -24,7 +24,7 @@
 #include "gui/ScrollBarWidget.h"
 #include "gui/eval.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "base/version.h"
 
 #include "common/system.h"

gui/launcher.cpp

@@ -21,7 +21,7 @@
 
 #include "common/stdafx.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "base/game.h"
 #include "base/plugins.h"
 #include "base/version.h"

sound/audiocd.cpp

@@ -26,7 +26,7 @@
 #include "sound/mp3.h"
 #include "sound/vorbis.h"
 #include "sound/flac.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "common/file.h"
 #include "common/util.h"
 #include "common/system.h"

sound/mididrv.cpp

@@ -23,7 +23,7 @@
 
 #include "common/stdafx.h"
 
-#include "base/engine.h"
+#include "engines/engine.h"
 #include "common/config-manager.h"
 #include "common/str.h"
 #include "common/util.h"

sound/rate.h

@@ -24,7 +24,7 @@
 #define SOUND_RATE_H
 
 #include "common/scummsys.h"
-#include "base/engine.h"
+#include "engines/engine.h"
 
 class AudioStream;