Moved engines to the new engines/ directory

svn-id: r20582

Makefile

@@ -8,7 +8,7 @@ srcdir      ?= .
 
 DEFINES     := -DHAVE_CONFIG_H
 LDFLAGS     :=
-INCLUDES    := -I. -I$(srcdir)
+INCLUDES    := -I. -I$(srcdir) -I$(srcdir)/engines
 LIBS	    :=
 OBJS	    :=
 

Makefile.common

@@ -36,7 +36,7 @@ MODULES := tools base $(MODULES)
 ifdef DISABLE_SCUMM
 DEFINES += -DDISABLE_SCUMM
 else
-MODULES += scumm
+MODULES += engines/scumm
 
 ifdef DISABLE_SCUMM_7_8
 DEFINES += -DDISABLE_SCUMM_7_8
@@ -51,55 +51,55 @@ endif
 ifdef DISABLE_SIMON
 DEFINES += -DDISABLE_SIMON
 else
-MODULES += simon
+MODULES += engines/simon
 endif
 
 ifdef DISABLE_SKY
 DEFINES += -DDISABLE_SKY
 else
-MODULES += sky
+MODULES += engines/sky
 endif
 
 ifdef DISABLE_SWORD1
 DEFINES += -DDISABLE_SWORD1
 else
-MODULES += sword1
+MODULES += engines/sword1
 endif
 
 ifdef DISABLE_SWORD2
 DEFINES += -DDISABLE_SWORD2
 else
-MODULES += sword2
+MODULES += engines/sword2
 endif
 
 ifdef DISABLE_QUEEN
 DEFINES += -DDISABLE_QUEEN
 else
-MODULES += queen
+MODULES += engines/queen
 endif
 
 ifdef DISABLE_SAGA
 DEFINES += -DDISABLE_SAGA
 else 
-MODULES += saga
+MODULES += engines/saga
 endif
 
 ifdef DISABLE_KYRA
 DEFINES += -DDISABLE_KYRA
 else 
-MODULES += kyra
+MODULES += engines/kyra
 endif
 
 ifdef DISABLE_GOB
 DEFINES += -DDISABLE_GOB
 else 
-MODULES += gob
+MODULES += engines/gob
 endif
 
 ifdef DISABLE_LURE
 DEFINES += -DDISABLE_LURE
 else
-MODULES += lure
+MODULES += engines/lure
 endif
 
 # After the game specific modules follow the shared modules

engines/gob/module.mk

@@ -0,0 +1,40 @@
+MODULE := engines/gob
+
+MODULE_OBJS := \
+	engines/gob/anim.o \
+	engines/gob/cdrom.o \
+	engines/gob/dataio.o \
+	engines/gob/draw.o \
+	engines/gob/driver_vga.o \
+	engines/gob/game.o \
+	engines/gob/global.o \
+	engines/gob/gob.o \
+	engines/gob/goblin.o \
+	engines/gob/init.o \
+	engines/gob/inter.o \
+	engines/gob/inter_v1.o \
+	engines/gob/inter_v2.o \
+	engines/gob/map.o \
+	engines/gob/mult.o \
+	engines/gob/music.o \
+	engines/gob/pack.o \
+	engines/gob/palanim.o \
+	engines/gob/parse.o \
+	engines/gob/parse_v1.o \
+	engines/gob/parse_v2.o \
+	engines/gob/scenery.o \
+	engines/gob/sound.o \
+	engines/gob/timer.o \
+	engines/gob/util.o \
+	engines/gob/video.o
+
+MODULE_DIRS += \
+	engines/gob
+
+# This module can be built as a plugin
+ifdef BUILD_PLUGINS
+PLUGIN := 1
+endif
+
+# Include common rules 
+include $(srcdir)/common.rules

engines/kyra/module.mk

@@ -0,0 +1,33 @@
+MODULE := engines/kyra
+
+MODULE_OBJS := \
+	engines/kyra/kyra.o \
+	engines/kyra/resource.o \
+	engines/kyra/screen.o \
+	engines/kyra/script_v1.o \
+	engines/kyra/script.o \
+	engines/kyra/seqplayer.o \
+	engines/kyra/sound.o \
+	engines/kyra/staticres.o \
+	engines/kyra/sprites.o \
+	engines/kyra/wsamovie.o \
+	engines/kyra/debugger.o \
+	engines/kyra/animator.o \
+	engines/kyra/gui.o \
+	engines/kyra/sequences_v1.o \
+	engines/kyra/items.o \
+	engines/kyra/scene.o \
+	engines/kyra/text.o \
+	engines/kyra/timer.o \
+	engines/kyra/saveload.o
+
+MODULE_DIRS += \
+	engines/kyra
+
+# This module can be built as a plugin
+ifdef BUILD_PLUGINS
+PLUGIN := 1
+endif
+
+# Include common rules 
+include $(srcdir)/common.rules