From 26ee630756ebdd7c96bccede0881a8c8b98e8f2b Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 11 Feb 2006 22:45:04 +0000 Subject: [PATCH] Moved engines to the new engines/ directory svn-id: r20582 --- Makefile | 2 +- Makefile.common | 20 ++-- {gob => engines/gob}/anim.cpp | 0 {gob => engines/gob}/anim.h | 0 {gob => engines/gob}/cdrom.cpp | 0 {gob => engines/gob}/cdrom.h | 0 {gob => engines/gob}/dataio.cpp | 0 {gob => engines/gob}/dataio.h | 0 {gob => engines/gob}/draw.cpp | 0 {gob => engines/gob}/draw.h | 0 {gob => engines/gob}/driver_vga.cpp | 0 {gob => engines/gob}/driver_vga.h | 0 {gob => engines/gob}/game.cpp | 0 {gob => engines/gob}/game.h | 0 {gob => engines/gob}/global.cpp | 0 {gob => engines/gob}/global.h | 0 {gob => engines/gob}/gob.cpp | 0 {gob => engines/gob}/gob.h | 0 {gob => engines/gob}/goblin.cpp | 0 {gob => engines/gob}/goblin.h | 0 {gob => engines/gob}/init.cpp | 0 {gob => engines/gob}/init.h | 0 {gob => engines/gob}/inter.cpp | 0 {gob => engines/gob}/inter.h | 0 {gob => engines/gob}/inter_v1.cpp | 0 {gob => engines/gob}/inter_v2.cpp | 0 {gob => engines/gob}/map.cpp | 0 {gob => engines/gob}/map.h | 0 engines/gob/module.mk | 40 +++++++ {gob => engines/gob}/mult.cpp | 0 {gob => engines/gob}/mult.h | 0 {gob => engines/gob}/music.cpp | 0 {gob => engines/gob}/music.h | 0 {gob => engines/gob}/pack.cpp | 0 {gob => engines/gob}/pack.h | 0 {gob => engines/gob}/palanim.cpp | 0 {gob => engines/gob}/palanim.h | 0 {gob => engines/gob}/parse.cpp | 0 {gob => engines/gob}/parse.h | 0 {gob => engines/gob}/parse_v1.cpp | 0 {gob => engines/gob}/parse_v2.cpp | 0 {gob => engines/gob}/scenery.cpp | 0 {gob => engines/gob}/scenery.h | 0 {gob => engines/gob}/sound.cpp | 0 {gob => engines/gob}/sound.h | 0 {gob => engines/gob}/timer.cpp | 0 {gob => engines/gob}/timer.h | 0 {gob => engines/gob}/util.cpp | 0 {gob => engines/gob}/util.h | 0 {gob => engines/gob}/video.cpp | 0 {gob => engines/gob}/video.h | 0 {kyra => engines/kyra}/animator.cpp | 0 {kyra => engines/kyra}/animator.h | 0 {kyra => engines/kyra}/debugger.cpp | 0 {kyra => engines/kyra}/debugger.h | 0 {kyra => engines/kyra}/gui.cpp | 0 {kyra => engines/kyra}/items.cpp | 0 {kyra => engines/kyra}/kyra.cpp | 0 {kyra => engines/kyra}/kyra.h | 0 engines/kyra/module.mk | 33 ++++++ {kyra => engines/kyra}/resource.cpp | 0 {kyra => engines/kyra}/resource.h | 0 {kyra => engines/kyra}/saveload.cpp | 0 {kyra => engines/kyra}/scene.cpp | 0 {kyra => engines/kyra}/screen.cpp | 0 {kyra => engines/kyra}/screen.h | 0 {kyra => engines/kyra}/script.cpp | 0 {kyra => engines/kyra}/script.h | 0 {kyra => engines/kyra}/script_v1.cpp | 0 {kyra => engines/kyra}/seqplayer.cpp | 0 {kyra => engines/kyra}/seqplayer.h | 0 {kyra => engines/kyra}/sequences_v1.cpp | 0 {kyra => engines/kyra}/sound.cpp | 0 {kyra => engines/kyra}/sound.h | 0 {kyra => engines/kyra}/sprites.cpp | 0 {kyra => engines/kyra}/sprites.h | 0 {kyra => engines/kyra}/staticres.cpp | 0 {kyra => engines/kyra}/text.cpp | 0 {kyra => engines/kyra}/text.h | 0 {kyra => engines/kyra}/timer.cpp | 0 {kyra => engines/kyra}/wsamovie.cpp | 0 {kyra => engines/kyra}/wsamovie.h | 0 {lure => engines/lure}/animseq.cpp | 0 {lure => engines/lure}/animseq.h | 0 {lure => engines/lure}/debug-input.cpp | 0 {lure => engines/lure}/debug-input.h | 0 {lure => engines/lure}/debug-methods.cpp | 0 {lure => engines/lure}/debug-methods.h | 0 {lure => engines/lure}/decode.cpp | 0 {lure => engines/lure}/decode.h | 0 {lure => engines/lure}/disk.cpp | 0 {lure => engines/lure}/disk.h | 0 {lure => engines/lure}/events.cpp | 0 {lure => engines/lure}/events.h | 0 {lure => engines/lure}/game.cpp | 0 {lure => engines/lure}/game.h | 0 {lure => engines/lure}/hotspots.cpp | 0 {lure => engines/lure}/hotspots.h | 0 {lure => engines/lure}/intro.cpp | 0 {lure => engines/lure}/intro.h | 0 {lure => engines/lure}/lure.cpp | 0 {lure => engines/lure}/lure.h | 0 {lure => engines/lure}/luredefs.h | 0 {lure => engines/lure}/memory.cpp | 0 {lure => engines/lure}/memory.h | 0 {lure => engines/lure}/menu.cpp | 0 {lure => engines/lure}/menu.h | 0 engines/lure/module.mk | 36 ++++++ {lure => engines/lure}/palette.cpp | 0 {lure => engines/lure}/palette.h | 0 {lure => engines/lure}/res.cpp | 0 {lure => engines/lure}/res.h | 0 {lure => engines/lure}/res_struct.cpp | 0 {lure => engines/lure}/res_struct.h | 0 {lure => engines/lure}/room.cpp | 0 {lure => engines/lure}/room.h | 0 {lure => engines/lure}/screen.cpp | 0 {lure => engines/lure}/screen.h | 0 {lure => engines/lure}/scripts.cpp | 0 {lure => engines/lure}/scripts.h | 0 {lure => engines/lure}/strings.cpp | 0 {lure => engines/lure}/strings.h | 0 {lure => engines/lure}/surface.cpp | 0 {lure => engines/lure}/surface.h | 0 {lure => engines/lure}/system.cpp | 0 {lure => engines/lure}/system.h | 0 {queen => engines/queen}/bankman.cpp | 0 {queen => engines/queen}/bankman.h | 0 {queen => engines/queen}/command.cpp | 0 {queen => engines/queen}/command.h | 0 {queen => engines/queen}/credits.cpp | 0 {queen => engines/queen}/credits.h | 0 {queen => engines/queen}/cutaway.cpp | 0 {queen => engines/queen}/cutaway.h | 0 {queen => engines/queen}/debug.cpp | 0 {queen => engines/queen}/debug.h | 0 {queen => engines/queen}/defs.h | 0 {queen => engines/queen}/display.cpp | 0 {queen => engines/queen}/display.h | 0 {queen => engines/queen}/graphics.cpp | 0 {queen => engines/queen}/graphics.h | 0 {queen => engines/queen}/grid.cpp | 0 {queen => engines/queen}/grid.h | 0 {queen => engines/queen}/input.cpp | 0 {queen => engines/queen}/input.h | 0 {queen => engines/queen}/journal.cpp | 0 {queen => engines/queen}/journal.h | 0 {queen => engines/queen}/logic.cpp | 0 {queen => engines/queen}/logic.h | 0 engines/queen/module.mk | 34 ++++++ {queen => engines/queen}/music.cpp | 0 {queen => engines/queen}/music.h | 0 {queen => engines/queen}/musicdata.cpp | 0 {queen => engines/queen}/queen.cpp | 0 {queen => engines/queen}/queen.h | 0 {queen => engines/queen}/resource.cpp | 0 {queen => engines/queen}/resource.h | 0 {queen => engines/queen}/restables.cpp | 0 {queen => engines/queen}/sound.cpp | 0 {queen => engines/queen}/sound.h | 0 {queen => engines/queen}/state.cpp | 0 {queen => engines/queen}/state.h | 0 {queen => engines/queen}/structs.h | 0 {queen => engines/queen}/talk.cpp | 0 {queen => engines/queen}/talk.h | 0 {queen => engines/queen}/walk.cpp | 0 {queen => engines/queen}/walk.h | 0 {queen => engines/queen}/xref.txt | 0 {saga => engines/saga}/actor.cpp | 0 {saga => engines/saga}/actor.h | 0 {saga => engines/saga}/animation.cpp | 0 {saga => engines/saga}/animation.h | 0 {saga => engines/saga}/console.cpp | 0 {saga => engines/saga}/console.h | 0 {saga => engines/saga}/events.cpp | 0 {saga => engines/saga}/events.h | 0 {saga => engines/saga}/font.cpp | 0 {saga => engines/saga}/font.h | 0 {saga => engines/saga}/font_map.cpp | 0 {saga => engines/saga}/game.cpp | 0 {saga => engines/saga}/gfx.cpp | 0 {saga => engines/saga}/gfx.h | 0 {saga => engines/saga}/ihnm_introproc.cpp | 0 {saga => engines/saga}/image.cpp | 0 {saga => engines/saga}/input.cpp | 0 {saga => engines/saga}/interface.cpp | 0 {saga => engines/saga}/interface.h | 0 {saga => engines/saga}/isomap.cpp | 0 {saga => engines/saga}/isomap.h | 0 {saga => engines/saga}/ite_introproc.cpp | 0 {saga => engines/saga}/itedata.cpp | 0 {saga => engines/saga}/itedata.h | 0 {saga => engines/saga}/list.h | 0 engines/saga/module.mk | 44 +++++++ {saga => engines/saga}/music.cpp | 0 {saga => engines/saga}/music.h | 0 {saga => engines/saga}/objectmap.cpp | 0 {saga => engines/saga}/objectmap.h | 0 {saga => engines/saga}/palanim.cpp | 0 {saga => engines/saga}/palanim.h | 0 {saga => engines/saga}/puzzle.cpp | 0 {saga => engines/saga}/puzzle.h | 0 {saga => engines/saga}/render.cpp | 0 {saga => engines/saga}/render.h | 0 {saga => engines/saga}/resnames.h | 0 {saga => engines/saga}/rscfile.cpp | 0 {saga => engines/saga}/rscfile.h | 0 {saga => engines/saga}/saga.cpp | 0 {saga => engines/saga}/saga.h | 0 {saga => engines/saga}/saveload.cpp | 0 {saga => engines/saga}/scene.cpp | 0 {saga => engines/saga}/scene.h | 0 {saga => engines/saga}/script.cpp | 0 {saga => engines/saga}/script.h | 0 {saga => engines/saga}/sfuncs.cpp | 0 {saga => engines/saga}/sndres.cpp | 0 {saga => engines/saga}/sndres.h | 0 {saga => engines/saga}/sound.cpp | 0 {saga => engines/saga}/sound.h | 0 {saga => engines/saga}/sprite.cpp | 0 {saga => engines/saga}/sprite.h | 0 {saga => engines/saga}/sthread.cpp | 0 {saga => engines/saga}/stream.h | 0 {saga => engines/saga}/xref.txt | 0 {scumm => engines/scumm}/actor.cpp | 0 {scumm => engines/scumm}/actor.h | 0 {scumm => engines/scumm}/akos.cpp | 0 {scumm => engines/scumm}/akos.h | 0 {scumm => engines/scumm}/base-costume.cpp | 0 {scumm => engines/scumm}/base-costume.h | 0 {scumm => engines/scumm}/bomp.cpp | 0 {scumm => engines/scumm}/bomp.h | 0 {scumm => engines/scumm}/boxes.cpp | 0 {scumm => engines/scumm}/boxes.h | 0 {scumm => engines/scumm}/camera.cpp | 0 {scumm => engines/scumm}/charset.cpp | 0 {scumm => engines/scumm}/charset.h | 0 {scumm => engines/scumm}/costume.cpp | 0 {scumm => engines/scumm}/costume.h | 0 {scumm => engines/scumm}/cursor.cpp | 0 {scumm => engines/scumm}/debugger.cpp | 0 {scumm => engines/scumm}/debugger.h | 0 {scumm => engines/scumm}/dialogs.cpp | 0 {scumm => engines/scumm}/dialogs.h | 0 {scumm => engines/scumm}/floodfill_he.cpp | 0 {scumm => engines/scumm}/floodfill_he.h | 0 {scumm => engines/scumm}/gfx.cpp | 0 {scumm => engines/scumm}/gfx.h | 0 {scumm => engines/scumm}/help.cpp | 0 {scumm => engines/scumm}/help.h | 0 {scumm => engines/scumm}/imuse.cpp | 0 {scumm => engines/scumm}/imuse.h | 0 .../scumm}/imuse_digi/dimuse.cpp | 0 {scumm => engines/scumm}/imuse_digi/dimuse.h | 0 .../scumm}/imuse_digi/dimuse_bndmgr.cpp | 0 .../scumm}/imuse_digi/dimuse_bndmgr.h | 0 .../scumm}/imuse_digi/dimuse_codecs.cpp | 0 .../scumm}/imuse_digi/dimuse_music.cpp | 0 .../scumm}/imuse_digi/dimuse_script.cpp | 0 .../scumm}/imuse_digi/dimuse_sndmgr.cpp | 0 .../scumm}/imuse_digi/dimuse_sndmgr.h | 0 .../scumm}/imuse_digi/dimuse_tables.cpp | 0 .../scumm}/imuse_digi/dimuse_track.cpp | 0 {scumm => engines/scumm}/imuse_internal.h | 0 {scumm => engines/scumm}/imuse_player.cpp | 0 {scumm => engines/scumm}/input.cpp | 0 {scumm => engines/scumm}/insane/insane.cpp | 0 {scumm => engines/scumm}/insane/insane.h | 0 .../scumm}/insane/insane_ben.cpp | 0 .../scumm}/insane/insane_enemy.cpp | 0 .../scumm}/insane/insane_iact.cpp | 0 .../scumm}/insane/insane_scenes.cpp | 0 {scumm => engines/scumm}/instrument.cpp | 0 {scumm => engines/scumm}/instrument.h | 0 {scumm => engines/scumm}/intern.h | 0 {scumm => engines/scumm}/intern_he.h | 0 {scumm => engines/scumm}/logic_he.cpp | 0 {scumm => engines/scumm}/logic_he.h | 0 {scumm => engines/scumm}/midiparser_eup.cpp | 0 {scumm => engines/scumm}/midiparser_ro.cpp | 0 engines/scumm/module.mk | 110 ++++++++++++++++++ {scumm => engines/scumm}/music.h | 0 {scumm => engines/scumm}/nut_renderer.cpp | 0 {scumm => engines/scumm}/nut_renderer.h | 0 {scumm => engines/scumm}/object.cpp | 0 {scumm => engines/scumm}/object.h | 0 {scumm => engines/scumm}/palette.cpp | 0 {scumm => engines/scumm}/palette_he.cpp | 0 {scumm => engines/scumm}/player_mod.cpp | 0 {scumm => engines/scumm}/player_mod.h | 0 {scumm => engines/scumm}/player_nes.cpp | 0 {scumm => engines/scumm}/player_nes.h | 0 {scumm => engines/scumm}/player_v1.cpp | 0 {scumm => engines/scumm}/player_v1.h | 0 {scumm => engines/scumm}/player_v2.cpp | 0 {scumm => engines/scumm}/player_v2.h | 0 {scumm => engines/scumm}/player_v2a.cpp | 0 {scumm => engines/scumm}/player_v2a.h | 0 {scumm => engines/scumm}/player_v3a.cpp | 0 {scumm => engines/scumm}/player_v3a.h | 0 {scumm => engines/scumm}/resource.cpp | 0 {scumm => engines/scumm}/resource.h | 0 {scumm => engines/scumm}/resource_v2.cpp | 0 {scumm => engines/scumm}/resource_v3.cpp | 0 {scumm => engines/scumm}/resource_v4.cpp | 0 {scumm => engines/scumm}/resource_v7he.cpp | 0 {scumm => engines/scumm}/resource_v7he.h | 0 {scumm => engines/scumm}/room.cpp | 0 {scumm => engines/scumm}/saveload.cpp | 0 {scumm => engines/scumm}/saveload.h | 0 {scumm => engines/scumm}/script.cpp | 0 {scumm => engines/scumm}/script.h | 0 {scumm => engines/scumm}/script_c64.cpp | 0 {scumm => engines/scumm}/script_v100he.cpp | 0 {scumm => engines/scumm}/script_v2.cpp | 0 {scumm => engines/scumm}/script_v5.cpp | 0 {scumm => engines/scumm}/script_v6.cpp | 0 {scumm => engines/scumm}/script_v6he.cpp | 0 {scumm => engines/scumm}/script_v72he.cpp | 0 {scumm => engines/scumm}/script_v7he.cpp | 0 {scumm => engines/scumm}/script_v8.cpp | 0 {scumm => engines/scumm}/script_v80he.cpp | 0 {scumm => engines/scumm}/script_v90he.cpp | 0 {scumm => engines/scumm}/scumm-md5.h | 0 {scumm => engines/scumm}/scumm.cpp | 0 {scumm => engines/scumm}/scumm.h | 0 {scumm => engines/scumm}/smush/channel.h | 0 {scumm => engines/scumm}/smush/chunk.cpp | 0 {scumm => engines/scumm}/smush/chunk.h | 0 {scumm => engines/scumm}/smush/chunk_type.h | 0 {scumm => engines/scumm}/smush/codec1.cpp | 0 {scumm => engines/scumm}/smush/codec37.cpp | 0 {scumm => engines/scumm}/smush/codec37.h | 0 {scumm => engines/scumm}/smush/codec47.cpp | 0 {scumm => engines/scumm}/smush/codec47.h | 0 .../scumm}/smush/imuse_channel.cpp | 0 .../scumm}/smush/saud_channel.cpp | 0 {scumm => engines/scumm}/smush/smush_font.cpp | 0 {scumm => engines/scumm}/smush/smush_font.h | 0 .../scumm}/smush/smush_mixer.cpp | 0 {scumm => engines/scumm}/smush/smush_mixer.h | 0 .../scumm}/smush/smush_player.cpp | 0 {scumm => engines/scumm}/smush/smush_player.h | 0 {scumm => engines/scumm}/sound.cpp | 0 {scumm => engines/scumm}/sound.h | 0 {scumm => engines/scumm}/sound_he.cpp | 0 {scumm => engines/scumm}/sprite_he.cpp | 0 {scumm => engines/scumm}/sprite_he.h | 0 {scumm => engines/scumm}/string.cpp | 0 {scumm => engines/scumm}/thumbnail.cpp | 0 {scumm => engines/scumm}/usage_bits.cpp | 0 {scumm => engines/scumm}/usage_bits.h | 0 {scumm => engines/scumm}/util.cpp | 0 {scumm => engines/scumm}/util.h | 0 {scumm => engines/scumm}/vars.cpp | 0 {scumm => engines/scumm}/verbs.cpp | 0 {scumm => engines/scumm}/verbs.h | 0 {scumm => engines/scumm}/wiz_he.cpp | 0 {scumm => engines/scumm}/wiz_he.h | 0 {simon => engines/simon}/charset.cpp | 0 {simon => engines/simon}/cursor.cpp | 0 {simon => engines/simon}/debug.cpp | 0 {simon => engines/simon}/debug.h | 0 {simon => engines/simon}/debugger.cpp | 0 {simon => engines/simon}/debugger.h | 0 {simon => engines/simon}/game.cpp | 0 {simon => engines/simon}/icons.cpp | 0 {simon => engines/simon}/intern.h | 0 {simon => engines/simon}/items.cpp | 0 {simon => engines/simon}/midi.cpp | 0 {simon => engines/simon}/midi.h | 0 {simon => engines/simon}/midiparser_s1d.cpp | 0 engines/simon/module.mk | 29 +++++ {simon => engines/simon}/res.cpp | 0 {simon => engines/simon}/saveload.cpp | 0 {simon => engines/simon}/simon.cpp | 0 {simon => engines/simon}/simon.h | 0 {simon => engines/simon}/sound.cpp | 0 {simon => engines/simon}/sound.h | 0 {simon => engines/simon}/verb.cpp | 0 {simon => engines/simon}/vga.cpp | 0 {simon => engines/simon}/vga.h | 0 {sky => engines/sky}/autoroute.cpp | 0 {sky => engines/sky}/autoroute.h | 0 {sky => engines/sky}/compact.cpp | 0 {sky => engines/sky}/compact.h | 0 {sky => engines/sky}/control.cpp | 0 {sky => engines/sky}/control.h | 0 {sky => engines/sky}/debug.cpp | 0 {sky => engines/sky}/debug.h | 0 {sky => engines/sky}/disk.cpp | 0 {sky => engines/sky}/disk.h | 0 {sky => engines/sky}/grid.cpp | 0 {sky => engines/sky}/grid.h | 0 {sky => engines/sky}/hufftext.cpp | 0 {sky => engines/sky}/intro.cpp | 0 {sky => engines/sky}/intro.h | 0 {sky => engines/sky}/logic.cpp | 0 {sky => engines/sky}/logic.h | 0 engines/sky/module.mk | 37 ++++++ {sky => engines/sky}/mouse.cpp | 0 {sky => engines/sky}/mouse.h | 0 {sky => engines/sky}/music/adlibchannel.cpp | 0 {sky => engines/sky}/music/adlibchannel.h | 0 {sky => engines/sky}/music/adlibmusic.cpp | 0 {sky => engines/sky}/music/adlibmusic.h | 0 {sky => engines/sky}/music/gmchannel.cpp | 0 {sky => engines/sky}/music/gmchannel.h | 0 {sky => engines/sky}/music/gmmusic.cpp | 0 {sky => engines/sky}/music/gmmusic.h | 0 {sky => engines/sky}/music/mt32music.cpp | 0 {sky => engines/sky}/music/mt32music.h | 0 {sky => engines/sky}/music/musicbase.cpp | 0 {sky => engines/sky}/music/musicbase.h | 0 {sky => engines/sky}/rnc_deco.cpp | 0 {sky => engines/sky}/rnc_deco.h | 0 {sky => engines/sky}/screen.cpp | 0 {sky => engines/sky}/screen.h | 0 {sky => engines/sky}/sky.cpp | 0 {sky => engines/sky}/sky.h | 0 {sky => engines/sky}/skydefs.h | 0 {sky => engines/sky}/sound.cpp | 0 {sky => engines/sky}/sound.h | 0 {sky => engines/sky}/struc.h | 0 {sky => engines/sky}/text.cpp | 0 {sky => engines/sky}/text.h | 0 {sword1 => engines/sword1}/animation.cpp | 0 {sword1 => engines/sword1}/animation.h | 0 {sword1 => engines/sword1}/collision.h | 0 {sword1 => engines/sword1}/control.cpp | 0 {sword1 => engines/sword1}/control.h | 0 {sword1 => engines/sword1}/credits.cpp | 0 {sword1 => engines/sword1}/credits.h | 0 {sword1 => engines/sword1}/debug.cpp | 0 {sword1 => engines/sword1}/debug.h | 0 {sword1 => engines/sword1}/eventman.cpp | 0 {sword1 => engines/sword1}/eventman.h | 0 {sword1 => engines/sword1}/logic.cpp | 0 {sword1 => engines/sword1}/logic.h | 0 {sword1 => engines/sword1}/memman.cpp | 0 {sword1 => engines/sword1}/memman.h | 0 {sword1 => engines/sword1}/menu.cpp | 0 {sword1 => engines/sword1}/menu.h | 0 engines/sword1/module.mk | 32 +++++ {sword1 => engines/sword1}/mouse.cpp | 0 {sword1 => engines/sword1}/mouse.h | 0 {sword1 => engines/sword1}/music.cpp | 0 {sword1 => engines/sword1}/music.h | 0 {sword1 => engines/sword1}/object.h | 0 {sword1 => engines/sword1}/objectman.cpp | 0 {sword1 => engines/sword1}/objectman.h | 0 {sword1 => engines/sword1}/resman.cpp | 0 {sword1 => engines/sword1}/resman.h | 0 {sword1 => engines/sword1}/router.cpp | 0 {sword1 => engines/sword1}/router.h | 0 {sword1 => engines/sword1}/screen.cpp | 0 {sword1 => engines/sword1}/screen.h | 0 {sword1 => engines/sword1}/sound.cpp | 0 {sword1 => engines/sword1}/sound.h | 0 {sword1 => engines/sword1}/staticres.cpp | 0 {sword1 => engines/sword1}/sword1.cpp | 0 {sword1 => engines/sword1}/sword1.h | 0 {sword1 => engines/sword1}/sworddefs.h | 0 {sword1 => engines/sword1}/swordres.h | 0 {sword1 => engines/sword1}/text.cpp | 0 {sword1 => engines/sword1}/text.h | 0 {sword2 => engines/sword2}/_mouse.cpp | 0 {sword2 => engines/sword2}/animation.cpp | 0 {sword2 => engines/sword2}/animation.h | 0 {sword2 => engines/sword2}/anims.cpp | 0 {sword2 => engines/sword2}/build_display.cpp | 0 {sword2 => engines/sword2}/build_display.h | 0 {sword2 => engines/sword2}/console.cpp | 0 {sword2 => engines/sword2}/console.h | 0 {sword2 => engines/sword2}/controls.cpp | 0 {sword2 => engines/sword2}/controls.h | 0 {sword2 => engines/sword2}/d_draw.cpp | 0 {sword2 => engines/sword2}/debug.cpp | 0 {sword2 => engines/sword2}/debug.h | 0 {sword2 => engines/sword2}/defs.h | 0 {sword2 => engines/sword2}/events.cpp | 0 {sword2 => engines/sword2}/function.cpp | 0 {sword2 => engines/sword2}/header.h | 0 {sword2 => engines/sword2}/icons.cpp | 0 {sword2 => engines/sword2}/icons.h | 0 {sword2 => engines/sword2}/interpreter.cpp | 0 {sword2 => engines/sword2}/interpreter.h | 0 {sword2 => engines/sword2}/layers.cpp | 0 {sword2 => engines/sword2}/layers.h | 0 {sword2 => engines/sword2}/logic.cpp | 0 {sword2 => engines/sword2}/logic.h | 0 {sword2 => engines/sword2}/maketext.cpp | 0 {sword2 => engines/sword2}/maketext.h | 0 {sword2 => engines/sword2}/memory.cpp | 0 {sword2 => engines/sword2}/memory.h | 0 {sword2 => engines/sword2}/menu.cpp | 0 engines/sword2/module.mk | 48 ++++++++ {sword2 => engines/sword2}/mouse.cpp | 0 {sword2 => engines/sword2}/mouse.h | 0 {sword2 => engines/sword2}/music.cpp | 0 {sword2 => engines/sword2}/object.h | 0 {sword2 => engines/sword2}/palette.cpp | 0 {sword2 => engines/sword2}/protocol.cpp | 0 {sword2 => engines/sword2}/rdwin.cpp | 0 {sword2 => engines/sword2}/render.cpp | 0 {sword2 => engines/sword2}/resman.cpp | 0 {sword2 => engines/sword2}/resman.h | 0 {sword2 => engines/sword2}/router.cpp | 0 {sword2 => engines/sword2}/router.h | 0 {sword2 => engines/sword2}/save_rest.cpp | 0 {sword2 => engines/sword2}/save_rest.h | 0 {sword2 => engines/sword2}/scroll.cpp | 0 {sword2 => engines/sword2}/sound.cpp | 0 {sword2 => engines/sword2}/sound.h | 0 {sword2 => engines/sword2}/speech.cpp | 0 {sword2 => engines/sword2}/sprite.cpp | 0 {sword2 => engines/sword2}/startup.cpp | 0 {sword2 => engines/sword2}/sword2.cpp | 0 {sword2 => engines/sword2}/sword2.h | 0 {sword2 => engines/sword2}/sync.cpp | 0 {sword2 => engines/sword2}/walker.cpp | 0 gob/module.mk | 40 ------- kyra/module.mk | 33 ------ lure/module.mk | 36 ------ queen/module.mk | 34 ------ saga/module.mk | 44 ------- scumm/module.mk | 110 ------------------ simon/module.mk | 29 ----- sky/module.mk | 37 ------ sword1/module.mk | 32 ----- sword2/module.mk | 48 -------- 531 files changed, 454 insertions(+), 454 deletions(-) rename {gob => engines/gob}/anim.cpp (100%) rename {gob => engines/gob}/anim.h (100%) rename {gob => engines/gob}/cdrom.cpp (100%) rename {gob => engines/gob}/cdrom.h (100%) rename {gob => engines/gob}/dataio.cpp (100%) rename {gob => engines/gob}/dataio.h (100%) rename {gob => engines/gob}/draw.cpp (100%) rename {gob => engines/gob}/draw.h (100%) rename {gob => engines/gob}/driver_vga.cpp (100%) rename {gob => engines/gob}/driver_vga.h (100%) rename {gob => engines/gob}/game.cpp (100%) rename {gob => engines/gob}/game.h (100%) rename {gob => engines/gob}/global.cpp (100%) rename {gob => engines/gob}/global.h (100%) rename {gob => engines/gob}/gob.cpp (100%) rename {gob => engines/gob}/gob.h (100%) rename {gob => engines/gob}/goblin.cpp (100%) rename {gob => engines/gob}/goblin.h (100%) rename {gob => engines/gob}/init.cpp (100%) rename {gob => engines/gob}/init.h (100%) rename {gob => engines/gob}/inter.cpp (100%) rename {gob => engines/gob}/inter.h (100%) rename {gob => engines/gob}/inter_v1.cpp (100%) rename {gob => engines/gob}/inter_v2.cpp (100%) rename {gob => engines/gob}/map.cpp (100%) rename {gob => engines/gob}/map.h (100%) create mode 100644 engines/gob/module.mk rename {gob => engines/gob}/mult.cpp (100%) rename {gob => engines/gob}/mult.h (100%) rename {gob => engines/gob}/music.cpp (100%) rename {gob => engines/gob}/music.h (100%) rename {gob => engines/gob}/pack.cpp (100%) rename {gob => engines/gob}/pack.h (100%) rename {gob => engines/gob}/palanim.cpp (100%) rename {gob => engines/gob}/palanim.h (100%) rename {gob => engines/gob}/parse.cpp (100%) rename {gob => engines/gob}/parse.h (100%) rename {gob => engines/gob}/parse_v1.cpp (100%) rename {gob => engines/gob}/parse_v2.cpp (100%) rename {gob => engines/gob}/scenery.cpp (100%) rename {gob => engines/gob}/scenery.h (100%) rename {gob => engines/gob}/sound.cpp (100%) rename {gob => engines/gob}/sound.h (100%) rename {gob => engines/gob}/timer.cpp (100%) rename {gob => engines/gob}/timer.h (100%) rename {gob => engines/gob}/util.cpp (100%) rename {gob => engines/gob}/util.h (100%) rename {gob => engines/gob}/video.cpp (100%) rename {gob => engines/gob}/video.h (100%) rename {kyra => engines/kyra}/animator.cpp (100%) rename {kyra => engines/kyra}/animator.h (100%) rename {kyra => engines/kyra}/debugger.cpp (100%) rename {kyra => engines/kyra}/debugger.h (100%) rename {kyra => engines/kyra}/gui.cpp (100%) rename {kyra => engines/kyra}/items.cpp (100%) rename {kyra => engines/kyra}/kyra.cpp (100%) rename {kyra => engines/kyra}/kyra.h (100%) create mode 100644 engines/kyra/module.mk rename {kyra => engines/kyra}/resource.cpp (100%) rename {kyra => engines/kyra}/resource.h (100%) rename {kyra => engines/kyra}/saveload.cpp (100%) rename {kyra => engines/kyra}/scene.cpp (100%) rename {kyra => engines/kyra}/screen.cpp (100%) rename {kyra => engines/kyra}/screen.h (100%) rename {kyra => engines/kyra}/script.cpp (100%) rename {kyra => engines/kyra}/script.h (100%) rename {kyra => engines/kyra}/script_v1.cpp (100%) rename {kyra => engines/kyra}/seqplayer.cpp (100%) rename {kyra => engines/kyra}/seqplayer.h (100%) rename {kyra => engines/kyra}/sequences_v1.cpp (100%) rename {kyra => engines/kyra}/sound.cpp (100%) rename {kyra => engines/kyra}/sound.h (100%) rename {kyra => engines/kyra}/sprites.cpp (100%) rename {kyra => engines/kyra}/sprites.h (100%) rename {kyra => engines/kyra}/staticres.cpp (100%) rename {kyra => engines/kyra}/text.cpp (100%) rename {kyra => engines/kyra}/text.h (100%) rename {kyra => engines/kyra}/timer.cpp (100%) rename {kyra => engines/kyra}/wsamovie.cpp (100%) rename {kyra => engines/kyra}/wsamovie.h (100%) rename {lure => engines/lure}/animseq.cpp (100%) rename {lure => engines/lure}/animseq.h (100%) rename {lure => engines/lure}/debug-input.cpp (100%) rename {lure => engines/lure}/debug-input.h (100%) rename {lure => engines/lure}/debug-methods.cpp (100%) rename {lure => engines/lure}/debug-methods.h (100%) rename {lure => engines/lure}/decode.cpp (100%) rename {lure => engines/lure}/decode.h (100%) rename {lure => engines/lure}/disk.cpp (100%) rename {lure => engines/lure}/disk.h (100%) rename {lure => engines/lure}/events.cpp (100%) rename {lure => engines/lure}/events.h (100%) rename {lure => engines/lure}/game.cpp (100%) rename {lure => engines/lure}/game.h (100%) rename {lure => engines/lure}/hotspots.cpp (100%) rename {lure => engines/lure}/hotspots.h (100%) rename {lure => engines/lure}/intro.cpp (100%) rename {lure => engines/lure}/intro.h (100%) rename {lure => engines/lure}/lure.cpp (100%) rename {lure => engines/lure}/lure.h (100%) rename {lure => engines/lure}/luredefs.h (100%) rename {lure => engines/lure}/memory.cpp (100%) rename {lure => engines/lure}/memory.h (100%) rename {lure => engines/lure}/menu.cpp (100%) rename {lure => engines/lure}/menu.h (100%) create mode 100644 engines/lure/module.mk rename {lure => engines/lure}/palette.cpp (100%) rename {lure => engines/lure}/palette.h (100%) rename {lure => engines/lure}/res.cpp (100%) rename {lure => engines/lure}/res.h (100%) rename {lure => engines/lure}/res_struct.cpp (100%) rename {lure => engines/lure}/res_struct.h (100%) rename {lure => engines/lure}/room.cpp (100%) rename {lure => engines/lure}/room.h (100%) rename {lure => engines/lure}/screen.cpp (100%) rename {lure => engines/lure}/screen.h (100%) rename {lure => engines/lure}/scripts.cpp (100%) rename {lure => engines/lure}/scripts.h (100%) rename {lure => engines/lure}/strings.cpp (100%) rename {lure => engines/lure}/strings.h (100%) rename {lure => engines/lure}/surface.cpp (100%) rename {lure => engines/lure}/surface.h (100%) rename {lure => engines/lure}/system.cpp (100%) rename {lure => engines/lure}/system.h (100%) rename {queen => engines/queen}/bankman.cpp (100%) rename {queen => engines/queen}/bankman.h (100%) rename {queen => engines/queen}/command.cpp (100%) rename {queen => engines/queen}/command.h (100%) rename {queen => engines/queen}/credits.cpp (100%) rename {queen => engines/queen}/credits.h (100%) rename {queen => engines/queen}/cutaway.cpp (100%) rename {queen => engines/queen}/cutaway.h (100%) rename {queen => engines/queen}/debug.cpp (100%) rename {queen => engines/queen}/debug.h (100%) rename {queen => engines/queen}/defs.h (100%) rename {queen => engines/queen}/display.cpp (100%) rename {queen => engines/queen}/display.h (100%) rename {queen => engines/queen}/graphics.cpp (100%) rename {queen => engines/queen}/graphics.h (100%) rename {queen => engines/queen}/grid.cpp (100%) rename {queen => engines/queen}/grid.h (100%) rename {queen => engines/queen}/input.cpp (100%) rename {queen => engines/queen}/input.h (100%) rename {queen => engines/queen}/journal.cpp (100%) rename {queen => engines/queen}/journal.h (100%) rename {queen => engines/queen}/logic.cpp (100%) rename {queen => engines/queen}/logic.h (100%) create mode 100644 engines/queen/module.mk rename {queen => engines/queen}/music.cpp (100%) rename {queen => engines/queen}/music.h (100%) rename {queen => engines/queen}/musicdata.cpp (100%) rename {queen => engines/queen}/queen.cpp (100%) rename {queen => engines/queen}/queen.h (100%) rename {queen => engines/queen}/resource.cpp (100%) rename {queen => engines/queen}/resource.h (100%) rename {queen => engines/queen}/restables.cpp (100%) rename {queen => engines/queen}/sound.cpp (100%) rename {queen => engines/queen}/sound.h (100%) rename {queen => engines/queen}/state.cpp (100%) rename {queen => engines/queen}/state.h (100%) rename {queen => engines/queen}/structs.h (100%) rename {queen => engines/queen}/talk.cpp (100%) rename {queen => engines/queen}/talk.h (100%) rename {queen => engines/queen}/walk.cpp (100%) rename {queen => engines/queen}/walk.h (100%) rename {queen => engines/queen}/xref.txt (100%) rename {saga => engines/saga}/actor.cpp (100%) rename {saga => engines/saga}/actor.h (100%) rename {saga => engines/saga}/animation.cpp (100%) rename {saga => engines/saga}/animation.h (100%) rename {saga => engines/saga}/console.cpp (100%) rename {saga => engines/saga}/console.h (100%) rename {saga => engines/saga}/events.cpp (100%) rename {saga => engines/saga}/events.h (100%) rename {saga => engines/saga}/font.cpp (100%) rename {saga => engines/saga}/font.h (100%) rename {saga => engines/saga}/font_map.cpp (100%) rename {saga => engines/saga}/game.cpp (100%) rename {saga => engines/saga}/gfx.cpp (100%) rename {saga => engines/saga}/gfx.h (100%) rename {saga => engines/saga}/ihnm_introproc.cpp (100%) rename {saga => engines/saga}/image.cpp (100%) rename {saga => engines/saga}/input.cpp (100%) rename {saga => engines/saga}/interface.cpp (100%) rename {saga => engines/saga}/interface.h (100%) rename {saga => engines/saga}/isomap.cpp (100%) rename {saga => engines/saga}/isomap.h (100%) rename {saga => engines/saga}/ite_introproc.cpp (100%) rename {saga => engines/saga}/itedata.cpp (100%) rename {saga => engines/saga}/itedata.h (100%) rename {saga => engines/saga}/list.h (100%) create mode 100644 engines/saga/module.mk rename {saga => engines/saga}/music.cpp (100%) rename {saga => engines/saga}/music.h (100%) rename {saga => engines/saga}/objectmap.cpp (100%) rename {saga => engines/saga}/objectmap.h (100%) rename {saga => engines/saga}/palanim.cpp (100%) rename {saga => engines/saga}/palanim.h (100%) rename {saga => engines/saga}/puzzle.cpp (100%) rename {saga => engines/saga}/puzzle.h (100%) rename {saga => engines/saga}/render.cpp (100%) rename {saga => engines/saga}/render.h (100%) rename {saga => engines/saga}/resnames.h (100%) rename {saga => engines/saga}/rscfile.cpp (100%) rename {saga => engines/saga}/rscfile.h (100%) rename {saga => engines/saga}/saga.cpp (100%) rename {saga => engines/saga}/saga.h (100%) rename {saga => engines/saga}/saveload.cpp (100%) rename {saga => engines/saga}/scene.cpp (100%) rename {saga => engines/saga}/scene.h (100%) rename {saga => engines/saga}/script.cpp (100%) rename {saga => engines/saga}/script.h (100%) rename {saga => engines/saga}/sfuncs.cpp (100%) rename {saga => engines/saga}/sndres.cpp (100%) rename {saga => engines/saga}/sndres.h (100%) rename {saga => engines/saga}/sound.cpp (100%) rename {saga => engines/saga}/sound.h (100%) rename {saga => engines/saga}/sprite.cpp (100%) rename {saga => engines/saga}/sprite.h (100%) rename {saga => engines/saga}/sthread.cpp (100%) rename {saga => engines/saga}/stream.h (100%) rename {saga => engines/saga}/xref.txt (100%) rename {scumm => engines/scumm}/actor.cpp (100%) rename {scumm => engines/scumm}/actor.h (100%) rename {scumm => engines/scumm}/akos.cpp (100%) rename {scumm => engines/scumm}/akos.h (100%) rename {scumm => engines/scumm}/base-costume.cpp (100%) rename {scumm => engines/scumm}/base-costume.h (100%) rename {scumm => engines/scumm}/bomp.cpp (100%) rename {scumm => engines/scumm}/bomp.h (100%) rename {scumm => engines/scumm}/boxes.cpp (100%) rename {scumm => engines/scumm}/boxes.h (100%) rename {scumm => engines/scumm}/camera.cpp (100%) rename {scumm => engines/scumm}/charset.cpp (100%) rename {scumm => engines/scumm}/charset.h (100%) rename {scumm => engines/scumm}/costume.cpp (100%) rename {scumm => engines/scumm}/costume.h (100%) rename {scumm => engines/scumm}/cursor.cpp (100%) rename {scumm => engines/scumm}/debugger.cpp (100%) rename {scumm => engines/scumm}/debugger.h (100%) rename {scumm => engines/scumm}/dialogs.cpp (100%) rename {scumm => engines/scumm}/dialogs.h (100%) rename {scumm => engines/scumm}/floodfill_he.cpp (100%) rename {scumm => engines/scumm}/floodfill_he.h (100%) rename {scumm => engines/scumm}/gfx.cpp (100%) rename {scumm => engines/scumm}/gfx.h (100%) rename {scumm => engines/scumm}/help.cpp (100%) rename {scumm => engines/scumm}/help.h (100%) rename {scumm => engines/scumm}/imuse.cpp (100%) rename {scumm => engines/scumm}/imuse.h (100%) rename {scumm => engines/scumm}/imuse_digi/dimuse.cpp (100%) rename {scumm => engines/scumm}/imuse_digi/dimuse.h (100%) rename {scumm => engines/scumm}/imuse_digi/dimuse_bndmgr.cpp (100%) rename {scumm => engines/scumm}/imuse_digi/dimuse_bndmgr.h (100%) rename {scumm => engines/scumm}/imuse_digi/dimuse_codecs.cpp (100%) rename {scumm => engines/scumm}/imuse_digi/dimuse_music.cpp (100%) rename {scumm => engines/scumm}/imuse_digi/dimuse_script.cpp (100%) rename {scumm => engines/scumm}/imuse_digi/dimuse_sndmgr.cpp (100%) rename {scumm => engines/scumm}/imuse_digi/dimuse_sndmgr.h (100%) rename {scumm => engines/scumm}/imuse_digi/dimuse_tables.cpp (100%) rename {scumm => engines/scumm}/imuse_digi/dimuse_track.cpp (100%) rename {scumm => engines/scumm}/imuse_internal.h (100%) rename {scumm => engines/scumm}/imuse_player.cpp (100%) rename {scumm => engines/scumm}/input.cpp (100%) rename {scumm => engines/scumm}/insane/insane.cpp (100%) rename {scumm => engines/scumm}/insane/insane.h (100%) rename {scumm => engines/scumm}/insane/insane_ben.cpp (100%) rename {scumm => engines/scumm}/insane/insane_enemy.cpp (100%) rename {scumm => engines/scumm}/insane/insane_iact.cpp (100%) rename {scumm => engines/scumm}/insane/insane_scenes.cpp (100%) rename {scumm => engines/scumm}/instrument.cpp (100%) rename {scumm => engines/scumm}/instrument.h (100%) rename {scumm => engines/scumm}/intern.h (100%) rename {scumm => engines/scumm}/intern_he.h (100%) rename {scumm => engines/scumm}/logic_he.cpp (100%) rename {scumm => engines/scumm}/logic_he.h (100%) rename {scumm => engines/scumm}/midiparser_eup.cpp (100%) rename {scumm => engines/scumm}/midiparser_ro.cpp (100%) create mode 100644 engines/scumm/module.mk rename {scumm => engines/scumm}/music.h (100%) rename {scumm => engines/scumm}/nut_renderer.cpp (100%) rename {scumm => engines/scumm}/nut_renderer.h (100%) rename {scumm => engines/scumm}/object.cpp (100%) rename {scumm => engines/scumm}/object.h (100%) rename {scumm => engines/scumm}/palette.cpp (100%) rename {scumm => engines/scumm}/palette_he.cpp (100%) rename {scumm => engines/scumm}/player_mod.cpp (100%) rename {scumm => engines/scumm}/player_mod.h (100%) rename {scumm => engines/scumm}/player_nes.cpp (100%) rename {scumm => engines/scumm}/player_nes.h (100%) rename {scumm => engines/scumm}/player_v1.cpp (100%) rename {scumm => engines/scumm}/player_v1.h (100%) rename {scumm => engines/scumm}/player_v2.cpp (100%) rename {scumm => engines/scumm}/player_v2.h (100%) rename {scumm => engines/scumm}/player_v2a.cpp (100%) rename {scumm => engines/scumm}/player_v2a.h (100%) rename {scumm => engines/scumm}/player_v3a.cpp (100%) rename {scumm => engines/scumm}/player_v3a.h (100%) rename {scumm => engines/scumm}/resource.cpp (100%) rename {scumm => engines/scumm}/resource.h (100%) rename {scumm => engines/scumm}/resource_v2.cpp (100%) rename {scumm => engines/scumm}/resource_v3.cpp (100%) rename {scumm => engines/scumm}/resource_v4.cpp (100%) rename {scumm => engines/scumm}/resource_v7he.cpp (100%) rename {scumm => engines/scumm}/resource_v7he.h (100%) rename {scumm => engines/scumm}/room.cpp (100%) rename {scumm => engines/scumm}/saveload.cpp (100%) rename {scumm => engines/scumm}/saveload.h (100%) rename {scumm => engines/scumm}/script.cpp (100%) rename {scumm => engines/scumm}/script.h (100%) rename {scumm => engines/scumm}/script_c64.cpp (100%) rename {scumm => engines/scumm}/script_v100he.cpp (100%) rename {scumm => engines/scumm}/script_v2.cpp (100%) rename {scumm => engines/scumm}/script_v5.cpp (100%) rename {scumm => engines/scumm}/script_v6.cpp (100%) rename {scumm => engines/scumm}/script_v6he.cpp (100%) rename {scumm => engines/scumm}/script_v72he.cpp (100%) rename {scumm => engines/scumm}/script_v7he.cpp (100%) rename {scumm => engines/scumm}/script_v8.cpp (100%) rename {scumm => engines/scumm}/script_v80he.cpp (100%) rename {scumm => engines/scumm}/script_v90he.cpp (100%) rename {scumm => engines/scumm}/scumm-md5.h (100%) rename {scumm => engines/scumm}/scumm.cpp (100%) rename {scumm => engines/scumm}/scumm.h (100%) rename {scumm => engines/scumm}/smush/channel.h (100%) rename {scumm => engines/scumm}/smush/chunk.cpp (100%) rename {scumm => engines/scumm}/smush/chunk.h (100%) rename {scumm => engines/scumm}/smush/chunk_type.h (100%) rename {scumm => engines/scumm}/smush/codec1.cpp (100%) rename {scumm => engines/scumm}/smush/codec37.cpp (100%) rename {scumm => engines/scumm}/smush/codec37.h (100%) rename {scumm => engines/scumm}/smush/codec47.cpp (100%) rename {scumm => engines/scumm}/smush/codec47.h (100%) rename {scumm => engines/scumm}/smush/imuse_channel.cpp (100%) rename {scumm => engines/scumm}/smush/saud_channel.cpp (100%) rename {scumm => engines/scumm}/smush/smush_font.cpp (100%) rename {scumm => engines/scumm}/smush/smush_font.h (100%) rename {scumm => engines/scumm}/smush/smush_mixer.cpp (100%) rename {scumm => engines/scumm}/smush/smush_mixer.h (100%) rename {scumm => engines/scumm}/smush/smush_player.cpp (100%) rename {scumm => engines/scumm}/smush/smush_player.h (100%) rename {scumm => engines/scumm}/sound.cpp (100%) rename {scumm => engines/scumm}/sound.h (100%) rename {scumm => engines/scumm}/sound_he.cpp (100%) rename {scumm => engines/scumm}/sprite_he.cpp (100%) rename {scumm => engines/scumm}/sprite_he.h (100%) rename {scumm => engines/scumm}/string.cpp (100%) rename {scumm => engines/scumm}/thumbnail.cpp (100%) rename {scumm => engines/scumm}/usage_bits.cpp (100%) rename {scumm => engines/scumm}/usage_bits.h (100%) rename {scumm => engines/scumm}/util.cpp (100%) rename {scumm => engines/scumm}/util.h (100%) rename {scumm => engines/scumm}/vars.cpp (100%) rename {scumm => engines/scumm}/verbs.cpp (100%) rename {scumm => engines/scumm}/verbs.h (100%) rename {scumm => engines/scumm}/wiz_he.cpp (100%) rename {scumm => engines/scumm}/wiz_he.h (100%) rename {simon => engines/simon}/charset.cpp (100%) rename {simon => engines/simon}/cursor.cpp (100%) rename {simon => engines/simon}/debug.cpp (100%) rename {simon => engines/simon}/debug.h (100%) rename {simon => engines/simon}/debugger.cpp (100%) rename {simon => engines/simon}/debugger.h (100%) rename {simon => engines/simon}/game.cpp (100%) rename {simon => engines/simon}/icons.cpp (100%) rename {simon => engines/simon}/intern.h (100%) rename {simon => engines/simon}/items.cpp (100%) rename {simon => engines/simon}/midi.cpp (100%) rename {simon => engines/simon}/midi.h (100%) rename {simon => engines/simon}/midiparser_s1d.cpp (100%) create mode 100644 engines/simon/module.mk rename {simon => engines/simon}/res.cpp (100%) rename {simon => engines/simon}/saveload.cpp (100%) rename {simon => engines/simon}/simon.cpp (100%) rename {simon => engines/simon}/simon.h (100%) rename {simon => engines/simon}/sound.cpp (100%) rename {simon => engines/simon}/sound.h (100%) rename {simon => engines/simon}/verb.cpp (100%) rename {simon => engines/simon}/vga.cpp (100%) rename {simon => engines/simon}/vga.h (100%) rename {sky => engines/sky}/autoroute.cpp (100%) rename {sky => engines/sky}/autoroute.h (100%) rename {sky => engines/sky}/compact.cpp (100%) rename {sky => engines/sky}/compact.h (100%) rename {sky => engines/sky}/control.cpp (100%) rename {sky => engines/sky}/control.h (100%) rename {sky => engines/sky}/debug.cpp (100%) rename {sky => engines/sky}/debug.h (100%) rename {sky => engines/sky}/disk.cpp (100%) rename {sky => engines/sky}/disk.h (100%) rename {sky => engines/sky}/grid.cpp (100%) rename {sky => engines/sky}/grid.h (100%) rename {sky => engines/sky}/hufftext.cpp (100%) rename {sky => engines/sky}/intro.cpp (100%) rename {sky => engines/sky}/intro.h (100%) rename {sky => engines/sky}/logic.cpp (100%) rename {sky => engines/sky}/logic.h (100%) create mode 100644 engines/sky/module.mk rename {sky => engines/sky}/mouse.cpp (100%) rename {sky => engines/sky}/mouse.h (100%) rename {sky => engines/sky}/music/adlibchannel.cpp (100%) rename {sky => engines/sky}/music/adlibchannel.h (100%) rename {sky => engines/sky}/music/adlibmusic.cpp (100%) rename {sky => engines/sky}/music/adlibmusic.h (100%) rename {sky => engines/sky}/music/gmchannel.cpp (100%) rename {sky => engines/sky}/music/gmchannel.h (100%) rename {sky => engines/sky}/music/gmmusic.cpp (100%) rename {sky => engines/sky}/music/gmmusic.h (100%) rename {sky => engines/sky}/music/mt32music.cpp (100%) rename {sky => engines/sky}/music/mt32music.h (100%) rename {sky => engines/sky}/music/musicbase.cpp (100%) rename {sky => engines/sky}/music/musicbase.h (100%) rename {sky => engines/sky}/rnc_deco.cpp (100%) rename {sky => engines/sky}/rnc_deco.h (100%) rename {sky => engines/sky}/screen.cpp (100%) rename {sky => engines/sky}/screen.h (100%) rename {sky => engines/sky}/sky.cpp (100%) rename {sky => engines/sky}/sky.h (100%) rename {sky => engines/sky}/skydefs.h (100%) rename {sky => engines/sky}/sound.cpp (100%) rename {sky => engines/sky}/sound.h (100%) rename {sky => engines/sky}/struc.h (100%) rename {sky => engines/sky}/text.cpp (100%) rename {sky => engines/sky}/text.h (100%) rename {sword1 => engines/sword1}/animation.cpp (100%) rename {sword1 => engines/sword1}/animation.h (100%) rename {sword1 => engines/sword1}/collision.h (100%) rename {sword1 => engines/sword1}/control.cpp (100%) rename {sword1 => engines/sword1}/control.h (100%) rename {sword1 => engines/sword1}/credits.cpp (100%) rename {sword1 => engines/sword1}/credits.h (100%) rename {sword1 => engines/sword1}/debug.cpp (100%) rename {sword1 => engines/sword1}/debug.h (100%) rename {sword1 => engines/sword1}/eventman.cpp (100%) rename {sword1 => engines/sword1}/eventman.h (100%) rename {sword1 => engines/sword1}/logic.cpp (100%) rename {sword1 => engines/sword1}/logic.h (100%) rename {sword1 => engines/sword1}/memman.cpp (100%) rename {sword1 => engines/sword1}/memman.h (100%) rename {sword1 => engines/sword1}/menu.cpp (100%) rename {sword1 => engines/sword1}/menu.h (100%) create mode 100644 engines/sword1/module.mk rename {sword1 => engines/sword1}/mouse.cpp (100%) rename {sword1 => engines/sword1}/mouse.h (100%) rename {sword1 => engines/sword1}/music.cpp (100%) rename {sword1 => engines/sword1}/music.h (100%) rename {sword1 => engines/sword1}/object.h (100%) rename {sword1 => engines/sword1}/objectman.cpp (100%) rename {sword1 => engines/sword1}/objectman.h (100%) rename {sword1 => engines/sword1}/resman.cpp (100%) rename {sword1 => engines/sword1}/resman.h (100%) rename {sword1 => engines/sword1}/router.cpp (100%) rename {sword1 => engines/sword1}/router.h (100%) rename {sword1 => engines/sword1}/screen.cpp (100%) rename {sword1 => engines/sword1}/screen.h (100%) rename {sword1 => engines/sword1}/sound.cpp (100%) rename {sword1 => engines/sword1}/sound.h (100%) rename {sword1 => engines/sword1}/staticres.cpp (100%) rename {sword1 => engines/sword1}/sword1.cpp (100%) rename {sword1 => engines/sword1}/sword1.h (100%) rename {sword1 => engines/sword1}/sworddefs.h (100%) rename {sword1 => engines/sword1}/swordres.h (100%) rename {sword1 => engines/sword1}/text.cpp (100%) rename {sword1 => engines/sword1}/text.h (100%) rename {sword2 => engines/sword2}/_mouse.cpp (100%) rename {sword2 => engines/sword2}/animation.cpp (100%) rename {sword2 => engines/sword2}/animation.h (100%) rename {sword2 => engines/sword2}/anims.cpp (100%) rename {sword2 => engines/sword2}/build_display.cpp (100%) rename {sword2 => engines/sword2}/build_display.h (100%) rename {sword2 => engines/sword2}/console.cpp (100%) rename {sword2 => engines/sword2}/console.h (100%) rename {sword2 => engines/sword2}/controls.cpp (100%) rename {sword2 => engines/sword2}/controls.h (100%) rename {sword2 => engines/sword2}/d_draw.cpp (100%) rename {sword2 => engines/sword2}/debug.cpp (100%) rename {sword2 => engines/sword2}/debug.h (100%) rename {sword2 => engines/sword2}/defs.h (100%) rename {sword2 => engines/sword2}/events.cpp (100%) rename {sword2 => engines/sword2}/function.cpp (100%) rename {sword2 => engines/sword2}/header.h (100%) rename {sword2 => engines/sword2}/icons.cpp (100%) rename {sword2 => engines/sword2}/icons.h (100%) rename {sword2 => engines/sword2}/interpreter.cpp (100%) rename {sword2 => engines/sword2}/interpreter.h (100%) rename {sword2 => engines/sword2}/layers.cpp (100%) rename {sword2 => engines/sword2}/layers.h (100%) rename {sword2 => engines/sword2}/logic.cpp (100%) rename {sword2 => engines/sword2}/logic.h (100%) rename {sword2 => engines/sword2}/maketext.cpp (100%) rename {sword2 => engines/sword2}/maketext.h (100%) rename {sword2 => engines/sword2}/memory.cpp (100%) rename {sword2 => engines/sword2}/memory.h (100%) rename {sword2 => engines/sword2}/menu.cpp (100%) create mode 100644 engines/sword2/module.mk rename {sword2 => engines/sword2}/mouse.cpp (100%) rename {sword2 => engines/sword2}/mouse.h (100%) rename {sword2 => engines/sword2}/music.cpp (100%) rename {sword2 => engines/sword2}/object.h (100%) rename {sword2 => engines/sword2}/palette.cpp (100%) rename {sword2 => engines/sword2}/protocol.cpp (100%) rename {sword2 => engines/sword2}/rdwin.cpp (100%) rename {sword2 => engines/sword2}/render.cpp (100%) rename {sword2 => engines/sword2}/resman.cpp (100%) rename {sword2 => engines/sword2}/resman.h (100%) rename {sword2 => engines/sword2}/router.cpp (100%) rename {sword2 => engines/sword2}/router.h (100%) rename {sword2 => engines/sword2}/save_rest.cpp (100%) rename {sword2 => engines/sword2}/save_rest.h (100%) rename {sword2 => engines/sword2}/scroll.cpp (100%) rename {sword2 => engines/sword2}/sound.cpp (100%) rename {sword2 => engines/sword2}/sound.h (100%) rename {sword2 => engines/sword2}/speech.cpp (100%) rename {sword2 => engines/sword2}/sprite.cpp (100%) rename {sword2 => engines/sword2}/startup.cpp (100%) rename {sword2 => engines/sword2}/sword2.cpp (100%) rename {sword2 => engines/sword2}/sword2.h (100%) rename {sword2 => engines/sword2}/sync.cpp (100%) rename {sword2 => engines/sword2}/walker.cpp (100%) delete mode 100644 gob/module.mk delete mode 100644 kyra/module.mk delete mode 100644 lure/module.mk delete mode 100644 queen/module.mk delete mode 100644 saga/module.mk delete mode 100644 scumm/module.mk delete mode 100644 simon/module.mk delete mode 100644 sky/module.mk delete mode 100644 sword1/module.mk delete mode 100644 sword2/module.mk diff --git a/Makefile b/Makefile index 147d7070876..b9f113a9648 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ srcdir ?= . DEFINES := -DHAVE_CONFIG_H LDFLAGS := -INCLUDES := -I. -I$(srcdir) +INCLUDES := -I. -I$(srcdir) -I$(srcdir)/engines LIBS := OBJS := diff --git a/Makefile.common b/Makefile.common index 260403d3280..1128067fa64 100644 --- a/Makefile.common +++ b/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 diff --git a/gob/anim.cpp b/engines/gob/anim.cpp similarity index 100% rename from gob/anim.cpp rename to engines/gob/anim.cpp diff --git a/gob/anim.h b/engines/gob/anim.h similarity index 100% rename from gob/anim.h rename to engines/gob/anim.h diff --git a/gob/cdrom.cpp b/engines/gob/cdrom.cpp similarity index 100% rename from gob/cdrom.cpp rename to engines/gob/cdrom.cpp diff --git a/gob/cdrom.h b/engines/gob/cdrom.h similarity index 100% rename from gob/cdrom.h rename to engines/gob/cdrom.h diff --git a/gob/dataio.cpp b/engines/gob/dataio.cpp similarity index 100% rename from gob/dataio.cpp rename to engines/gob/dataio.cpp diff --git a/gob/dataio.h b/engines/gob/dataio.h similarity index 100% rename from gob/dataio.h rename to engines/gob/dataio.h diff --git a/gob/draw.cpp b/engines/gob/draw.cpp similarity index 100% rename from gob/draw.cpp rename to engines/gob/draw.cpp diff --git a/gob/draw.h b/engines/gob/draw.h similarity index 100% rename from gob/draw.h rename to engines/gob/draw.h diff --git a/gob/driver_vga.cpp b/engines/gob/driver_vga.cpp similarity index 100% rename from gob/driver_vga.cpp rename to engines/gob/driver_vga.cpp diff --git a/gob/driver_vga.h b/engines/gob/driver_vga.h similarity index 100% rename from gob/driver_vga.h rename to engines/gob/driver_vga.h diff --git a/gob/game.cpp b/engines/gob/game.cpp similarity index 100% rename from gob/game.cpp rename to engines/gob/game.cpp diff --git a/gob/game.h b/engines/gob/game.h similarity index 100% rename from gob/game.h rename to engines/gob/game.h diff --git a/gob/global.cpp b/engines/gob/global.cpp similarity index 100% rename from gob/global.cpp rename to engines/gob/global.cpp diff --git a/gob/global.h b/engines/gob/global.h similarity index 100% rename from gob/global.h rename to engines/gob/global.h diff --git a/gob/gob.cpp b/engines/gob/gob.cpp similarity index 100% rename from gob/gob.cpp rename to engines/gob/gob.cpp diff --git a/gob/gob.h b/engines/gob/gob.h similarity index 100% rename from gob/gob.h rename to engines/gob/gob.h diff --git a/gob/goblin.cpp b/engines/gob/goblin.cpp similarity index 100% rename from gob/goblin.cpp rename to engines/gob/goblin.cpp diff --git a/gob/goblin.h b/engines/gob/goblin.h similarity index 100% rename from gob/goblin.h rename to engines/gob/goblin.h diff --git a/gob/init.cpp b/engines/gob/init.cpp similarity index 100% rename from gob/init.cpp rename to engines/gob/init.cpp diff --git a/gob/init.h b/engines/gob/init.h similarity index 100% rename from gob/init.h rename to engines/gob/init.h diff --git a/gob/inter.cpp b/engines/gob/inter.cpp similarity index 100% rename from gob/inter.cpp rename to engines/gob/inter.cpp diff --git a/gob/inter.h b/engines/gob/inter.h similarity index 100% rename from gob/inter.h rename to engines/gob/inter.h diff --git a/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp similarity index 100% rename from gob/inter_v1.cpp rename to engines/gob/inter_v1.cpp diff --git a/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp similarity index 100% rename from gob/inter_v2.cpp rename to engines/gob/inter_v2.cpp diff --git a/gob/map.cpp b/engines/gob/map.cpp similarity index 100% rename from gob/map.cpp rename to engines/gob/map.cpp diff --git a/gob/map.h b/engines/gob/map.h similarity index 100% rename from gob/map.h rename to engines/gob/map.h diff --git a/engines/gob/module.mk b/engines/gob/module.mk new file mode 100644 index 00000000000..c8188d78b21 --- /dev/null +++ b/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 diff --git a/gob/mult.cpp b/engines/gob/mult.cpp similarity index 100% rename from gob/mult.cpp rename to engines/gob/mult.cpp diff --git a/gob/mult.h b/engines/gob/mult.h similarity index 100% rename from gob/mult.h rename to engines/gob/mult.h diff --git a/gob/music.cpp b/engines/gob/music.cpp similarity index 100% rename from gob/music.cpp rename to engines/gob/music.cpp diff --git a/gob/music.h b/engines/gob/music.h similarity index 100% rename from gob/music.h rename to engines/gob/music.h diff --git a/gob/pack.cpp b/engines/gob/pack.cpp similarity index 100% rename from gob/pack.cpp rename to engines/gob/pack.cpp diff --git a/gob/pack.h b/engines/gob/pack.h similarity index 100% rename from gob/pack.h rename to engines/gob/pack.h diff --git a/gob/palanim.cpp b/engines/gob/palanim.cpp similarity index 100% rename from gob/palanim.cpp rename to engines/gob/palanim.cpp diff --git a/gob/palanim.h b/engines/gob/palanim.h similarity index 100% rename from gob/palanim.h rename to engines/gob/palanim.h diff --git a/gob/parse.cpp b/engines/gob/parse.cpp similarity index 100% rename from gob/parse.cpp rename to engines/gob/parse.cpp diff --git a/gob/parse.h b/engines/gob/parse.h similarity index 100% rename from gob/parse.h rename to engines/gob/parse.h diff --git a/gob/parse_v1.cpp b/engines/gob/parse_v1.cpp similarity index 100% rename from gob/parse_v1.cpp rename to engines/gob/parse_v1.cpp diff --git a/gob/parse_v2.cpp b/engines/gob/parse_v2.cpp similarity index 100% rename from gob/parse_v2.cpp rename to engines/gob/parse_v2.cpp diff --git a/gob/scenery.cpp b/engines/gob/scenery.cpp similarity index 100% rename from gob/scenery.cpp rename to engines/gob/scenery.cpp diff --git a/gob/scenery.h b/engines/gob/scenery.h similarity index 100% rename from gob/scenery.h rename to engines/gob/scenery.h diff --git a/gob/sound.cpp b/engines/gob/sound.cpp similarity index 100% rename from gob/sound.cpp rename to engines/gob/sound.cpp diff --git a/gob/sound.h b/engines/gob/sound.h similarity index 100% rename from gob/sound.h rename to engines/gob/sound.h diff --git a/gob/timer.cpp b/engines/gob/timer.cpp similarity index 100% rename from gob/timer.cpp rename to engines/gob/timer.cpp diff --git a/gob/timer.h b/engines/gob/timer.h similarity index 100% rename from gob/timer.h rename to engines/gob/timer.h diff --git a/gob/util.cpp b/engines/gob/util.cpp similarity index 100% rename from gob/util.cpp rename to engines/gob/util.cpp diff --git a/gob/util.h b/engines/gob/util.h similarity index 100% rename from gob/util.h rename to engines/gob/util.h diff --git a/gob/video.cpp b/engines/gob/video.cpp similarity index 100% rename from gob/video.cpp rename to engines/gob/video.cpp diff --git a/gob/video.h b/engines/gob/video.h similarity index 100% rename from gob/video.h rename to engines/gob/video.h diff --git a/kyra/animator.cpp b/engines/kyra/animator.cpp similarity index 100% rename from kyra/animator.cpp rename to engines/kyra/animator.cpp diff --git a/kyra/animator.h b/engines/kyra/animator.h similarity index 100% rename from kyra/animator.h rename to engines/kyra/animator.h diff --git a/kyra/debugger.cpp b/engines/kyra/debugger.cpp similarity index 100% rename from kyra/debugger.cpp rename to engines/kyra/debugger.cpp diff --git a/kyra/debugger.h b/engines/kyra/debugger.h similarity index 100% rename from kyra/debugger.h rename to engines/kyra/debugger.h diff --git a/kyra/gui.cpp b/engines/kyra/gui.cpp similarity index 100% rename from kyra/gui.cpp rename to engines/kyra/gui.cpp diff --git a/kyra/items.cpp b/engines/kyra/items.cpp similarity index 100% rename from kyra/items.cpp rename to engines/kyra/items.cpp diff --git a/kyra/kyra.cpp b/engines/kyra/kyra.cpp similarity index 100% rename from kyra/kyra.cpp rename to engines/kyra/kyra.cpp diff --git a/kyra/kyra.h b/engines/kyra/kyra.h similarity index 100% rename from kyra/kyra.h rename to engines/kyra/kyra.h diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk new file mode 100644 index 00000000000..943c6288317 --- /dev/null +++ b/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 diff --git a/kyra/resource.cpp b/engines/kyra/resource.cpp similarity index 100% rename from kyra/resource.cpp rename to engines/kyra/resource.cpp diff --git a/kyra/resource.h b/engines/kyra/resource.h similarity index 100% rename from kyra/resource.h rename to engines/kyra/resource.h diff --git a/kyra/saveload.cpp b/engines/kyra/saveload.cpp similarity index 100% rename from kyra/saveload.cpp rename to engines/kyra/saveload.cpp diff --git a/kyra/scene.cpp b/engines/kyra/scene.cpp similarity index 100% rename from kyra/scene.cpp rename to engines/kyra/scene.cpp diff --git a/kyra/screen.cpp b/engines/kyra/screen.cpp similarity index 100% rename from kyra/screen.cpp rename to engines/kyra/screen.cpp diff --git a/kyra/screen.h b/engines/kyra/screen.h similarity index 100% rename from kyra/screen.h rename to engines/kyra/screen.h diff --git a/kyra/script.cpp b/engines/kyra/script.cpp similarity index 100% rename from kyra/script.cpp rename to engines/kyra/script.cpp diff --git a/kyra/script.h b/engines/kyra/script.h similarity index 100% rename from kyra/script.h rename to engines/kyra/script.h diff --git a/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp similarity index 100% rename from kyra/script_v1.cpp rename to engines/kyra/script_v1.cpp diff --git a/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp similarity index 100% rename from kyra/seqplayer.cpp rename to engines/kyra/seqplayer.cpp diff --git a/kyra/seqplayer.h b/engines/kyra/seqplayer.h similarity index 100% rename from kyra/seqplayer.h rename to engines/kyra/seqplayer.h diff --git a/kyra/sequences_v1.cpp b/engines/kyra/sequences_v1.cpp similarity index 100% rename from kyra/sequences_v1.cpp rename to engines/kyra/sequences_v1.cpp diff --git a/kyra/sound.cpp b/engines/kyra/sound.cpp similarity index 100% rename from kyra/sound.cpp rename to engines/kyra/sound.cpp diff --git a/kyra/sound.h b/engines/kyra/sound.h similarity index 100% rename from kyra/sound.h rename to engines/kyra/sound.h diff --git a/kyra/sprites.cpp b/engines/kyra/sprites.cpp similarity index 100% rename from kyra/sprites.cpp rename to engines/kyra/sprites.cpp diff --git a/kyra/sprites.h b/engines/kyra/sprites.h similarity index 100% rename from kyra/sprites.h rename to engines/kyra/sprites.h diff --git a/kyra/staticres.cpp b/engines/kyra/staticres.cpp similarity index 100% rename from kyra/staticres.cpp rename to engines/kyra/staticres.cpp diff --git a/kyra/text.cpp b/engines/kyra/text.cpp similarity index 100% rename from kyra/text.cpp rename to engines/kyra/text.cpp diff --git a/kyra/text.h b/engines/kyra/text.h similarity index 100% rename from kyra/text.h rename to engines/kyra/text.h diff --git a/kyra/timer.cpp b/engines/kyra/timer.cpp similarity index 100% rename from kyra/timer.cpp rename to engines/kyra/timer.cpp diff --git a/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp similarity index 100% rename from kyra/wsamovie.cpp rename to engines/kyra/wsamovie.cpp diff --git a/kyra/wsamovie.h b/engines/kyra/wsamovie.h similarity index 100% rename from kyra/wsamovie.h rename to engines/kyra/wsamovie.h diff --git a/lure/animseq.cpp b/engines/lure/animseq.cpp similarity index 100% rename from lure/animseq.cpp rename to engines/lure/animseq.cpp diff --git a/lure/animseq.h b/engines/lure/animseq.h similarity index 100% rename from lure/animseq.h rename to engines/lure/animseq.h diff --git a/lure/debug-input.cpp b/engines/lure/debug-input.cpp similarity index 100% rename from lure/debug-input.cpp rename to engines/lure/debug-input.cpp diff --git a/lure/debug-input.h b/engines/lure/debug-input.h similarity index 100% rename from lure/debug-input.h rename to engines/lure/debug-input.h diff --git a/lure/debug-methods.cpp b/engines/lure/debug-methods.cpp similarity index 100% rename from lure/debug-methods.cpp rename to engines/lure/debug-methods.cpp diff --git a/lure/debug-methods.h b/engines/lure/debug-methods.h similarity index 100% rename from lure/debug-methods.h rename to engines/lure/debug-methods.h diff --git a/lure/decode.cpp b/engines/lure/decode.cpp similarity index 100% rename from lure/decode.cpp rename to engines/lure/decode.cpp diff --git a/lure/decode.h b/engines/lure/decode.h similarity index 100% rename from lure/decode.h rename to engines/lure/decode.h diff --git a/lure/disk.cpp b/engines/lure/disk.cpp similarity index 100% rename from lure/disk.cpp rename to engines/lure/disk.cpp diff --git a/lure/disk.h b/engines/lure/disk.h similarity index 100% rename from lure/disk.h rename to engines/lure/disk.h diff --git a/lure/events.cpp b/engines/lure/events.cpp similarity index 100% rename from lure/events.cpp rename to engines/lure/events.cpp diff --git a/lure/events.h b/engines/lure/events.h similarity index 100% rename from lure/events.h rename to engines/lure/events.h diff --git a/lure/game.cpp b/engines/lure/game.cpp similarity index 100% rename from lure/game.cpp rename to engines/lure/game.cpp diff --git a/lure/game.h b/engines/lure/game.h similarity index 100% rename from lure/game.h rename to engines/lure/game.h diff --git a/lure/hotspots.cpp b/engines/lure/hotspots.cpp similarity index 100% rename from lure/hotspots.cpp rename to engines/lure/hotspots.cpp diff --git a/lure/hotspots.h b/engines/lure/hotspots.h similarity index 100% rename from lure/hotspots.h rename to engines/lure/hotspots.h diff --git a/lure/intro.cpp b/engines/lure/intro.cpp similarity index 100% rename from lure/intro.cpp rename to engines/lure/intro.cpp diff --git a/lure/intro.h b/engines/lure/intro.h similarity index 100% rename from lure/intro.h rename to engines/lure/intro.h diff --git a/lure/lure.cpp b/engines/lure/lure.cpp similarity index 100% rename from lure/lure.cpp rename to engines/lure/lure.cpp diff --git a/lure/lure.h b/engines/lure/lure.h similarity index 100% rename from lure/lure.h rename to engines/lure/lure.h diff --git a/lure/luredefs.h b/engines/lure/luredefs.h similarity index 100% rename from lure/luredefs.h rename to engines/lure/luredefs.h diff --git a/lure/memory.cpp b/engines/lure/memory.cpp similarity index 100% rename from lure/memory.cpp rename to engines/lure/memory.cpp diff --git a/lure/memory.h b/engines/lure/memory.h similarity index 100% rename from lure/memory.h rename to engines/lure/memory.h diff --git a/lure/menu.cpp b/engines/lure/menu.cpp similarity index 100% rename from lure/menu.cpp rename to engines/lure/menu.cpp diff --git a/lure/menu.h b/engines/lure/menu.h similarity index 100% rename from lure/menu.h rename to engines/lure/menu.h diff --git a/engines/lure/module.mk b/engines/lure/module.mk new file mode 100644 index 00000000000..8b83531bd76 --- /dev/null +++ b/engines/lure/module.mk @@ -0,0 +1,36 @@ +MODULE := engines/lure + +MODULE_OBJS := \ + 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 += \ + engines/lure + +# This module can be built as a plugin +ifdef BUILD_PLUGINS +PLUGIN := 1 +endif + +# Include common rules +include $(srcdir)/common.rules + diff --git a/lure/palette.cpp b/engines/lure/palette.cpp similarity index 100% rename from lure/palette.cpp rename to engines/lure/palette.cpp diff --git a/lure/palette.h b/engines/lure/palette.h similarity index 100% rename from lure/palette.h rename to engines/lure/palette.h diff --git a/lure/res.cpp b/engines/lure/res.cpp similarity index 100% rename from lure/res.cpp rename to engines/lure/res.cpp diff --git a/lure/res.h b/engines/lure/res.h similarity index 100% rename from lure/res.h rename to engines/lure/res.h diff --git a/lure/res_struct.cpp b/engines/lure/res_struct.cpp similarity index 100% rename from lure/res_struct.cpp rename to engines/lure/res_struct.cpp diff --git a/lure/res_struct.h b/engines/lure/res_struct.h similarity index 100% rename from lure/res_struct.h rename to engines/lure/res_struct.h diff --git a/lure/room.cpp b/engines/lure/room.cpp similarity index 100% rename from lure/room.cpp rename to engines/lure/room.cpp diff --git a/lure/room.h b/engines/lure/room.h similarity index 100% rename from lure/room.h rename to engines/lure/room.h diff --git a/lure/screen.cpp b/engines/lure/screen.cpp similarity index 100% rename from lure/screen.cpp rename to engines/lure/screen.cpp diff --git a/lure/screen.h b/engines/lure/screen.h similarity index 100% rename from lure/screen.h rename to engines/lure/screen.h diff --git a/lure/scripts.cpp b/engines/lure/scripts.cpp similarity index 100% rename from lure/scripts.cpp rename to engines/lure/scripts.cpp diff --git a/lure/scripts.h b/engines/lure/scripts.h similarity index 100% rename from lure/scripts.h rename to engines/lure/scripts.h diff --git a/lure/strings.cpp b/engines/lure/strings.cpp similarity index 100% rename from lure/strings.cpp rename to engines/lure/strings.cpp diff --git a/lure/strings.h b/engines/lure/strings.h similarity index 100% rename from lure/strings.h rename to engines/lure/strings.h diff --git a/lure/surface.cpp b/engines/lure/surface.cpp similarity index 100% rename from lure/surface.cpp rename to engines/lure/surface.cpp diff --git a/lure/surface.h b/engines/lure/surface.h similarity index 100% rename from lure/surface.h rename to engines/lure/surface.h diff --git a/lure/system.cpp b/engines/lure/system.cpp similarity index 100% rename from lure/system.cpp rename to engines/lure/system.cpp diff --git a/lure/system.h b/engines/lure/system.h similarity index 100% rename from lure/system.h rename to engines/lure/system.h diff --git a/queen/bankman.cpp b/engines/queen/bankman.cpp similarity index 100% rename from queen/bankman.cpp rename to engines/queen/bankman.cpp diff --git a/queen/bankman.h b/engines/queen/bankman.h similarity index 100% rename from queen/bankman.h rename to engines/queen/bankman.h diff --git a/queen/command.cpp b/engines/queen/command.cpp similarity index 100% rename from queen/command.cpp rename to engines/queen/command.cpp diff --git a/queen/command.h b/engines/queen/command.h similarity index 100% rename from queen/command.h rename to engines/queen/command.h diff --git a/queen/credits.cpp b/engines/queen/credits.cpp similarity index 100% rename from queen/credits.cpp rename to engines/queen/credits.cpp diff --git a/queen/credits.h b/engines/queen/credits.h similarity index 100% rename from queen/credits.h rename to engines/queen/credits.h diff --git a/queen/cutaway.cpp b/engines/queen/cutaway.cpp similarity index 100% rename from queen/cutaway.cpp rename to engines/queen/cutaway.cpp diff --git a/queen/cutaway.h b/engines/queen/cutaway.h similarity index 100% rename from queen/cutaway.h rename to engines/queen/cutaway.h diff --git a/queen/debug.cpp b/engines/queen/debug.cpp similarity index 100% rename from queen/debug.cpp rename to engines/queen/debug.cpp diff --git a/queen/debug.h b/engines/queen/debug.h similarity index 100% rename from queen/debug.h rename to engines/queen/debug.h diff --git a/queen/defs.h b/engines/queen/defs.h similarity index 100% rename from queen/defs.h rename to engines/queen/defs.h diff --git a/queen/display.cpp b/engines/queen/display.cpp similarity index 100% rename from queen/display.cpp rename to engines/queen/display.cpp diff --git a/queen/display.h b/engines/queen/display.h similarity index 100% rename from queen/display.h rename to engines/queen/display.h diff --git a/queen/graphics.cpp b/engines/queen/graphics.cpp similarity index 100% rename from queen/graphics.cpp rename to engines/queen/graphics.cpp diff --git a/queen/graphics.h b/engines/queen/graphics.h similarity index 100% rename from queen/graphics.h rename to engines/queen/graphics.h diff --git a/queen/grid.cpp b/engines/queen/grid.cpp similarity index 100% rename from queen/grid.cpp rename to engines/queen/grid.cpp diff --git a/queen/grid.h b/engines/queen/grid.h similarity index 100% rename from queen/grid.h rename to engines/queen/grid.h diff --git a/queen/input.cpp b/engines/queen/input.cpp similarity index 100% rename from queen/input.cpp rename to engines/queen/input.cpp diff --git a/queen/input.h b/engines/queen/input.h similarity index 100% rename from queen/input.h rename to engines/queen/input.h diff --git a/queen/journal.cpp b/engines/queen/journal.cpp similarity index 100% rename from queen/journal.cpp rename to engines/queen/journal.cpp diff --git a/queen/journal.h b/engines/queen/journal.h similarity index 100% rename from queen/journal.h rename to engines/queen/journal.h diff --git a/queen/logic.cpp b/engines/queen/logic.cpp similarity index 100% rename from queen/logic.cpp rename to engines/queen/logic.cpp diff --git a/queen/logic.h b/engines/queen/logic.h similarity index 100% rename from queen/logic.h rename to engines/queen/logic.h diff --git a/engines/queen/module.mk b/engines/queen/module.mk new file mode 100644 index 00000000000..be3c5707e65 --- /dev/null +++ b/engines/queen/module.mk @@ -0,0 +1,34 @@ +MODULE := engines/queen + +MODULE_OBJS := \ + 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 += \ + engines/queen + +# This module can be built as a plugin +ifdef BUILD_PLUGINS +PLUGIN := 1 +endif + +# Include common rules +include $(srcdir)/common.rules diff --git a/queen/music.cpp b/engines/queen/music.cpp similarity index 100% rename from queen/music.cpp rename to engines/queen/music.cpp diff --git a/queen/music.h b/engines/queen/music.h similarity index 100% rename from queen/music.h rename to engines/queen/music.h diff --git a/queen/musicdata.cpp b/engines/queen/musicdata.cpp similarity index 100% rename from queen/musicdata.cpp rename to engines/queen/musicdata.cpp diff --git a/queen/queen.cpp b/engines/queen/queen.cpp similarity index 100% rename from queen/queen.cpp rename to engines/queen/queen.cpp diff --git a/queen/queen.h b/engines/queen/queen.h similarity index 100% rename from queen/queen.h rename to engines/queen/queen.h diff --git a/queen/resource.cpp b/engines/queen/resource.cpp similarity index 100% rename from queen/resource.cpp rename to engines/queen/resource.cpp diff --git a/queen/resource.h b/engines/queen/resource.h similarity index 100% rename from queen/resource.h rename to engines/queen/resource.h diff --git a/queen/restables.cpp b/engines/queen/restables.cpp similarity index 100% rename from queen/restables.cpp rename to engines/queen/restables.cpp diff --git a/queen/sound.cpp b/engines/queen/sound.cpp similarity index 100% rename from queen/sound.cpp rename to engines/queen/sound.cpp diff --git a/queen/sound.h b/engines/queen/sound.h similarity index 100% rename from queen/sound.h rename to engines/queen/sound.h diff --git a/queen/state.cpp b/engines/queen/state.cpp similarity index 100% rename from queen/state.cpp rename to engines/queen/state.cpp diff --git a/queen/state.h b/engines/queen/state.h similarity index 100% rename from queen/state.h rename to engines/queen/state.h diff --git a/queen/structs.h b/engines/queen/structs.h similarity index 100% rename from queen/structs.h rename to engines/queen/structs.h diff --git a/queen/talk.cpp b/engines/queen/talk.cpp similarity index 100% rename from queen/talk.cpp rename to engines/queen/talk.cpp diff --git a/queen/talk.h b/engines/queen/talk.h similarity index 100% rename from queen/talk.h rename to engines/queen/talk.h diff --git a/queen/walk.cpp b/engines/queen/walk.cpp similarity index 100% rename from queen/walk.cpp rename to engines/queen/walk.cpp diff --git a/queen/walk.h b/engines/queen/walk.h similarity index 100% rename from queen/walk.h rename to engines/queen/walk.h diff --git a/queen/xref.txt b/engines/queen/xref.txt similarity index 100% rename from queen/xref.txt rename to engines/queen/xref.txt diff --git a/saga/actor.cpp b/engines/saga/actor.cpp similarity index 100% rename from saga/actor.cpp rename to engines/saga/actor.cpp diff --git a/saga/actor.h b/engines/saga/actor.h similarity index 100% rename from saga/actor.h rename to engines/saga/actor.h diff --git a/saga/animation.cpp b/engines/saga/animation.cpp similarity index 100% rename from saga/animation.cpp rename to engines/saga/animation.cpp diff --git a/saga/animation.h b/engines/saga/animation.h similarity index 100% rename from saga/animation.h rename to engines/saga/animation.h diff --git a/saga/console.cpp b/engines/saga/console.cpp similarity index 100% rename from saga/console.cpp rename to engines/saga/console.cpp diff --git a/saga/console.h b/engines/saga/console.h similarity index 100% rename from saga/console.h rename to engines/saga/console.h diff --git a/saga/events.cpp b/engines/saga/events.cpp similarity index 100% rename from saga/events.cpp rename to engines/saga/events.cpp diff --git a/saga/events.h b/engines/saga/events.h similarity index 100% rename from saga/events.h rename to engines/saga/events.h diff --git a/saga/font.cpp b/engines/saga/font.cpp similarity index 100% rename from saga/font.cpp rename to engines/saga/font.cpp diff --git a/saga/font.h b/engines/saga/font.h similarity index 100% rename from saga/font.h rename to engines/saga/font.h diff --git a/saga/font_map.cpp b/engines/saga/font_map.cpp similarity index 100% rename from saga/font_map.cpp rename to engines/saga/font_map.cpp diff --git a/saga/game.cpp b/engines/saga/game.cpp similarity index 100% rename from saga/game.cpp rename to engines/saga/game.cpp diff --git a/saga/gfx.cpp b/engines/saga/gfx.cpp similarity index 100% rename from saga/gfx.cpp rename to engines/saga/gfx.cpp diff --git a/saga/gfx.h b/engines/saga/gfx.h similarity index 100% rename from saga/gfx.h rename to engines/saga/gfx.h diff --git a/saga/ihnm_introproc.cpp b/engines/saga/ihnm_introproc.cpp similarity index 100% rename from saga/ihnm_introproc.cpp rename to engines/saga/ihnm_introproc.cpp diff --git a/saga/image.cpp b/engines/saga/image.cpp similarity index 100% rename from saga/image.cpp rename to engines/saga/image.cpp diff --git a/saga/input.cpp b/engines/saga/input.cpp similarity index 100% rename from saga/input.cpp rename to engines/saga/input.cpp diff --git a/saga/interface.cpp b/engines/saga/interface.cpp similarity index 100% rename from saga/interface.cpp rename to engines/saga/interface.cpp diff --git a/saga/interface.h b/engines/saga/interface.h similarity index 100% rename from saga/interface.h rename to engines/saga/interface.h diff --git a/saga/isomap.cpp b/engines/saga/isomap.cpp similarity index 100% rename from saga/isomap.cpp rename to engines/saga/isomap.cpp diff --git a/saga/isomap.h b/engines/saga/isomap.h similarity index 100% rename from saga/isomap.h rename to engines/saga/isomap.h diff --git a/saga/ite_introproc.cpp b/engines/saga/ite_introproc.cpp similarity index 100% rename from saga/ite_introproc.cpp rename to engines/saga/ite_introproc.cpp diff --git a/saga/itedata.cpp b/engines/saga/itedata.cpp similarity index 100% rename from saga/itedata.cpp rename to engines/saga/itedata.cpp diff --git a/saga/itedata.h b/engines/saga/itedata.h similarity index 100% rename from saga/itedata.h rename to engines/saga/itedata.h diff --git a/saga/list.h b/engines/saga/list.h similarity index 100% rename from saga/list.h rename to engines/saga/list.h diff --git a/engines/saga/module.mk b/engines/saga/module.mk new file mode 100644 index 00000000000..3d391084444 --- /dev/null +++ b/engines/saga/module.mk @@ -0,0 +1,44 @@ +MODULE := engines/saga + +MODULE_OBJS := \ + 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 += \ + engines/saga + +# This module can be built as a plugin +ifdef BUILD_PLUGINS +PLUGIN := 1 +endif + +# Include common rules +include $(srcdir)/common.rules diff --git a/saga/music.cpp b/engines/saga/music.cpp similarity index 100% rename from saga/music.cpp rename to engines/saga/music.cpp diff --git a/saga/music.h b/engines/saga/music.h similarity index 100% rename from saga/music.h rename to engines/saga/music.h diff --git a/saga/objectmap.cpp b/engines/saga/objectmap.cpp similarity index 100% rename from saga/objectmap.cpp rename to engines/saga/objectmap.cpp diff --git a/saga/objectmap.h b/engines/saga/objectmap.h similarity index 100% rename from saga/objectmap.h rename to engines/saga/objectmap.h diff --git a/saga/palanim.cpp b/engines/saga/palanim.cpp similarity index 100% rename from saga/palanim.cpp rename to engines/saga/palanim.cpp diff --git a/saga/palanim.h b/engines/saga/palanim.h similarity index 100% rename from saga/palanim.h rename to engines/saga/palanim.h diff --git a/saga/puzzle.cpp b/engines/saga/puzzle.cpp similarity index 100% rename from saga/puzzle.cpp rename to engines/saga/puzzle.cpp diff --git a/saga/puzzle.h b/engines/saga/puzzle.h similarity index 100% rename from saga/puzzle.h rename to engines/saga/puzzle.h diff --git a/saga/render.cpp b/engines/saga/render.cpp similarity index 100% rename from saga/render.cpp rename to engines/saga/render.cpp diff --git a/saga/render.h b/engines/saga/render.h similarity index 100% rename from saga/render.h rename to engines/saga/render.h diff --git a/saga/resnames.h b/engines/saga/resnames.h similarity index 100% rename from saga/resnames.h rename to engines/saga/resnames.h diff --git a/saga/rscfile.cpp b/engines/saga/rscfile.cpp similarity index 100% rename from saga/rscfile.cpp rename to engines/saga/rscfile.cpp diff --git a/saga/rscfile.h b/engines/saga/rscfile.h similarity index 100% rename from saga/rscfile.h rename to engines/saga/rscfile.h diff --git a/saga/saga.cpp b/engines/saga/saga.cpp similarity index 100% rename from saga/saga.cpp rename to engines/saga/saga.cpp diff --git a/saga/saga.h b/engines/saga/saga.h similarity index 100% rename from saga/saga.h rename to engines/saga/saga.h diff --git a/saga/saveload.cpp b/engines/saga/saveload.cpp similarity index 100% rename from saga/saveload.cpp rename to engines/saga/saveload.cpp diff --git a/saga/scene.cpp b/engines/saga/scene.cpp similarity index 100% rename from saga/scene.cpp rename to engines/saga/scene.cpp diff --git a/saga/scene.h b/engines/saga/scene.h similarity index 100% rename from saga/scene.h rename to engines/saga/scene.h diff --git a/saga/script.cpp b/engines/saga/script.cpp similarity index 100% rename from saga/script.cpp rename to engines/saga/script.cpp diff --git a/saga/script.h b/engines/saga/script.h similarity index 100% rename from saga/script.h rename to engines/saga/script.h diff --git a/saga/sfuncs.cpp b/engines/saga/sfuncs.cpp similarity index 100% rename from saga/sfuncs.cpp rename to engines/saga/sfuncs.cpp diff --git a/saga/sndres.cpp b/engines/saga/sndres.cpp similarity index 100% rename from saga/sndres.cpp rename to engines/saga/sndres.cpp diff --git a/saga/sndres.h b/engines/saga/sndres.h similarity index 100% rename from saga/sndres.h rename to engines/saga/sndres.h diff --git a/saga/sound.cpp b/engines/saga/sound.cpp similarity index 100% rename from saga/sound.cpp rename to engines/saga/sound.cpp diff --git a/saga/sound.h b/engines/saga/sound.h similarity index 100% rename from saga/sound.h rename to engines/saga/sound.h diff --git a/saga/sprite.cpp b/engines/saga/sprite.cpp similarity index 100% rename from saga/sprite.cpp rename to engines/saga/sprite.cpp diff --git a/saga/sprite.h b/engines/saga/sprite.h similarity index 100% rename from saga/sprite.h rename to engines/saga/sprite.h diff --git a/saga/sthread.cpp b/engines/saga/sthread.cpp similarity index 100% rename from saga/sthread.cpp rename to engines/saga/sthread.cpp diff --git a/saga/stream.h b/engines/saga/stream.h similarity index 100% rename from saga/stream.h rename to engines/saga/stream.h diff --git a/saga/xref.txt b/engines/saga/xref.txt similarity index 100% rename from saga/xref.txt rename to engines/saga/xref.txt diff --git a/scumm/actor.cpp b/engines/scumm/actor.cpp similarity index 100% rename from scumm/actor.cpp rename to engines/scumm/actor.cpp diff --git a/scumm/actor.h b/engines/scumm/actor.h similarity index 100% rename from scumm/actor.h rename to engines/scumm/actor.h diff --git a/scumm/akos.cpp b/engines/scumm/akos.cpp similarity index 100% rename from scumm/akos.cpp rename to engines/scumm/akos.cpp diff --git a/scumm/akos.h b/engines/scumm/akos.h similarity index 100% rename from scumm/akos.h rename to engines/scumm/akos.h diff --git a/scumm/base-costume.cpp b/engines/scumm/base-costume.cpp similarity index 100% rename from scumm/base-costume.cpp rename to engines/scumm/base-costume.cpp diff --git a/scumm/base-costume.h b/engines/scumm/base-costume.h similarity index 100% rename from scumm/base-costume.h rename to engines/scumm/base-costume.h diff --git a/scumm/bomp.cpp b/engines/scumm/bomp.cpp similarity index 100% rename from scumm/bomp.cpp rename to engines/scumm/bomp.cpp diff --git a/scumm/bomp.h b/engines/scumm/bomp.h similarity index 100% rename from scumm/bomp.h rename to engines/scumm/bomp.h diff --git a/scumm/boxes.cpp b/engines/scumm/boxes.cpp similarity index 100% rename from scumm/boxes.cpp rename to engines/scumm/boxes.cpp diff --git a/scumm/boxes.h b/engines/scumm/boxes.h similarity index 100% rename from scumm/boxes.h rename to engines/scumm/boxes.h diff --git a/scumm/camera.cpp b/engines/scumm/camera.cpp similarity index 100% rename from scumm/camera.cpp rename to engines/scumm/camera.cpp diff --git a/scumm/charset.cpp b/engines/scumm/charset.cpp similarity index 100% rename from scumm/charset.cpp rename to engines/scumm/charset.cpp diff --git a/scumm/charset.h b/engines/scumm/charset.h similarity index 100% rename from scumm/charset.h rename to engines/scumm/charset.h diff --git a/scumm/costume.cpp b/engines/scumm/costume.cpp similarity index 100% rename from scumm/costume.cpp rename to engines/scumm/costume.cpp diff --git a/scumm/costume.h b/engines/scumm/costume.h similarity index 100% rename from scumm/costume.h rename to engines/scumm/costume.h diff --git a/scumm/cursor.cpp b/engines/scumm/cursor.cpp similarity index 100% rename from scumm/cursor.cpp rename to engines/scumm/cursor.cpp diff --git a/scumm/debugger.cpp b/engines/scumm/debugger.cpp similarity index 100% rename from scumm/debugger.cpp rename to engines/scumm/debugger.cpp diff --git a/scumm/debugger.h b/engines/scumm/debugger.h similarity index 100% rename from scumm/debugger.h rename to engines/scumm/debugger.h diff --git a/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp similarity index 100% rename from scumm/dialogs.cpp rename to engines/scumm/dialogs.cpp diff --git a/scumm/dialogs.h b/engines/scumm/dialogs.h similarity index 100% rename from scumm/dialogs.h rename to engines/scumm/dialogs.h diff --git a/scumm/floodfill_he.cpp b/engines/scumm/floodfill_he.cpp similarity index 100% rename from scumm/floodfill_he.cpp rename to engines/scumm/floodfill_he.cpp diff --git a/scumm/floodfill_he.h b/engines/scumm/floodfill_he.h similarity index 100% rename from scumm/floodfill_he.h rename to engines/scumm/floodfill_he.h diff --git a/scumm/gfx.cpp b/engines/scumm/gfx.cpp similarity index 100% rename from scumm/gfx.cpp rename to engines/scumm/gfx.cpp diff --git a/scumm/gfx.h b/engines/scumm/gfx.h similarity index 100% rename from scumm/gfx.h rename to engines/scumm/gfx.h diff --git a/scumm/help.cpp b/engines/scumm/help.cpp similarity index 100% rename from scumm/help.cpp rename to engines/scumm/help.cpp diff --git a/scumm/help.h b/engines/scumm/help.h similarity index 100% rename from scumm/help.h rename to engines/scumm/help.h diff --git a/scumm/imuse.cpp b/engines/scumm/imuse.cpp similarity index 100% rename from scumm/imuse.cpp rename to engines/scumm/imuse.cpp diff --git a/scumm/imuse.h b/engines/scumm/imuse.h similarity index 100% rename from scumm/imuse.h rename to engines/scumm/imuse.h diff --git a/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp similarity index 100% rename from scumm/imuse_digi/dimuse.cpp rename to engines/scumm/imuse_digi/dimuse.cpp diff --git a/scumm/imuse_digi/dimuse.h b/engines/scumm/imuse_digi/dimuse.h similarity index 100% rename from scumm/imuse_digi/dimuse.h rename to engines/scumm/imuse_digi/dimuse.h diff --git a/scumm/imuse_digi/dimuse_bndmgr.cpp b/engines/scumm/imuse_digi/dimuse_bndmgr.cpp similarity index 100% rename from scumm/imuse_digi/dimuse_bndmgr.cpp rename to engines/scumm/imuse_digi/dimuse_bndmgr.cpp diff --git a/scumm/imuse_digi/dimuse_bndmgr.h b/engines/scumm/imuse_digi/dimuse_bndmgr.h similarity index 100% rename from scumm/imuse_digi/dimuse_bndmgr.h rename to engines/scumm/imuse_digi/dimuse_bndmgr.h diff --git a/scumm/imuse_digi/dimuse_codecs.cpp b/engines/scumm/imuse_digi/dimuse_codecs.cpp similarity index 100% rename from scumm/imuse_digi/dimuse_codecs.cpp rename to engines/scumm/imuse_digi/dimuse_codecs.cpp diff --git a/scumm/imuse_digi/dimuse_music.cpp b/engines/scumm/imuse_digi/dimuse_music.cpp similarity index 100% rename from scumm/imuse_digi/dimuse_music.cpp rename to engines/scumm/imuse_digi/dimuse_music.cpp diff --git a/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp similarity index 100% rename from scumm/imuse_digi/dimuse_script.cpp rename to engines/scumm/imuse_digi/dimuse_script.cpp diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp similarity index 100% rename from scumm/imuse_digi/dimuse_sndmgr.cpp rename to engines/scumm/imuse_digi/dimuse_sndmgr.cpp diff --git a/scumm/imuse_digi/dimuse_sndmgr.h b/engines/scumm/imuse_digi/dimuse_sndmgr.h similarity index 100% rename from scumm/imuse_digi/dimuse_sndmgr.h rename to engines/scumm/imuse_digi/dimuse_sndmgr.h diff --git a/scumm/imuse_digi/dimuse_tables.cpp b/engines/scumm/imuse_digi/dimuse_tables.cpp similarity index 100% rename from scumm/imuse_digi/dimuse_tables.cpp rename to engines/scumm/imuse_digi/dimuse_tables.cpp diff --git a/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp similarity index 100% rename from scumm/imuse_digi/dimuse_track.cpp rename to engines/scumm/imuse_digi/dimuse_track.cpp diff --git a/scumm/imuse_internal.h b/engines/scumm/imuse_internal.h similarity index 100% rename from scumm/imuse_internal.h rename to engines/scumm/imuse_internal.h diff --git a/scumm/imuse_player.cpp b/engines/scumm/imuse_player.cpp similarity index 100% rename from scumm/imuse_player.cpp rename to engines/scumm/imuse_player.cpp diff --git a/scumm/input.cpp b/engines/scumm/input.cpp similarity index 100% rename from scumm/input.cpp rename to engines/scumm/input.cpp diff --git a/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp similarity index 100% rename from scumm/insane/insane.cpp rename to engines/scumm/insane/insane.cpp diff --git a/scumm/insane/insane.h b/engines/scumm/insane/insane.h similarity index 100% rename from scumm/insane/insane.h rename to engines/scumm/insane/insane.h diff --git a/scumm/insane/insane_ben.cpp b/engines/scumm/insane/insane_ben.cpp similarity index 100% rename from scumm/insane/insane_ben.cpp rename to engines/scumm/insane/insane_ben.cpp diff --git a/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp similarity index 100% rename from scumm/insane/insane_enemy.cpp rename to engines/scumm/insane/insane_enemy.cpp diff --git a/scumm/insane/insane_iact.cpp b/engines/scumm/insane/insane_iact.cpp similarity index 100% rename from scumm/insane/insane_iact.cpp rename to engines/scumm/insane/insane_iact.cpp diff --git a/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp similarity index 100% rename from scumm/insane/insane_scenes.cpp rename to engines/scumm/insane/insane_scenes.cpp diff --git a/scumm/instrument.cpp b/engines/scumm/instrument.cpp similarity index 100% rename from scumm/instrument.cpp rename to engines/scumm/instrument.cpp diff --git a/scumm/instrument.h b/engines/scumm/instrument.h similarity index 100% rename from scumm/instrument.h rename to engines/scumm/instrument.h diff --git a/scumm/intern.h b/engines/scumm/intern.h similarity index 100% rename from scumm/intern.h rename to engines/scumm/intern.h diff --git a/scumm/intern_he.h b/engines/scumm/intern_he.h similarity index 100% rename from scumm/intern_he.h rename to engines/scumm/intern_he.h diff --git a/scumm/logic_he.cpp b/engines/scumm/logic_he.cpp similarity index 100% rename from scumm/logic_he.cpp rename to engines/scumm/logic_he.cpp diff --git a/scumm/logic_he.h b/engines/scumm/logic_he.h similarity index 100% rename from scumm/logic_he.h rename to engines/scumm/logic_he.h diff --git a/scumm/midiparser_eup.cpp b/engines/scumm/midiparser_eup.cpp similarity index 100% rename from scumm/midiparser_eup.cpp rename to engines/scumm/midiparser_eup.cpp diff --git a/scumm/midiparser_ro.cpp b/engines/scumm/midiparser_ro.cpp similarity index 100% rename from scumm/midiparser_ro.cpp rename to engines/scumm/midiparser_ro.cpp diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk new file mode 100644 index 00000000000..6bf42512b39 --- /dev/null +++ b/engines/scumm/module.mk @@ -0,0 +1,110 @@ +MODULE := engines/scumm + +MODULE_OBJS := \ + 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 += \ + 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 += \ + 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 += \ + engines/scumm \ + engines/scumm/imuse_digi \ + engines/scumm/insane \ + engines/scumm/smush + +# This module can be built as a plugin +ifdef BUILD_PLUGINS +PLUGIN := 1 +# HACK HACK evil HACK HACK +PLUGIN_LDFLAGS += -lz +endif + +# Include common rules +include $(srcdir)/common.rules diff --git a/scumm/music.h b/engines/scumm/music.h similarity index 100% rename from scumm/music.h rename to engines/scumm/music.h diff --git a/scumm/nut_renderer.cpp b/engines/scumm/nut_renderer.cpp similarity index 100% rename from scumm/nut_renderer.cpp rename to engines/scumm/nut_renderer.cpp diff --git a/scumm/nut_renderer.h b/engines/scumm/nut_renderer.h similarity index 100% rename from scumm/nut_renderer.h rename to engines/scumm/nut_renderer.h diff --git a/scumm/object.cpp b/engines/scumm/object.cpp similarity index 100% rename from scumm/object.cpp rename to engines/scumm/object.cpp diff --git a/scumm/object.h b/engines/scumm/object.h similarity index 100% rename from scumm/object.h rename to engines/scumm/object.h diff --git a/scumm/palette.cpp b/engines/scumm/palette.cpp similarity index 100% rename from scumm/palette.cpp rename to engines/scumm/palette.cpp diff --git a/scumm/palette_he.cpp b/engines/scumm/palette_he.cpp similarity index 100% rename from scumm/palette_he.cpp rename to engines/scumm/palette_he.cpp diff --git a/scumm/player_mod.cpp b/engines/scumm/player_mod.cpp similarity index 100% rename from scumm/player_mod.cpp rename to engines/scumm/player_mod.cpp diff --git a/scumm/player_mod.h b/engines/scumm/player_mod.h similarity index 100% rename from scumm/player_mod.h rename to engines/scumm/player_mod.h diff --git a/scumm/player_nes.cpp b/engines/scumm/player_nes.cpp similarity index 100% rename from scumm/player_nes.cpp rename to engines/scumm/player_nes.cpp diff --git a/scumm/player_nes.h b/engines/scumm/player_nes.h similarity index 100% rename from scumm/player_nes.h rename to engines/scumm/player_nes.h diff --git a/scumm/player_v1.cpp b/engines/scumm/player_v1.cpp similarity index 100% rename from scumm/player_v1.cpp rename to engines/scumm/player_v1.cpp diff --git a/scumm/player_v1.h b/engines/scumm/player_v1.h similarity index 100% rename from scumm/player_v1.h rename to engines/scumm/player_v1.h diff --git a/scumm/player_v2.cpp b/engines/scumm/player_v2.cpp similarity index 100% rename from scumm/player_v2.cpp rename to engines/scumm/player_v2.cpp diff --git a/scumm/player_v2.h b/engines/scumm/player_v2.h similarity index 100% rename from scumm/player_v2.h rename to engines/scumm/player_v2.h diff --git a/scumm/player_v2a.cpp b/engines/scumm/player_v2a.cpp similarity index 100% rename from scumm/player_v2a.cpp rename to engines/scumm/player_v2a.cpp diff --git a/scumm/player_v2a.h b/engines/scumm/player_v2a.h similarity index 100% rename from scumm/player_v2a.h rename to engines/scumm/player_v2a.h diff --git a/scumm/player_v3a.cpp b/engines/scumm/player_v3a.cpp similarity index 100% rename from scumm/player_v3a.cpp rename to engines/scumm/player_v3a.cpp diff --git a/scumm/player_v3a.h b/engines/scumm/player_v3a.h similarity index 100% rename from scumm/player_v3a.h rename to engines/scumm/player_v3a.h diff --git a/scumm/resource.cpp b/engines/scumm/resource.cpp similarity index 100% rename from scumm/resource.cpp rename to engines/scumm/resource.cpp diff --git a/scumm/resource.h b/engines/scumm/resource.h similarity index 100% rename from scumm/resource.h rename to engines/scumm/resource.h diff --git a/scumm/resource_v2.cpp b/engines/scumm/resource_v2.cpp similarity index 100% rename from scumm/resource_v2.cpp rename to engines/scumm/resource_v2.cpp diff --git a/scumm/resource_v3.cpp b/engines/scumm/resource_v3.cpp similarity index 100% rename from scumm/resource_v3.cpp rename to engines/scumm/resource_v3.cpp diff --git a/scumm/resource_v4.cpp b/engines/scumm/resource_v4.cpp similarity index 100% rename from scumm/resource_v4.cpp rename to engines/scumm/resource_v4.cpp diff --git a/scumm/resource_v7he.cpp b/engines/scumm/resource_v7he.cpp similarity index 100% rename from scumm/resource_v7he.cpp rename to engines/scumm/resource_v7he.cpp diff --git a/scumm/resource_v7he.h b/engines/scumm/resource_v7he.h similarity index 100% rename from scumm/resource_v7he.h rename to engines/scumm/resource_v7he.h diff --git a/scumm/room.cpp b/engines/scumm/room.cpp similarity index 100% rename from scumm/room.cpp rename to engines/scumm/room.cpp diff --git a/scumm/saveload.cpp b/engines/scumm/saveload.cpp similarity index 100% rename from scumm/saveload.cpp rename to engines/scumm/saveload.cpp diff --git a/scumm/saveload.h b/engines/scumm/saveload.h similarity index 100% rename from scumm/saveload.h rename to engines/scumm/saveload.h diff --git a/scumm/script.cpp b/engines/scumm/script.cpp similarity index 100% rename from scumm/script.cpp rename to engines/scumm/script.cpp diff --git a/scumm/script.h b/engines/scumm/script.h similarity index 100% rename from scumm/script.h rename to engines/scumm/script.h diff --git a/scumm/script_c64.cpp b/engines/scumm/script_c64.cpp similarity index 100% rename from scumm/script_c64.cpp rename to engines/scumm/script_c64.cpp diff --git a/scumm/script_v100he.cpp b/engines/scumm/script_v100he.cpp similarity index 100% rename from scumm/script_v100he.cpp rename to engines/scumm/script_v100he.cpp diff --git a/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp similarity index 100% rename from scumm/script_v2.cpp rename to engines/scumm/script_v2.cpp diff --git a/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp similarity index 100% rename from scumm/script_v5.cpp rename to engines/scumm/script_v5.cpp diff --git a/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp similarity index 100% rename from scumm/script_v6.cpp rename to engines/scumm/script_v6.cpp diff --git a/scumm/script_v6he.cpp b/engines/scumm/script_v6he.cpp similarity index 100% rename from scumm/script_v6he.cpp rename to engines/scumm/script_v6he.cpp diff --git a/scumm/script_v72he.cpp b/engines/scumm/script_v72he.cpp similarity index 100% rename from scumm/script_v72he.cpp rename to engines/scumm/script_v72he.cpp diff --git a/scumm/script_v7he.cpp b/engines/scumm/script_v7he.cpp similarity index 100% rename from scumm/script_v7he.cpp rename to engines/scumm/script_v7he.cpp diff --git a/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp similarity index 100% rename from scumm/script_v8.cpp rename to engines/scumm/script_v8.cpp diff --git a/scumm/script_v80he.cpp b/engines/scumm/script_v80he.cpp similarity index 100% rename from scumm/script_v80he.cpp rename to engines/scumm/script_v80he.cpp diff --git a/scumm/script_v90he.cpp b/engines/scumm/script_v90he.cpp similarity index 100% rename from scumm/script_v90he.cpp rename to engines/scumm/script_v90he.cpp diff --git a/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h similarity index 100% rename from scumm/scumm-md5.h rename to engines/scumm/scumm-md5.h diff --git a/scumm/scumm.cpp b/engines/scumm/scumm.cpp similarity index 100% rename from scumm/scumm.cpp rename to engines/scumm/scumm.cpp diff --git a/scumm/scumm.h b/engines/scumm/scumm.h similarity index 100% rename from scumm/scumm.h rename to engines/scumm/scumm.h diff --git a/scumm/smush/channel.h b/engines/scumm/smush/channel.h similarity index 100% rename from scumm/smush/channel.h rename to engines/scumm/smush/channel.h diff --git a/scumm/smush/chunk.cpp b/engines/scumm/smush/chunk.cpp similarity index 100% rename from scumm/smush/chunk.cpp rename to engines/scumm/smush/chunk.cpp diff --git a/scumm/smush/chunk.h b/engines/scumm/smush/chunk.h similarity index 100% rename from scumm/smush/chunk.h rename to engines/scumm/smush/chunk.h diff --git a/scumm/smush/chunk_type.h b/engines/scumm/smush/chunk_type.h similarity index 100% rename from scumm/smush/chunk_type.h rename to engines/scumm/smush/chunk_type.h diff --git a/scumm/smush/codec1.cpp b/engines/scumm/smush/codec1.cpp similarity index 100% rename from scumm/smush/codec1.cpp rename to engines/scumm/smush/codec1.cpp diff --git a/scumm/smush/codec37.cpp b/engines/scumm/smush/codec37.cpp similarity index 100% rename from scumm/smush/codec37.cpp rename to engines/scumm/smush/codec37.cpp diff --git a/scumm/smush/codec37.h b/engines/scumm/smush/codec37.h similarity index 100% rename from scumm/smush/codec37.h rename to engines/scumm/smush/codec37.h diff --git a/scumm/smush/codec47.cpp b/engines/scumm/smush/codec47.cpp similarity index 100% rename from scumm/smush/codec47.cpp rename to engines/scumm/smush/codec47.cpp diff --git a/scumm/smush/codec47.h b/engines/scumm/smush/codec47.h similarity index 100% rename from scumm/smush/codec47.h rename to engines/scumm/smush/codec47.h diff --git a/scumm/smush/imuse_channel.cpp b/engines/scumm/smush/imuse_channel.cpp similarity index 100% rename from scumm/smush/imuse_channel.cpp rename to engines/scumm/smush/imuse_channel.cpp diff --git a/scumm/smush/saud_channel.cpp b/engines/scumm/smush/saud_channel.cpp similarity index 100% rename from scumm/smush/saud_channel.cpp rename to engines/scumm/smush/saud_channel.cpp diff --git a/scumm/smush/smush_font.cpp b/engines/scumm/smush/smush_font.cpp similarity index 100% rename from scumm/smush/smush_font.cpp rename to engines/scumm/smush/smush_font.cpp diff --git a/scumm/smush/smush_font.h b/engines/scumm/smush/smush_font.h similarity index 100% rename from scumm/smush/smush_font.h rename to engines/scumm/smush/smush_font.h diff --git a/scumm/smush/smush_mixer.cpp b/engines/scumm/smush/smush_mixer.cpp similarity index 100% rename from scumm/smush/smush_mixer.cpp rename to engines/scumm/smush/smush_mixer.cpp diff --git a/scumm/smush/smush_mixer.h b/engines/scumm/smush/smush_mixer.h similarity index 100% rename from scumm/smush/smush_mixer.h rename to engines/scumm/smush/smush_mixer.h diff --git a/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp similarity index 100% rename from scumm/smush/smush_player.cpp rename to engines/scumm/smush/smush_player.cpp diff --git a/scumm/smush/smush_player.h b/engines/scumm/smush/smush_player.h similarity index 100% rename from scumm/smush/smush_player.h rename to engines/scumm/smush/smush_player.h diff --git a/scumm/sound.cpp b/engines/scumm/sound.cpp similarity index 100% rename from scumm/sound.cpp rename to engines/scumm/sound.cpp diff --git a/scumm/sound.h b/engines/scumm/sound.h similarity index 100% rename from scumm/sound.h rename to engines/scumm/sound.h diff --git a/scumm/sound_he.cpp b/engines/scumm/sound_he.cpp similarity index 100% rename from scumm/sound_he.cpp rename to engines/scumm/sound_he.cpp diff --git a/scumm/sprite_he.cpp b/engines/scumm/sprite_he.cpp similarity index 100% rename from scumm/sprite_he.cpp rename to engines/scumm/sprite_he.cpp diff --git a/scumm/sprite_he.h b/engines/scumm/sprite_he.h similarity index 100% rename from scumm/sprite_he.h rename to engines/scumm/sprite_he.h diff --git a/scumm/string.cpp b/engines/scumm/string.cpp similarity index 100% rename from scumm/string.cpp rename to engines/scumm/string.cpp diff --git a/scumm/thumbnail.cpp b/engines/scumm/thumbnail.cpp similarity index 100% rename from scumm/thumbnail.cpp rename to engines/scumm/thumbnail.cpp diff --git a/scumm/usage_bits.cpp b/engines/scumm/usage_bits.cpp similarity index 100% rename from scumm/usage_bits.cpp rename to engines/scumm/usage_bits.cpp diff --git a/scumm/usage_bits.h b/engines/scumm/usage_bits.h similarity index 100% rename from scumm/usage_bits.h rename to engines/scumm/usage_bits.h diff --git a/scumm/util.cpp b/engines/scumm/util.cpp similarity index 100% rename from scumm/util.cpp rename to engines/scumm/util.cpp diff --git a/scumm/util.h b/engines/scumm/util.h similarity index 100% rename from scumm/util.h rename to engines/scumm/util.h diff --git a/scumm/vars.cpp b/engines/scumm/vars.cpp similarity index 100% rename from scumm/vars.cpp rename to engines/scumm/vars.cpp diff --git a/scumm/verbs.cpp b/engines/scumm/verbs.cpp similarity index 100% rename from scumm/verbs.cpp rename to engines/scumm/verbs.cpp diff --git a/scumm/verbs.h b/engines/scumm/verbs.h similarity index 100% rename from scumm/verbs.h rename to engines/scumm/verbs.h diff --git a/scumm/wiz_he.cpp b/engines/scumm/wiz_he.cpp similarity index 100% rename from scumm/wiz_he.cpp rename to engines/scumm/wiz_he.cpp diff --git a/scumm/wiz_he.h b/engines/scumm/wiz_he.h similarity index 100% rename from scumm/wiz_he.h rename to engines/scumm/wiz_he.h diff --git a/simon/charset.cpp b/engines/simon/charset.cpp similarity index 100% rename from simon/charset.cpp rename to engines/simon/charset.cpp diff --git a/simon/cursor.cpp b/engines/simon/cursor.cpp similarity index 100% rename from simon/cursor.cpp rename to engines/simon/cursor.cpp diff --git a/simon/debug.cpp b/engines/simon/debug.cpp similarity index 100% rename from simon/debug.cpp rename to engines/simon/debug.cpp diff --git a/simon/debug.h b/engines/simon/debug.h similarity index 100% rename from simon/debug.h rename to engines/simon/debug.h diff --git a/simon/debugger.cpp b/engines/simon/debugger.cpp similarity index 100% rename from simon/debugger.cpp rename to engines/simon/debugger.cpp diff --git a/simon/debugger.h b/engines/simon/debugger.h similarity index 100% rename from simon/debugger.h rename to engines/simon/debugger.h diff --git a/simon/game.cpp b/engines/simon/game.cpp similarity index 100% rename from simon/game.cpp rename to engines/simon/game.cpp diff --git a/simon/icons.cpp b/engines/simon/icons.cpp similarity index 100% rename from simon/icons.cpp rename to engines/simon/icons.cpp diff --git a/simon/intern.h b/engines/simon/intern.h similarity index 100% rename from simon/intern.h rename to engines/simon/intern.h diff --git a/simon/items.cpp b/engines/simon/items.cpp similarity index 100% rename from simon/items.cpp rename to engines/simon/items.cpp diff --git a/simon/midi.cpp b/engines/simon/midi.cpp similarity index 100% rename from simon/midi.cpp rename to engines/simon/midi.cpp diff --git a/simon/midi.h b/engines/simon/midi.h similarity index 100% rename from simon/midi.h rename to engines/simon/midi.h diff --git a/simon/midiparser_s1d.cpp b/engines/simon/midiparser_s1d.cpp similarity index 100% rename from simon/midiparser_s1d.cpp rename to engines/simon/midiparser_s1d.cpp diff --git a/engines/simon/module.mk b/engines/simon/module.mk new file mode 100644 index 00000000000..3323f3a0dee --- /dev/null +++ b/engines/simon/module.mk @@ -0,0 +1,29 @@ +MODULE := engines/simon + +MODULE_OBJS := \ + 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 += \ + engines/simon + +# This module can be built as a plugin +ifdef BUILD_PLUGINS +PLUGIN := 1 +endif + +# Include common rules +include $(srcdir)/common.rules diff --git a/simon/res.cpp b/engines/simon/res.cpp similarity index 100% rename from simon/res.cpp rename to engines/simon/res.cpp diff --git a/simon/saveload.cpp b/engines/simon/saveload.cpp similarity index 100% rename from simon/saveload.cpp rename to engines/simon/saveload.cpp diff --git a/simon/simon.cpp b/engines/simon/simon.cpp similarity index 100% rename from simon/simon.cpp rename to engines/simon/simon.cpp diff --git a/simon/simon.h b/engines/simon/simon.h similarity index 100% rename from simon/simon.h rename to engines/simon/simon.h diff --git a/simon/sound.cpp b/engines/simon/sound.cpp similarity index 100% rename from simon/sound.cpp rename to engines/simon/sound.cpp diff --git a/simon/sound.h b/engines/simon/sound.h similarity index 100% rename from simon/sound.h rename to engines/simon/sound.h diff --git a/simon/verb.cpp b/engines/simon/verb.cpp similarity index 100% rename from simon/verb.cpp rename to engines/simon/verb.cpp diff --git a/simon/vga.cpp b/engines/simon/vga.cpp similarity index 100% rename from simon/vga.cpp rename to engines/simon/vga.cpp diff --git a/simon/vga.h b/engines/simon/vga.h similarity index 100% rename from simon/vga.h rename to engines/simon/vga.h diff --git a/sky/autoroute.cpp b/engines/sky/autoroute.cpp similarity index 100% rename from sky/autoroute.cpp rename to engines/sky/autoroute.cpp diff --git a/sky/autoroute.h b/engines/sky/autoroute.h similarity index 100% rename from sky/autoroute.h rename to engines/sky/autoroute.h diff --git a/sky/compact.cpp b/engines/sky/compact.cpp similarity index 100% rename from sky/compact.cpp rename to engines/sky/compact.cpp diff --git a/sky/compact.h b/engines/sky/compact.h similarity index 100% rename from sky/compact.h rename to engines/sky/compact.h diff --git a/sky/control.cpp b/engines/sky/control.cpp similarity index 100% rename from sky/control.cpp rename to engines/sky/control.cpp diff --git a/sky/control.h b/engines/sky/control.h similarity index 100% rename from sky/control.h rename to engines/sky/control.h diff --git a/sky/debug.cpp b/engines/sky/debug.cpp similarity index 100% rename from sky/debug.cpp rename to engines/sky/debug.cpp diff --git a/sky/debug.h b/engines/sky/debug.h similarity index 100% rename from sky/debug.h rename to engines/sky/debug.h diff --git a/sky/disk.cpp b/engines/sky/disk.cpp similarity index 100% rename from sky/disk.cpp rename to engines/sky/disk.cpp diff --git a/sky/disk.h b/engines/sky/disk.h similarity index 100% rename from sky/disk.h rename to engines/sky/disk.h diff --git a/sky/grid.cpp b/engines/sky/grid.cpp similarity index 100% rename from sky/grid.cpp rename to engines/sky/grid.cpp diff --git a/sky/grid.h b/engines/sky/grid.h similarity index 100% rename from sky/grid.h rename to engines/sky/grid.h diff --git a/sky/hufftext.cpp b/engines/sky/hufftext.cpp similarity index 100% rename from sky/hufftext.cpp rename to engines/sky/hufftext.cpp diff --git a/sky/intro.cpp b/engines/sky/intro.cpp similarity index 100% rename from sky/intro.cpp rename to engines/sky/intro.cpp diff --git a/sky/intro.h b/engines/sky/intro.h similarity index 100% rename from sky/intro.h rename to engines/sky/intro.h diff --git a/sky/logic.cpp b/engines/sky/logic.cpp similarity index 100% rename from sky/logic.cpp rename to engines/sky/logic.cpp diff --git a/sky/logic.h b/engines/sky/logic.h similarity index 100% rename from sky/logic.h rename to engines/sky/logic.h diff --git a/engines/sky/module.mk b/engines/sky/module.mk new file mode 100644 index 00000000000..875cf65e47d --- /dev/null +++ b/engines/sky/module.mk @@ -0,0 +1,37 @@ +MODULE := engines/sky + +MODULE_OBJS := \ + 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 += \ + engines/sky \ + engines/sky/music \ + engines/sky/compacts + +# This module can be built as a plugin +ifdef BUILD_PLUGINS +PLUGIN := 1 +endif + +# Include common rules +include $(srcdir)/common.rules diff --git a/sky/mouse.cpp b/engines/sky/mouse.cpp similarity index 100% rename from sky/mouse.cpp rename to engines/sky/mouse.cpp diff --git a/sky/mouse.h b/engines/sky/mouse.h similarity index 100% rename from sky/mouse.h rename to engines/sky/mouse.h diff --git a/sky/music/adlibchannel.cpp b/engines/sky/music/adlibchannel.cpp similarity index 100% rename from sky/music/adlibchannel.cpp rename to engines/sky/music/adlibchannel.cpp diff --git a/sky/music/adlibchannel.h b/engines/sky/music/adlibchannel.h similarity index 100% rename from sky/music/adlibchannel.h rename to engines/sky/music/adlibchannel.h diff --git a/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp similarity index 100% rename from sky/music/adlibmusic.cpp rename to engines/sky/music/adlibmusic.cpp diff --git a/sky/music/adlibmusic.h b/engines/sky/music/adlibmusic.h similarity index 100% rename from sky/music/adlibmusic.h rename to engines/sky/music/adlibmusic.h diff --git a/sky/music/gmchannel.cpp b/engines/sky/music/gmchannel.cpp similarity index 100% rename from sky/music/gmchannel.cpp rename to engines/sky/music/gmchannel.cpp diff --git a/sky/music/gmchannel.h b/engines/sky/music/gmchannel.h similarity index 100% rename from sky/music/gmchannel.h rename to engines/sky/music/gmchannel.h diff --git a/sky/music/gmmusic.cpp b/engines/sky/music/gmmusic.cpp similarity index 100% rename from sky/music/gmmusic.cpp rename to engines/sky/music/gmmusic.cpp diff --git a/sky/music/gmmusic.h b/engines/sky/music/gmmusic.h similarity index 100% rename from sky/music/gmmusic.h rename to engines/sky/music/gmmusic.h diff --git a/sky/music/mt32music.cpp b/engines/sky/music/mt32music.cpp similarity index 100% rename from sky/music/mt32music.cpp rename to engines/sky/music/mt32music.cpp diff --git a/sky/music/mt32music.h b/engines/sky/music/mt32music.h similarity index 100% rename from sky/music/mt32music.h rename to engines/sky/music/mt32music.h diff --git a/sky/music/musicbase.cpp b/engines/sky/music/musicbase.cpp similarity index 100% rename from sky/music/musicbase.cpp rename to engines/sky/music/musicbase.cpp diff --git a/sky/music/musicbase.h b/engines/sky/music/musicbase.h similarity index 100% rename from sky/music/musicbase.h rename to engines/sky/music/musicbase.h diff --git a/sky/rnc_deco.cpp b/engines/sky/rnc_deco.cpp similarity index 100% rename from sky/rnc_deco.cpp rename to engines/sky/rnc_deco.cpp diff --git a/sky/rnc_deco.h b/engines/sky/rnc_deco.h similarity index 100% rename from sky/rnc_deco.h rename to engines/sky/rnc_deco.h diff --git a/sky/screen.cpp b/engines/sky/screen.cpp similarity index 100% rename from sky/screen.cpp rename to engines/sky/screen.cpp diff --git a/sky/screen.h b/engines/sky/screen.h similarity index 100% rename from sky/screen.h rename to engines/sky/screen.h diff --git a/sky/sky.cpp b/engines/sky/sky.cpp similarity index 100% rename from sky/sky.cpp rename to engines/sky/sky.cpp diff --git a/sky/sky.h b/engines/sky/sky.h similarity index 100% rename from sky/sky.h rename to engines/sky/sky.h diff --git a/sky/skydefs.h b/engines/sky/skydefs.h similarity index 100% rename from sky/skydefs.h rename to engines/sky/skydefs.h diff --git a/sky/sound.cpp b/engines/sky/sound.cpp similarity index 100% rename from sky/sound.cpp rename to engines/sky/sound.cpp diff --git a/sky/sound.h b/engines/sky/sound.h similarity index 100% rename from sky/sound.h rename to engines/sky/sound.h diff --git a/sky/struc.h b/engines/sky/struc.h similarity index 100% rename from sky/struc.h rename to engines/sky/struc.h diff --git a/sky/text.cpp b/engines/sky/text.cpp similarity index 100% rename from sky/text.cpp rename to engines/sky/text.cpp diff --git a/sky/text.h b/engines/sky/text.h similarity index 100% rename from sky/text.h rename to engines/sky/text.h diff --git a/sword1/animation.cpp b/engines/sword1/animation.cpp similarity index 100% rename from sword1/animation.cpp rename to engines/sword1/animation.cpp diff --git a/sword1/animation.h b/engines/sword1/animation.h similarity index 100% rename from sword1/animation.h rename to engines/sword1/animation.h diff --git a/sword1/collision.h b/engines/sword1/collision.h similarity index 100% rename from sword1/collision.h rename to engines/sword1/collision.h diff --git a/sword1/control.cpp b/engines/sword1/control.cpp similarity index 100% rename from sword1/control.cpp rename to engines/sword1/control.cpp diff --git a/sword1/control.h b/engines/sword1/control.h similarity index 100% rename from sword1/control.h rename to engines/sword1/control.h diff --git a/sword1/credits.cpp b/engines/sword1/credits.cpp similarity index 100% rename from sword1/credits.cpp rename to engines/sword1/credits.cpp diff --git a/sword1/credits.h b/engines/sword1/credits.h similarity index 100% rename from sword1/credits.h rename to engines/sword1/credits.h diff --git a/sword1/debug.cpp b/engines/sword1/debug.cpp similarity index 100% rename from sword1/debug.cpp rename to engines/sword1/debug.cpp diff --git a/sword1/debug.h b/engines/sword1/debug.h similarity index 100% rename from sword1/debug.h rename to engines/sword1/debug.h diff --git a/sword1/eventman.cpp b/engines/sword1/eventman.cpp similarity index 100% rename from sword1/eventman.cpp rename to engines/sword1/eventman.cpp diff --git a/sword1/eventman.h b/engines/sword1/eventman.h similarity index 100% rename from sword1/eventman.h rename to engines/sword1/eventman.h diff --git a/sword1/logic.cpp b/engines/sword1/logic.cpp similarity index 100% rename from sword1/logic.cpp rename to engines/sword1/logic.cpp diff --git a/sword1/logic.h b/engines/sword1/logic.h similarity index 100% rename from sword1/logic.h rename to engines/sword1/logic.h diff --git a/sword1/memman.cpp b/engines/sword1/memman.cpp similarity index 100% rename from sword1/memman.cpp rename to engines/sword1/memman.cpp diff --git a/sword1/memman.h b/engines/sword1/memman.h similarity index 100% rename from sword1/memman.h rename to engines/sword1/memman.h diff --git a/sword1/menu.cpp b/engines/sword1/menu.cpp similarity index 100% rename from sword1/menu.cpp rename to engines/sword1/menu.cpp diff --git a/sword1/menu.h b/engines/sword1/menu.h similarity index 100% rename from sword1/menu.h rename to engines/sword1/menu.h diff --git a/engines/sword1/module.mk b/engines/sword1/module.mk new file mode 100644 index 00000000000..9f4b3f2c3a7 --- /dev/null +++ b/engines/sword1/module.mk @@ -0,0 +1,32 @@ +MODULE := engines/sword1 + +MODULE_OBJS := \ + 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 += \ + engines/sword1 + +# This module can be built as a plugin +ifdef BUILD_PLUGINS +PLUGIN := 1 +endif + +# Include common rules +include $(srcdir)/common.rules diff --git a/sword1/mouse.cpp b/engines/sword1/mouse.cpp similarity index 100% rename from sword1/mouse.cpp rename to engines/sword1/mouse.cpp diff --git a/sword1/mouse.h b/engines/sword1/mouse.h similarity index 100% rename from sword1/mouse.h rename to engines/sword1/mouse.h diff --git a/sword1/music.cpp b/engines/sword1/music.cpp similarity index 100% rename from sword1/music.cpp rename to engines/sword1/music.cpp diff --git a/sword1/music.h b/engines/sword1/music.h similarity index 100% rename from sword1/music.h rename to engines/sword1/music.h diff --git a/sword1/object.h b/engines/sword1/object.h similarity index 100% rename from sword1/object.h rename to engines/sword1/object.h diff --git a/sword1/objectman.cpp b/engines/sword1/objectman.cpp similarity index 100% rename from sword1/objectman.cpp rename to engines/sword1/objectman.cpp diff --git a/sword1/objectman.h b/engines/sword1/objectman.h similarity index 100% rename from sword1/objectman.h rename to engines/sword1/objectman.h diff --git a/sword1/resman.cpp b/engines/sword1/resman.cpp similarity index 100% rename from sword1/resman.cpp rename to engines/sword1/resman.cpp diff --git a/sword1/resman.h b/engines/sword1/resman.h similarity index 100% rename from sword1/resman.h rename to engines/sword1/resman.h diff --git a/sword1/router.cpp b/engines/sword1/router.cpp similarity index 100% rename from sword1/router.cpp rename to engines/sword1/router.cpp diff --git a/sword1/router.h b/engines/sword1/router.h similarity index 100% rename from sword1/router.h rename to engines/sword1/router.h diff --git a/sword1/screen.cpp b/engines/sword1/screen.cpp similarity index 100% rename from sword1/screen.cpp rename to engines/sword1/screen.cpp diff --git a/sword1/screen.h b/engines/sword1/screen.h similarity index 100% rename from sword1/screen.h rename to engines/sword1/screen.h diff --git a/sword1/sound.cpp b/engines/sword1/sound.cpp similarity index 100% rename from sword1/sound.cpp rename to engines/sword1/sound.cpp diff --git a/sword1/sound.h b/engines/sword1/sound.h similarity index 100% rename from sword1/sound.h rename to engines/sword1/sound.h diff --git a/sword1/staticres.cpp b/engines/sword1/staticres.cpp similarity index 100% rename from sword1/staticres.cpp rename to engines/sword1/staticres.cpp diff --git a/sword1/sword1.cpp b/engines/sword1/sword1.cpp similarity index 100% rename from sword1/sword1.cpp rename to engines/sword1/sword1.cpp diff --git a/sword1/sword1.h b/engines/sword1/sword1.h similarity index 100% rename from sword1/sword1.h rename to engines/sword1/sword1.h diff --git a/sword1/sworddefs.h b/engines/sword1/sworddefs.h similarity index 100% rename from sword1/sworddefs.h rename to engines/sword1/sworddefs.h diff --git a/sword1/swordres.h b/engines/sword1/swordres.h similarity index 100% rename from sword1/swordres.h rename to engines/sword1/swordres.h diff --git a/sword1/text.cpp b/engines/sword1/text.cpp similarity index 100% rename from sword1/text.cpp rename to engines/sword1/text.cpp diff --git a/sword1/text.h b/engines/sword1/text.h similarity index 100% rename from sword1/text.h rename to engines/sword1/text.h diff --git a/sword2/_mouse.cpp b/engines/sword2/_mouse.cpp similarity index 100% rename from sword2/_mouse.cpp rename to engines/sword2/_mouse.cpp diff --git a/sword2/animation.cpp b/engines/sword2/animation.cpp similarity index 100% rename from sword2/animation.cpp rename to engines/sword2/animation.cpp diff --git a/sword2/animation.h b/engines/sword2/animation.h similarity index 100% rename from sword2/animation.h rename to engines/sword2/animation.h diff --git a/sword2/anims.cpp b/engines/sword2/anims.cpp similarity index 100% rename from sword2/anims.cpp rename to engines/sword2/anims.cpp diff --git a/sword2/build_display.cpp b/engines/sword2/build_display.cpp similarity index 100% rename from sword2/build_display.cpp rename to engines/sword2/build_display.cpp diff --git a/sword2/build_display.h b/engines/sword2/build_display.h similarity index 100% rename from sword2/build_display.h rename to engines/sword2/build_display.h diff --git a/sword2/console.cpp b/engines/sword2/console.cpp similarity index 100% rename from sword2/console.cpp rename to engines/sword2/console.cpp diff --git a/sword2/console.h b/engines/sword2/console.h similarity index 100% rename from sword2/console.h rename to engines/sword2/console.h diff --git a/sword2/controls.cpp b/engines/sword2/controls.cpp similarity index 100% rename from sword2/controls.cpp rename to engines/sword2/controls.cpp diff --git a/sword2/controls.h b/engines/sword2/controls.h similarity index 100% rename from sword2/controls.h rename to engines/sword2/controls.h diff --git a/sword2/d_draw.cpp b/engines/sword2/d_draw.cpp similarity index 100% rename from sword2/d_draw.cpp rename to engines/sword2/d_draw.cpp diff --git a/sword2/debug.cpp b/engines/sword2/debug.cpp similarity index 100% rename from sword2/debug.cpp rename to engines/sword2/debug.cpp diff --git a/sword2/debug.h b/engines/sword2/debug.h similarity index 100% rename from sword2/debug.h rename to engines/sword2/debug.h diff --git a/sword2/defs.h b/engines/sword2/defs.h similarity index 100% rename from sword2/defs.h rename to engines/sword2/defs.h diff --git a/sword2/events.cpp b/engines/sword2/events.cpp similarity index 100% rename from sword2/events.cpp rename to engines/sword2/events.cpp diff --git a/sword2/function.cpp b/engines/sword2/function.cpp similarity index 100% rename from sword2/function.cpp rename to engines/sword2/function.cpp diff --git a/sword2/header.h b/engines/sword2/header.h similarity index 100% rename from sword2/header.h rename to engines/sword2/header.h diff --git a/sword2/icons.cpp b/engines/sword2/icons.cpp similarity index 100% rename from sword2/icons.cpp rename to engines/sword2/icons.cpp diff --git a/sword2/icons.h b/engines/sword2/icons.h similarity index 100% rename from sword2/icons.h rename to engines/sword2/icons.h diff --git a/sword2/interpreter.cpp b/engines/sword2/interpreter.cpp similarity index 100% rename from sword2/interpreter.cpp rename to engines/sword2/interpreter.cpp diff --git a/sword2/interpreter.h b/engines/sword2/interpreter.h similarity index 100% rename from sword2/interpreter.h rename to engines/sword2/interpreter.h diff --git a/sword2/layers.cpp b/engines/sword2/layers.cpp similarity index 100% rename from sword2/layers.cpp rename to engines/sword2/layers.cpp diff --git a/sword2/layers.h b/engines/sword2/layers.h similarity index 100% rename from sword2/layers.h rename to engines/sword2/layers.h diff --git a/sword2/logic.cpp b/engines/sword2/logic.cpp similarity index 100% rename from sword2/logic.cpp rename to engines/sword2/logic.cpp diff --git a/sword2/logic.h b/engines/sword2/logic.h similarity index 100% rename from sword2/logic.h rename to engines/sword2/logic.h diff --git a/sword2/maketext.cpp b/engines/sword2/maketext.cpp similarity index 100% rename from sword2/maketext.cpp rename to engines/sword2/maketext.cpp diff --git a/sword2/maketext.h b/engines/sword2/maketext.h similarity index 100% rename from sword2/maketext.h rename to engines/sword2/maketext.h diff --git a/sword2/memory.cpp b/engines/sword2/memory.cpp similarity index 100% rename from sword2/memory.cpp rename to engines/sword2/memory.cpp diff --git a/sword2/memory.h b/engines/sword2/memory.h similarity index 100% rename from sword2/memory.h rename to engines/sword2/memory.h diff --git a/sword2/menu.cpp b/engines/sword2/menu.cpp similarity index 100% rename from sword2/menu.cpp rename to engines/sword2/menu.cpp diff --git a/engines/sword2/module.mk b/engines/sword2/module.mk new file mode 100644 index 00000000000..2ee3f39ebb0 --- /dev/null +++ b/engines/sword2/module.mk @@ -0,0 +1,48 @@ +MODULE := engines/sword2 + +MODULE_OBJS := \ + 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 += \ + engines/sword2 + +# This module can be built as a plugin +ifdef BUILD_PLUGINS +PLUGIN := 1 +endif + +# Include common rules +include $(srcdir)/common.rules diff --git a/sword2/mouse.cpp b/engines/sword2/mouse.cpp similarity index 100% rename from sword2/mouse.cpp rename to engines/sword2/mouse.cpp diff --git a/sword2/mouse.h b/engines/sword2/mouse.h similarity index 100% rename from sword2/mouse.h rename to engines/sword2/mouse.h diff --git a/sword2/music.cpp b/engines/sword2/music.cpp similarity index 100% rename from sword2/music.cpp rename to engines/sword2/music.cpp diff --git a/sword2/object.h b/engines/sword2/object.h similarity index 100% rename from sword2/object.h rename to engines/sword2/object.h diff --git a/sword2/palette.cpp b/engines/sword2/palette.cpp similarity index 100% rename from sword2/palette.cpp rename to engines/sword2/palette.cpp diff --git a/sword2/protocol.cpp b/engines/sword2/protocol.cpp similarity index 100% rename from sword2/protocol.cpp rename to engines/sword2/protocol.cpp diff --git a/sword2/rdwin.cpp b/engines/sword2/rdwin.cpp similarity index 100% rename from sword2/rdwin.cpp rename to engines/sword2/rdwin.cpp diff --git a/sword2/render.cpp b/engines/sword2/render.cpp similarity index 100% rename from sword2/render.cpp rename to engines/sword2/render.cpp diff --git a/sword2/resman.cpp b/engines/sword2/resman.cpp similarity index 100% rename from sword2/resman.cpp rename to engines/sword2/resman.cpp diff --git a/sword2/resman.h b/engines/sword2/resman.h similarity index 100% rename from sword2/resman.h rename to engines/sword2/resman.h diff --git a/sword2/router.cpp b/engines/sword2/router.cpp similarity index 100% rename from sword2/router.cpp rename to engines/sword2/router.cpp diff --git a/sword2/router.h b/engines/sword2/router.h similarity index 100% rename from sword2/router.h rename to engines/sword2/router.h diff --git a/sword2/save_rest.cpp b/engines/sword2/save_rest.cpp similarity index 100% rename from sword2/save_rest.cpp rename to engines/sword2/save_rest.cpp diff --git a/sword2/save_rest.h b/engines/sword2/save_rest.h similarity index 100% rename from sword2/save_rest.h rename to engines/sword2/save_rest.h diff --git a/sword2/scroll.cpp b/engines/sword2/scroll.cpp similarity index 100% rename from sword2/scroll.cpp rename to engines/sword2/scroll.cpp diff --git a/sword2/sound.cpp b/engines/sword2/sound.cpp similarity index 100% rename from sword2/sound.cpp rename to engines/sword2/sound.cpp diff --git a/sword2/sound.h b/engines/sword2/sound.h similarity index 100% rename from sword2/sound.h rename to engines/sword2/sound.h diff --git a/sword2/speech.cpp b/engines/sword2/speech.cpp similarity index 100% rename from sword2/speech.cpp rename to engines/sword2/speech.cpp diff --git a/sword2/sprite.cpp b/engines/sword2/sprite.cpp similarity index 100% rename from sword2/sprite.cpp rename to engines/sword2/sprite.cpp diff --git a/sword2/startup.cpp b/engines/sword2/startup.cpp similarity index 100% rename from sword2/startup.cpp rename to engines/sword2/startup.cpp diff --git a/sword2/sword2.cpp b/engines/sword2/sword2.cpp similarity index 100% rename from sword2/sword2.cpp rename to engines/sword2/sword2.cpp diff --git a/sword2/sword2.h b/engines/sword2/sword2.h similarity index 100% rename from sword2/sword2.h rename to engines/sword2/sword2.h diff --git a/sword2/sync.cpp b/engines/sword2/sync.cpp similarity index 100% rename from sword2/sync.cpp rename to engines/sword2/sync.cpp diff --git a/sword2/walker.cpp b/engines/sword2/walker.cpp similarity index 100% rename from sword2/walker.cpp rename to engines/sword2/walker.cpp diff --git a/gob/module.mk b/gob/module.mk deleted file mode 100644 index 914931d7753..00000000000 --- a/gob/module.mk +++ /dev/null @@ -1,40 +0,0 @@ -MODULE := 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 - -MODULE_DIRS += \ - gob - -# This module can be built as a plugin -ifdef BUILD_PLUGINS -PLUGIN := 1 -endif - -# Include common rules -include $(srcdir)/common.rules diff --git a/kyra/module.mk b/kyra/module.mk deleted file mode 100644 index 6d0a2f02e57..00000000000 --- a/kyra/module.mk +++ /dev/null @@ -1,33 +0,0 @@ -MODULE := 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 - -MODULE_DIRS += \ - kyra - -# This module can be built as a plugin -ifdef BUILD_PLUGINS -PLUGIN := 1 -endif - -# Include common rules -include $(srcdir)/common.rules diff --git a/lure/module.mk b/lure/module.mk deleted file mode 100644 index da1025ee6a9..00000000000 --- a/lure/module.mk +++ /dev/null @@ -1,36 +0,0 @@ -MODULE := 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 - -MODULE_DIRS += \ - lure - -# This module can be built as a plugin -ifdef BUILD_PLUGINS -PLUGIN := 1 -endif - -# Include common rules -include $(srcdir)/common.rules - diff --git a/queen/module.mk b/queen/module.mk deleted file mode 100644 index 62ee481d5e2..00000000000 --- a/queen/module.mk +++ /dev/null @@ -1,34 +0,0 @@ -MODULE := 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 - -MODULE_DIRS += \ - queen - -# This module can be built as a plugin -ifdef BUILD_PLUGINS -PLUGIN := 1 -endif - -# Include common rules -include $(srcdir)/common.rules diff --git a/saga/module.mk b/saga/module.mk deleted file mode 100644 index 0f648fea48e..00000000000 --- a/saga/module.mk +++ /dev/null @@ -1,44 +0,0 @@ -MODULE := 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 - -MODULE_DIRS += \ - saga - -# This module can be built as a plugin -ifdef BUILD_PLUGINS -PLUGIN := 1 -endif - -# Include common rules -include $(srcdir)/common.rules diff --git a/scumm/module.mk b/scumm/module.mk deleted file mode 100644 index 547a64e1747..00000000000 --- a/scumm/module.mk +++ /dev/null @@ -1,110 +0,0 @@ -MODULE := 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 - -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 -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 -endif - -MODULE_DIRS += \ - scumm \ - scumm/imuse_digi \ - scumm/insane \ - scumm/smush - -# This module can be built as a plugin -ifdef BUILD_PLUGINS -PLUGIN := 1 -# HACK HACK evil HACK HACK -PLUGIN_LDFLAGS += -lz -endif - -# Include common rules -include $(srcdir)/common.rules diff --git a/simon/module.mk b/simon/module.mk deleted file mode 100644 index d2f860fb7fb..00000000000 --- a/simon/module.mk +++ /dev/null @@ -1,29 +0,0 @@ -MODULE := 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 \ - -MODULE_DIRS += \ - simon - -# This module can be built as a plugin -ifdef BUILD_PLUGINS -PLUGIN := 1 -endif - -# Include common rules -include $(srcdir)/common.rules diff --git a/sky/module.mk b/sky/module.mk deleted file mode 100644 index 45582927bc8..00000000000 --- a/sky/module.mk +++ /dev/null @@ -1,37 +0,0 @@ -MODULE := 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 - -MODULE_DIRS += \ - sky \ - sky/music \ - sky/compacts - -# This module can be built as a plugin -ifdef BUILD_PLUGINS -PLUGIN := 1 -endif - -# Include common rules -include $(srcdir)/common.rules diff --git a/sword1/module.mk b/sword1/module.mk deleted file mode 100644 index 77f1b0bb9d4..00000000000 --- a/sword1/module.mk +++ /dev/null @@ -1,32 +0,0 @@ -MODULE := 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 - -MODULE_DIRS += \ - sword1 - -# This module can be built as a plugin -ifdef BUILD_PLUGINS -PLUGIN := 1 -endif - -# Include common rules -include $(srcdir)/common.rules diff --git a/sword2/module.mk b/sword2/module.mk deleted file mode 100644 index fb020ba633d..00000000000 --- a/sword2/module.mk +++ /dev/null @@ -1,48 +0,0 @@ -MODULE := 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 - -MODULE_DIRS += \ - sword2 - -# This module can be built as a plugin -ifdef BUILD_PLUGINS -PLUGIN := 1 -endif - -# Include common rules -include $(srcdir)/common.rules