[Scummvm-cvs-logs] SF.net SVN: scummvm: [20582] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Feb 11 14:47:01 CET 2006
Revision: 20582
Author: fingolfin
Date: 2006-02-11 14:45:04 -0800 (Sat, 11 Feb 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20582&view=rev
Log Message:
-----------
Moved engines to the new engines/ directory
Modified Paths:
--------------
scummvm/trunk/Makefile
scummvm/trunk/Makefile.common
scummvm/trunk/engines/gob/module.mk
scummvm/trunk/engines/kyra/module.mk
scummvm/trunk/engines/lure/module.mk
scummvm/trunk/engines/queen/module.mk
scummvm/trunk/engines/saga/module.mk
scummvm/trunk/engines/scumm/module.mk
scummvm/trunk/engines/simon/module.mk
scummvm/trunk/engines/sky/module.mk
scummvm/trunk/engines/sword1/module.mk
scummvm/trunk/engines/sword2/module.mk
Added Paths:
-----------
scummvm/trunk/engines/
scummvm/trunk/engines/gob/
scummvm/trunk/engines/kyra/
scummvm/trunk/engines/lure/
scummvm/trunk/engines/queen/
scummvm/trunk/engines/saga/
scummvm/trunk/engines/scumm/
scummvm/trunk/engines/simon/
scummvm/trunk/engines/sky/
scummvm/trunk/engines/sword1/
scummvm/trunk/engines/sword2/
Removed Paths:
-------------
scummvm/trunk/gob/
scummvm/trunk/kyra/
scummvm/trunk/lure/
scummvm/trunk/queen/
scummvm/trunk/saga/
scummvm/trunk/scumm/
scummvm/trunk/simon/
scummvm/trunk/sky/
scummvm/trunk/sword1/
scummvm/trunk/sword2/
Modified: scummvm/trunk/Makefile
===================================================================
--- scummvm/trunk/Makefile 2006-02-11 21:09:01 UTC (rev 20581)
+++ scummvm/trunk/Makefile 2006-02-11 22:45:04 UTC (rev 20582)
@@ -8,7 +8,7 @@
DEFINES := -DHAVE_CONFIG_H
LDFLAGS :=
-INCLUDES := -I. -I$(srcdir)
+INCLUDES := -I. -I$(srcdir) -I$(srcdir)/engines
LIBS :=
OBJS :=
Modified: scummvm/trunk/Makefile.common
===================================================================
--- scummvm/trunk/Makefile.common 2006-02-11 21:09:01 UTC (rev 20581)
+++ scummvm/trunk/Makefile.common 2006-02-11 22:45:04 UTC (rev 20582)
@@ -36,7 +36,7 @@
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 @@
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
Copied: scummvm/trunk/engines/gob (from rev 20581, scummvm/trunk/gob)
Modified: scummvm/trunk/engines/gob/module.mk
===================================================================
--- scummvm/trunk/gob/module.mk 2006-02-11 21:09:01 UTC (rev 20581)
+++ scummvm/trunk/engines/gob/module.mk 2006-02-11 22:45:04 UTC (rev 20582)
@@ -1,35 +1,35 @@
-MODULE := gob
+MODULE := engines/gob
MODULE_OBJS := \
- gob/anim.o \
- gob/cdrom.o \
- gob/dataio.o \
- gob/draw.o \
- gob/driver_vga.o \
- gob/game.o \
- gob/global.o \
- gob/gob.o \
- gob/goblin.o \
- gob/init.o \
- gob/inter.o \
- gob/inter_v1.o \
- gob/inter_v2.o \
- gob/map.o \
- gob/mult.o \
- gob/music.o \
- gob/pack.o \
- gob/palanim.o \
- gob/parse.o \
- gob/parse_v1.o \
- gob/parse_v2.o \
- gob/scenery.o \
- gob/sound.o \
- gob/timer.o \
- gob/util.o \
- gob/video.o
+ 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 += \
- gob
+ engines/gob
# This module can be built as a plugin
ifdef BUILD_PLUGINS
Copied: scummvm/trunk/engines/kyra (from rev 20581, scummvm/trunk/kyra)
Modified: scummvm/trunk/engines/kyra/module.mk
===================================================================
--- scummvm/trunk/kyra/module.mk 2006-02-11 21:09:01 UTC (rev 20581)
+++ scummvm/trunk/engines/kyra/module.mk 2006-02-11 22:45:04 UTC (rev 20582)
@@ -1,28 +1,28 @@
-MODULE := kyra
+MODULE := engines/kyra
MODULE_OBJS := \
- kyra/kyra.o \
- kyra/resource.o \
- kyra/screen.o \
- kyra/script_v1.o \
- kyra/script.o \
- kyra/seqplayer.o \
- kyra/sound.o \
- kyra/staticres.o \
- kyra/sprites.o \
- kyra/wsamovie.o \
- kyra/debugger.o \
- kyra/animator.o \
- kyra/gui.o \
- kyra/sequences_v1.o \
- kyra/items.o \
- kyra/scene.o \
- kyra/text.o \
- kyra/timer.o \
- kyra/saveload.o
+ 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 += \
- kyra
+ engines/kyra
# This module can be built as a plugin
ifdef BUILD_PLUGINS
Copied: scummvm/trunk/engines/lure (from rev 20581, scummvm/trunk/lure)
Modified: scummvm/trunk/engines/lure/module.mk
===================================================================
--- scummvm/trunk/lure/module.mk 2006-02-11 21:09:01 UTC (rev 20581)
+++ scummvm/trunk/engines/lure/module.mk 2006-02-11 22:45:04 UTC (rev 20582)
@@ -1,30 +1,30 @@
-MODULE := lure
+MODULE := engines/lure
MODULE_OBJS := \
- lure/animseq.o \
- lure/debug-input.o \
- lure/debug-methods.o \
- lure/decode.o \
- lure/disk.o \
- lure/events.o \
- lure/game.o \
- lure/hotspots.o \
- lure/intro.o \
- lure/lure.o \
- lure/memory.o \
- lure/menu.o \
- lure/palette.o \
- lure/res.o \
- lure/res_struct.o \
- lure/room.o \
- lure/screen.o \
- lure/scripts.o \
- lure/strings.o \
- lure/surface.o \
- lure/system.o
+ engines/lure/animseq.o \
+ engines/lure/debug-input.o \
+ engines/lure/debug-methods.o \
+ engines/lure/decode.o \
+ engines/lure/disk.o \
+ engines/lure/events.o \
+ engines/lure/game.o \
+ engines/lure/hotspots.o \
+ engines/lure/intro.o \
+ engines/lure/lure.o \
+ engines/lure/memory.o \
+ engines/lure/menu.o \
+ engines/lure/palette.o \
+ engines/lure/res.o \
+ engines/lure/res_struct.o \
+ engines/lure/room.o \
+ engines/lure/screen.o \
+ engines/lure/scripts.o \
+ engines/lure/strings.o \
+ engines/lure/surface.o \
+ engines/lure/system.o
MODULE_DIRS += \
- lure
+ engines/lure
# This module can be built as a plugin
ifdef BUILD_PLUGINS
Copied: scummvm/trunk/engines/queen (from rev 20581, scummvm/trunk/queen)
Modified: scummvm/trunk/engines/queen/module.mk
===================================================================
--- scummvm/trunk/queen/module.mk 2006-02-11 21:09:01 UTC (rev 20581)
+++ scummvm/trunk/engines/queen/module.mk 2006-02-11 22:45:04 UTC (rev 20582)
@@ -1,29 +1,29 @@
-MODULE := queen
+MODULE := engines/queen
MODULE_OBJS := \
- queen/bankman.o \
- queen/command.o \
- queen/credits.o \
- queen/cutaway.o \
- queen/debug.o \
- queen/display.o \
- queen/graphics.o \
- queen/grid.o \
- queen/input.o \
- queen/journal.o \
- queen/logic.o \
- queen/music.o \
- queen/musicdata.o \
- queen/queen.o \
- queen/resource.o \
- queen/restables.o \
- queen/sound.o \
- queen/state.o \
- queen/talk.o \
- queen/walk.o
+ engines/queen/bankman.o \
+ engines/queen/command.o \
+ engines/queen/credits.o \
+ engines/queen/cutaway.o \
+ engines/queen/debug.o \
+ engines/queen/display.o \
+ engines/queen/graphics.o \
+ engines/queen/grid.o \
+ engines/queen/input.o \
+ engines/queen/journal.o \
+ engines/queen/logic.o \
+ engines/queen/music.o \
+ engines/queen/musicdata.o \
+ engines/queen/queen.o \
+ engines/queen/resource.o \
+ engines/queen/restables.o \
+ engines/queen/sound.o \
+ engines/queen/state.o \
+ engines/queen/talk.o \
+ engines/queen/walk.o
MODULE_DIRS += \
- queen
+ engines/queen
# This module can be built as a plugin
ifdef BUILD_PLUGINS
Copied: scummvm/trunk/engines/saga (from rev 20581, scummvm/trunk/saga)
Modified: scummvm/trunk/engines/saga/module.mk
===================================================================
--- scummvm/trunk/saga/module.mk 2006-02-11 21:09:01 UTC (rev 20581)
+++ scummvm/trunk/engines/saga/module.mk 2006-02-11 22:45:04 UTC (rev 20582)
@@ -1,39 +1,39 @@
-MODULE := saga
+MODULE := engines/saga
MODULE_OBJS := \
- saga/actor.o \
- saga/animation.o \
- saga/console.o \
- saga/events.o \
- saga/font.o \
- saga/font_map.o \
- saga/game.o \
- saga/gfx.o \
- saga/ihnm_introproc.o \
- saga/image.o \
- saga/interface.o \
- saga/isomap.o \
- saga/ite_introproc.o \
- saga/itedata.o \
- saga/objectmap.o \
- saga/puzzle.o \
- saga/palanim.o \
- saga/render.o \
- saga/rscfile.o \
- saga/saga.o \
- saga/saveload.o \
- saga/scene.o \
- saga/script.o \
- saga/sfuncs.o \
- saga/sndres.o \
- saga/sprite.o \
- saga/sthread.o \
- saga/input.o \
- saga/music.o \
- saga/sound.o
+ engines/saga/actor.o \
+ engines/saga/animation.o \
+ engines/saga/console.o \
+ engines/saga/events.o \
+ engines/saga/font.o \
+ engines/saga/font_map.o \
+ engines/saga/game.o \
+ engines/saga/gfx.o \
+ engines/saga/ihnm_introproc.o \
+ engines/saga/image.o \
+ engines/saga/interface.o \
+ engines/saga/isomap.o \
+ engines/saga/ite_introproc.o \
+ engines/saga/itedata.o \
+ engines/saga/objectmap.o \
+ engines/saga/puzzle.o \
+ engines/saga/palanim.o \
+ engines/saga/render.o \
+ engines/saga/rscfile.o \
+ engines/saga/saga.o \
+ engines/saga/saveload.o \
+ engines/saga/scene.o \
+ engines/saga/script.o \
+ engines/saga/sfuncs.o \
+ engines/saga/sndres.o \
+ engines/saga/sprite.o \
+ engines/saga/sthread.o \
+ engines/saga/input.o \
+ engines/saga/music.o \
+ engines/saga/sound.o
MODULE_DIRS += \
- saga
+ engines/saga
# This module can be built as a plugin
ifdef BUILD_PLUGINS
Copied: scummvm/trunk/engines/scumm (from rev 20581, scummvm/trunk/scumm)
Modified: scummvm/trunk/engines/scumm/module.mk
===================================================================
--- scummvm/trunk/scumm/module.mk 2006-02-11 21:09:01 UTC (rev 20581)
+++ scummvm/trunk/engines/scumm/module.mk 2006-02-11 22:45:04 UTC (rev 20582)
@@ -1,103 +1,103 @@
-MODULE := scumm
+MODULE := engines/scumm
MODULE_OBJS := \
- scumm/actor.o \
- scumm/akos.o \
- scumm/base-costume.o \
- scumm/bomp.o \
- scumm/boxes.o \
- scumm/camera.o \
- scumm/charset.o \
- scumm/costume.o \
- scumm/cursor.o \
- scumm/debugger.o \
- scumm/dialogs.o \
- scumm/gfx.o \
- scumm/imuse.o \
- scumm/imuse_player.o \
- scumm/input.o \
- scumm/instrument.o \
- scumm/help.o \
- scumm/midiparser_ro.o \
- scumm/midiparser_eup.o \
- scumm/object.o \
- scumm/palette.o \
- scumm/player_mod.o \
- scumm/player_v1.o \
- scumm/player_nes.o \
- scumm/player_v2.o \
- scumm/player_v2a.o \
- scumm/player_v3a.o \
- scumm/resource.o \
- scumm/resource_v2.o \
- scumm/resource_v3.o \
- scumm/resource_v4.o \
- scumm/room.o \
- scumm/saveload.o \
- scumm/script.o \
- scumm/script_c64.o \
- scumm/script_v2.o \
- scumm/script_v5.o \
- scumm/script_v6.o \
- scumm/script_v6he.o \
- scumm/scumm.o \
- scumm/sound.o \
- scumm/sound_he.o \
- scumm/string.o \
- scumm/usage_bits.o \
- scumm/util.o \
- scumm/vars.o \
- scumm/verbs.o \
- scumm/thumbnail.o
+ engines/scumm/actor.o \
+ engines/scumm/akos.o \
+ engines/scumm/base-costume.o \
+ engines/scumm/bomp.o \
+ engines/scumm/boxes.o \
+ engines/scumm/camera.o \
+ engines/scumm/charset.o \
+ engines/scumm/costume.o \
+ engines/scumm/cursor.o \
+ engines/scumm/debugger.o \
+ engines/scumm/dialogs.o \
+ engines/scumm/gfx.o \
+ engines/scumm/imuse.o \
+ engines/scumm/imuse_player.o \
+ engines/scumm/input.o \
+ engines/scumm/instrument.o \
+ engines/scumm/help.o \
+ engines/scumm/midiparser_ro.o \
+ engines/scumm/midiparser_eup.o \
+ engines/scumm/object.o \
+ engines/scumm/palette.o \
+ engines/scumm/player_mod.o \
+ engines/scumm/player_v1.o \
+ engines/scumm/player_nes.o \
+ engines/scumm/player_v2.o \
+ engines/scumm/player_v2a.o \
+ engines/scumm/player_v3a.o \
+ engines/scumm/resource.o \
+ engines/scumm/resource_v2.o \
+ engines/scumm/resource_v3.o \
+ engines/scumm/resource_v4.o \
+ engines/scumm/room.o \
+ engines/scumm/saveload.o \
+ engines/scumm/script.o \
+ engines/scumm/script_c64.o \
+ engines/scumm/script_v2.o \
+ engines/scumm/script_v5.o \
+ engines/scumm/script_v6.o \
+ engines/scumm/script_v6he.o \
+ engines/scumm/scumm.o \
+ engines/scumm/sound.o \
+ engines/scumm/sound_he.o \
+ engines/scumm/string.o \
+ engines/scumm/usage_bits.o \
+ engines/scumm/util.o \
+ engines/scumm/vars.o \
+ engines/scumm/verbs.o \
+ engines/scumm/thumbnail.o
ifndef DISABLE_SCUMM_7_8
MODULE_OBJS += \
- scumm/nut_renderer.o \
- scumm/script_v8.o \
- scumm/imuse_digi/dimuse.o \
- scumm/imuse_digi/dimuse_bndmgr.o \
- scumm/imuse_digi/dimuse_codecs.o \
- scumm/imuse_digi/dimuse_music.o \
- scumm/imuse_digi/dimuse_sndmgr.o \
- scumm/imuse_digi/dimuse_script.o \
- scumm/imuse_digi/dimuse_track.o \
- scumm/imuse_digi/dimuse_tables.o \
- scumm/insane/insane.o \
- scumm/insane/insane_ben.o \
- scumm/insane/insane_enemy.o \
- scumm/insane/insane_scenes.o \
- scumm/insane/insane_iact.o \
- scumm/smush/chunk.o \
- scumm/smush/codec1.o \
- scumm/smush/codec37.o \
- scumm/smush/codec47.o \
- scumm/smush/imuse_channel.o \
- scumm/smush/smush_player.o \
- scumm/smush/saud_channel.o \
- scumm/smush/smush_mixer.o \
- scumm/smush/smush_font.o
+ engines/scumm/nut_renderer.o \
+ engines/scumm/script_v8.o \
+ engines/scumm/imuse_digi/dimuse.o \
+ engines/scumm/imuse_digi/dimuse_bndmgr.o \
+ engines/scumm/imuse_digi/dimuse_codecs.o \
+ engines/scumm/imuse_digi/dimuse_music.o \
+ engines/scumm/imuse_digi/dimuse_sndmgr.o \
+ engines/scumm/imuse_digi/dimuse_script.o \
+ engines/scumm/imuse_digi/dimuse_track.o \
+ engines/scumm/imuse_digi/dimuse_tables.o \
+ engines/scumm/insane/insane.o \
+ engines/scumm/insane/insane_ben.o \
+ engines/scumm/insane/insane_enemy.o \
+ engines/scumm/insane/insane_scenes.o \
+ engines/scumm/insane/insane_iact.o \
+ engines/scumm/smush/chunk.o \
+ engines/scumm/smush/codec1.o \
+ engines/scumm/smush/codec37.o \
+ engines/scumm/smush/codec47.o \
+ engines/scumm/smush/imuse_channel.o \
+ engines/scumm/smush/smush_player.o \
+ engines/scumm/smush/saud_channel.o \
+ engines/scumm/smush/smush_mixer.o \
+ engines/scumm/smush/smush_font.o
endif
ifndef DISABLE_HE
MODULE_OBJS += \
- scumm/floodfill_he.o \
- scumm/logic_he.o \
- scumm/palette_he.o \
- scumm/resource_v7he.o \
- scumm/script_v7he.o \
- scumm/script_v72he.o \
- scumm/script_v80he.o \
- scumm/script_v90he.o \
- scumm/script_v100he.o \
- scumm/sprite_he.o \
- scumm/wiz_he.o
+ engines/scumm/floodfill_he.o \
+ engines/scumm/logic_he.o \
+ engines/scumm/palette_he.o \
+ engines/scumm/resource_v7he.o \
+ engines/scumm/script_v7he.o \
+ engines/scumm/script_v72he.o \
+ engines/scumm/script_v80he.o \
+ engines/scumm/script_v90he.o \
+ engines/scumm/script_v100he.o \
+ engines/scumm/sprite_he.o \
+ engines/scumm/wiz_he.o
endif
MODULE_DIRS += \
- scumm \
- scumm/imuse_digi \
- scumm/insane \
- scumm/smush
+ engines/scumm \
+ engines/scumm/imuse_digi \
+ engines/scumm/insane \
+ engines/scumm/smush
# This module can be built as a plugin
ifdef BUILD_PLUGINS
Copied: scummvm/trunk/engines/simon (from rev 20581, scummvm/trunk/simon)
Modified: scummvm/trunk/engines/simon/module.mk
===================================================================
--- scummvm/trunk/simon/module.mk 2006-02-11 21:09:01 UTC (rev 20581)
+++ scummvm/trunk/engines/simon/module.mk 2006-02-11 22:45:04 UTC (rev 20582)
@@ -1,24 +1,24 @@
-MODULE := simon
+MODULE := engines/simon
MODULE_OBJS := \
- simon/charset.o \
- simon/cursor.o \
- simon/debug.o \
- simon/debugger.o \
- simon/game.o \
- simon/icons.o \
- simon/items.o \
- simon/midi.o \
- simon/midiparser_s1d.o \
- simon/res.o \
- simon/saveload.o \
- simon/sound.o \
- simon/simon.o \
- simon/verb.o \
- simon/vga.o \
+ engines/simon/charset.o \
+ engines/simon/cursor.o \
+ engines/simon/debug.o \
+ engines/simon/debugger.o \
+ engines/simon/game.o \
+ engines/simon/icons.o \
+ engines/simon/items.o \
+ engines/simon/midi.o \
+ engines/simon/midiparser_s1d.o \
+ engines/simon/res.o \
+ engines/simon/saveload.o \
+ engines/simon/sound.o \
+ engines/simon/simon.o \
+ engines/simon/verb.o \
+ engines/simon/vga.o \
MODULE_DIRS += \
- simon
+ engines/simon
# This module can be built as a plugin
ifdef BUILD_PLUGINS
Copied: scummvm/trunk/engines/sky (from rev 20581, scummvm/trunk/sky)
Modified: scummvm/trunk/engines/sky/module.mk
===================================================================
--- scummvm/trunk/sky/module.mk 2006-02-11 21:09:01 UTC (rev 20581)
+++ scummvm/trunk/engines/sky/module.mk 2006-02-11 22:45:04 UTC (rev 20582)
@@ -1,32 +1,32 @@
-MODULE := sky
+MODULE := engines/sky
MODULE_OBJS := \
- sky/autoroute.o \
- sky/compact.o \
- sky/control.o \
- sky/debug.o \
- sky/disk.o \
- sky/grid.o \
- sky/hufftext.o \
- sky/intro.o \
- sky/logic.o \
- sky/mouse.o \
- sky/rnc_deco.o \
- sky/screen.o \
- sky/sky.o \
- sky/sound.o \
- sky/text.o \
- sky/music/adlibchannel.o \
- sky/music/adlibmusic.o \
- sky/music/gmchannel.o \
- sky/music/gmmusic.o \
- sky/music/mt32music.o \
- sky/music/musicbase.o
+ engines/sky/autoroute.o \
+ engines/sky/compact.o \
+ engines/sky/control.o \
+ engines/sky/debug.o \
+ engines/sky/disk.o \
+ engines/sky/grid.o \
+ engines/sky/hufftext.o \
+ engines/sky/intro.o \
+ engines/sky/logic.o \
+ engines/sky/mouse.o \
+ engines/sky/rnc_deco.o \
+ engines/sky/screen.o \
+ engines/sky/sky.o \
+ engines/sky/sound.o \
+ engines/sky/text.o \
+ engines/sky/music/adlibchannel.o \
+ engines/sky/music/adlibmusic.o \
+ engines/sky/music/gmchannel.o \
+ engines/sky/music/gmmusic.o \
+ engines/sky/music/mt32music.o \
+ engines/sky/music/musicbase.o
MODULE_DIRS += \
- sky \
- sky/music \
- sky/compacts
+ engines/sky \
+ engines/sky/music \
+ engines/sky/compacts
# This module can be built as a plugin
ifdef BUILD_PLUGINS
Copied: scummvm/trunk/engines/sword1 (from rev 20581, scummvm/trunk/sword1)
Modified: scummvm/trunk/engines/sword1/module.mk
===================================================================
--- scummvm/trunk/sword1/module.mk 2006-02-11 21:09:01 UTC (rev 20581)
+++ scummvm/trunk/engines/sword1/module.mk 2006-02-11 22:45:04 UTC (rev 20582)
@@ -1,27 +1,27 @@
-MODULE := sword1
+MODULE := engines/sword1
MODULE_OBJS := \
- sword1/animation.o \
- sword1/control.o \
- sword1/credits.o \
- sword1/debug.o \
- sword1/eventman.o \
- sword1/logic.o \
- sword1/memman.o \
- sword1/menu.o \
- sword1/mouse.o \
- sword1/music.o \
- sword1/objectman.o \
- sword1/resman.o \
- sword1/router.o \
- sword1/screen.o \
- sword1/sound.o \
- sword1/staticres.o \
- sword1/sword1.o \
- sword1/text.o
+ engines/sword1/animation.o \
+ engines/sword1/control.o \
+ engines/sword1/credits.o \
+ engines/sword1/debug.o \
+ engines/sword1/eventman.o \
+ engines/sword1/logic.o \
+ engines/sword1/memman.o \
+ engines/sword1/menu.o \
+ engines/sword1/mouse.o \
+ engines/sword1/music.o \
+ engines/sword1/objectman.o \
+ engines/sword1/resman.o \
+ engines/sword1/router.o \
+ engines/sword1/screen.o \
+ engines/sword1/sound.o \
+ engines/sword1/staticres.o \
+ engines/sword1/sword1.o \
+ engines/sword1/text.o
MODULE_DIRS += \
- sword1
+ engines/sword1
# This module can be built as a plugin
ifdef BUILD_PLUGINS
Copied: scummvm/trunk/engines/sword2 (from rev 20581, scummvm/trunk/sword2)
Modified: scummvm/trunk/engines/sword2/module.mk
===================================================================
--- scummvm/trunk/sword2/module.mk 2006-02-11 21:09:01 UTC (rev 20581)
+++ scummvm/trunk/engines/sword2/module.mk 2006-02-11 22:45:04 UTC (rev 20582)
@@ -1,43 +1,43 @@
-MODULE := sword2
+MODULE := engines/sword2
MODULE_OBJS := \
- sword2/_mouse.o \
- sword2/animation.o \
- sword2/anims.o \
- sword2/build_display.o \
- sword2/console.o \
- sword2/controls.o \
- sword2/d_draw.o \
- sword2/debug.o \
- sword2/events.o \
- sword2/function.o \
- sword2/icons.o \
- sword2/interpreter.o \
- sword2/layers.o \
- sword2/logic.o \
- sword2/maketext.o \
- sword2/memory.o \
- sword2/menu.o \
- sword2/mouse.o \
- sword2/music.o \
- sword2/palette.o \
- sword2/protocol.o \
- sword2/rdwin.o \
- sword2/render.o \
- sword2/resman.o \
- sword2/router.o \
- sword2/save_rest.o \
- sword2/scroll.o \
- sword2/sound.o \
- sword2/speech.o \
- sword2/sprite.o \
- sword2/startup.o \
- sword2/sword2.o \
- sword2/sync.o \
- sword2/walker.o
+ engines/sword2/_mouse.o \
+ engines/sword2/animation.o \
+ engines/sword2/anims.o \
+ engines/sword2/build_display.o \
+ engines/sword2/console.o \
+ engines/sword2/controls.o \
+ engines/sword2/d_draw.o \
+ engines/sword2/debug.o \
+ engines/sword2/events.o \
+ engines/sword2/function.o \
+ engines/sword2/icons.o \
+ engines/sword2/interpreter.o \
+ engines/sword2/layers.o \
+ engines/sword2/logic.o \
+ engines/sword2/maketext.o \
+ engines/sword2/memory.o \
+ engines/sword2/menu.o \
+ engines/sword2/mouse.o \
+ engines/sword2/music.o \
+ engines/sword2/palette.o \
+ engines/sword2/protocol.o \
+ engines/sword2/rdwin.o \
+ engines/sword2/render.o \
+ engines/sword2/resman.o \
+ engines/sword2/router.o \
+ engines/sword2/save_rest.o \
+ engines/sword2/scroll.o \
+ engines/sword2/sound.o \
+ engines/sword2/speech.o \
+ engines/sword2/sprite.o \
+ engines/sword2/startup.o \
+ engines/sword2/sword2.o \
+ engines/sword2/sync.o \
+ engines/sword2/walker.o
MODULE_DIRS += \
- sword2
+ engines/sword2
# This module can be built as a plugin
ifdef BUILD_PLUGINS
More information about the Scummvm-git-logs
mailing list