Updated Dev-C++ project files to reflect HE restructuring in scumm, along with simon and sword2 fileset changes.

svn-id: r20754

3 files changed, 168 insertions, 158 deletions

diff --git a/dists/devcpp/scumm.dev b/dists/devcpp/scumm.dev
index 8ffe1ae2c7..19fb4f5fdc 100644
--- a/dists/devcpp/scumm.dev
+++ b/dists/devcpp/scumm.dev
@@ -20,7 +20,7 @@ ObjectOutput=scumm
 OverrideOutput=0

 OverrideOutputName=scumm.a

 HostApplication=

-Folders=imuse_digi,insane,smush

+Folders=he,imuse_digi,insane,smush

 CommandLine=

 UseCustomMakefile=0

 CustomMakefile=

@@ -388,7 +388,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit35]

-FileName=..\..\engines\scumm\wiz_he.h

+FileName=..\..\engines\scumm\actor.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -398,7 +398,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit36]

-FileName=..\..\engines\scumm\actor.cpp

+FileName=..\..\engines\scumm\actor.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -408,7 +408,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit37]

-FileName=..\..\engines\scumm\actor.h

+FileName=..\..\engines\scumm\akos.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -418,7 +418,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit38]

-FileName=..\..\engines\scumm\akos.cpp

+FileName=..\..\engines\scumm\akos.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -428,7 +428,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit39]

-FileName=..\..\engines\scumm\akos.h

+FileName=..\..\engines\scumm\base-costume.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -438,7 +438,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit40]

-FileName=..\..\engines\scumm\base-costume.cpp

+FileName=..\..\engines\scumm\base-costume.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -448,7 +448,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit41]

-FileName=..\..\engines\scumm\base-costume.h

+FileName=..\..\engines\scumm\bomp.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -458,7 +458,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit42]

-FileName=..\..\engines\scumm\bomp.cpp

+FileName=..\..\engines\scumm\bomp.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -468,7 +468,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit43]

-FileName=..\..\engines\scumm\bomp.h

+FileName=..\..\engines\scumm\boxes.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -478,7 +478,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit44]

-FileName=..\..\engines\scumm\boxes.cpp

+FileName=..\..\engines\scumm\boxes.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -488,7 +488,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit45]

-FileName=..\..\engines\scumm\boxes.h

+FileName=..\..\engines\scumm\camera.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -498,7 +498,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit46]

-FileName=..\..\engines\scumm\camera.cpp

+FileName=..\..\engines\scumm\charset.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -508,7 +508,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit47]

-FileName=..\..\engines\scumm\charset.cpp

+FileName=..\..\engines\scumm\charset.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -518,7 +518,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit48]

-FileName=..\..\engines\scumm\charset.h

+FileName=..\..\engines\scumm\costume.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -528,7 +528,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit49]

-FileName=..\..\engines\scumm\costume.cpp

+FileName=..\..\engines\scumm\costume.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -538,7 +538,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit50]

-FileName=..\..\engines\scumm\costume.h

+FileName=..\..\engines\scumm\cursor.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -548,7 +548,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit51]

-FileName=..\..\engines\scumm\cursor.cpp

+FileName=..\..\engines\scumm\debugger.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -558,7 +558,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit52]

-FileName=..\..\engines\scumm\debugger.cpp

+FileName=..\..\engines\scumm\debugger.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -568,7 +568,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit53]

-FileName=..\..\engines\scumm\debugger.h

+FileName=..\..\engines\scumm\dialogs.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -578,7 +578,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit54]

-FileName=..\..\engines\scumm\dialogs.cpp

+FileName=..\..\engines\scumm\dialogs.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -588,7 +588,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit55]

-FileName=..\..\engines\scumm\dialogs.h

+FileName=..\..\engines\scumm\gfx.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -598,7 +598,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit56]

-FileName=..\..\engines\scumm\floodfill_he.cpp

+FileName=..\..\engines\scumm\gfx.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -608,7 +608,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit57]

-FileName=..\..\engines\scumm\floodfill_he.h

+FileName=..\..\engines\scumm\help.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -618,7 +618,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit58]

-FileName=..\..\engines\scumm\gfx.cpp

+FileName=..\..\engines\scumm\help.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -628,7 +628,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit59]

-FileName=..\..\engines\scumm\gfx.h

+FileName=..\..\engines\scumm\imuse.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -638,7 +638,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit60]

-FileName=..\..\engines\scumm\help.cpp

+FileName=..\..\engines\scumm\imuse.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -648,7 +648,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit61]

-FileName=..\..\engines\scumm\help.h

+FileName=..\..\engines\scumm\imuse_internal.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -658,7 +658,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit62]

-FileName=..\..\engines\scumm\imuse.cpp

+FileName=..\..\engines\scumm\imuse_player.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -668,7 +668,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit63]

-FileName=..\..\engines\scumm\imuse.h

+FileName=..\..\engines\scumm\input.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -678,7 +678,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit64]

-FileName=..\..\engines\scumm\imuse_internal.h

+FileName=..\..\engines\scumm\instrument.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -688,7 +688,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit65]

-FileName=..\..\engines\scumm\imuse_player.cpp

+FileName=..\..\engines\scumm\instrument.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -698,7 +698,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit66]

-FileName=..\..\engines\scumm\input.cpp

+FileName=..\..\engines\scumm\intern.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -708,7 +708,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit67]

-FileName=..\..\engines\scumm\instrument.cpp

+FileName=..\..\engines\scumm\midiparser_eup.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -718,7 +718,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit68]

-FileName=..\..\engines\scumm\instrument.h

+FileName=..\..\engines\scumm\midiparser_ro.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -728,7 +728,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit69]

-FileName=..\..\engines\scumm\intern.h

+FileName=..\..\engines\scumm\music.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -738,7 +738,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit70]

-FileName=..\..\engines\scumm\intern_he.h

+FileName=..\..\engines\scumm\nut_renderer.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -748,7 +748,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit71]

-FileName=..\..\engines\scumm\logic_he.cpp

+FileName=..\..\engines\scumm\nut_renderer.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -758,7 +758,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit72]

-FileName=..\..\engines\scumm\logic_he.h

+FileName=..\..\engines\scumm\object.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -768,7 +768,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit73]

-FileName=..\..\engines\scumm\midiparser_eup.cpp

+FileName=..\..\engines\scumm\object.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -778,7 +778,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit74]

-FileName=..\..\engines\scumm\midiparser_ro.cpp

+FileName=..\..\engines\scumm\palette.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -788,7 +788,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit75]

-FileName=..\..\engines\scumm\music.h

+FileName=..\..\engines\scumm\player_mod.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -798,7 +798,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit76]

-FileName=..\..\engines\scumm\nut_renderer.cpp

+FileName=..\..\engines\scumm\player_mod.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -808,7 +808,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit77]

-FileName=..\..\engines\scumm\nut_renderer.h

+FileName=..\..\engines\scumm\player_nes.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -818,7 +818,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit78]

-FileName=..\..\engines\scumm\object.cpp

+FileName=..\..\engines\scumm\player_nes.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -828,7 +828,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit79]

-FileName=..\..\engines\scumm\object.h

+FileName=..\..\engines\scumm\player_v1.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -838,7 +838,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit80]

-FileName=..\..\engines\scumm\palette.cpp

+FileName=..\..\engines\scumm\player_v1.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -848,7 +848,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit81]

-FileName=..\..\engines\scumm\palette_he.cpp

+FileName=..\..\engines\scumm\player_v2.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -858,7 +858,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit82]

-FileName=..\..\engines\scumm\player_mod.cpp

+FileName=..\..\engines\scumm\player_v2.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -868,7 +868,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit83]

-FileName=..\..\engines\scumm\player_mod.h

+FileName=..\..\engines\scumm\player_v2a.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -878,7 +878,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit84]

-FileName=..\..\engines\scumm\player_nes.cpp

+FileName=..\..\engines\scumm\player_v2a.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -888,7 +888,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit85]

-FileName=..\..\engines\scumm\player_nes.h

+FileName=..\..\engines\scumm\player_v3a.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -898,7 +898,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit86]

-FileName=..\..\engines\scumm\player_v1.cpp

+FileName=..\..\engines\scumm\player_v3a.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -908,7 +908,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit87]

-FileName=..\..\engines\scumm\player_v1.h

+FileName=..\..\engines\scumm\resource.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -918,7 +918,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit88]

-FileName=..\..\engines\scumm\player_v2.cpp

+FileName=..\..\engines\scumm\resource.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -928,7 +928,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit89]

-FileName=..\..\engines\scumm\player_v2.h

+FileName=..\..\engines\scumm\resource_v2.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -938,7 +938,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit90]

-FileName=..\..\engines\scumm\player_v2a.cpp

+FileName=..\..\engines\scumm\resource_v3.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -948,7 +948,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit91]

-FileName=..\..\engines\scumm\player_v2a.h

+FileName=..\..\engines\scumm\resource_v4.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -958,7 +958,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit92]

-FileName=..\..\engines\scumm\player_v3a.cpp

+FileName=..\..\engines\scumm\room.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -968,7 +968,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit93]

-FileName=..\..\engines\scumm\player_v3a.h

+FileName=..\..\engines\scumm\saveload.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -978,7 +978,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit94]

-FileName=..\..\engines\scumm\resource.cpp

+FileName=..\..\engines\scumm\saveload.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -988,7 +988,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit95]

-FileName=..\..\engines\scumm\resource.h

+FileName=..\..\engines\scumm\script.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -998,7 +998,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit96]

-FileName=..\..\engines\scumm\resource_v2.cpp

+FileName=..\..\engines\scumm\script.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1008,7 +1008,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit97]

-FileName=..\..\engines\scumm\resource_v3.cpp

+FileName=..\..\engines\scumm\script_c64.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1018,7 +1018,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit98]

-FileName=..\..\engines\scumm\resource_v4.cpp

+FileName=..\..\engines\scumm\script_v2.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1028,7 +1028,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit99]

-FileName=..\..\engines\scumm\resource_v7he.cpp

+FileName=..\..\engines\scumm\script_v5.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1038,7 +1038,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit100]

-FileName=..\..\engines\scumm\resource_v7he.h

+FileName=..\..\engines\scumm\script_v6.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1048,7 +1048,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit101]

-FileName=..\..\engines\scumm\room.cpp

+FileName=..\..\engines\scumm\script_v8.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1058,7 +1058,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit102]

-FileName=..\..\engines\scumm\saveload.cpp

+FileName=..\..\engines\scumm\scumm.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1068,7 +1068,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit103]

-FileName=..\..\engines\scumm\saveload.h

+FileName=..\..\engines\scumm\scumm.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1078,7 +1078,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit104]

-FileName=..\..\engines\scumm\script.cpp

+FileName=..\..\engines\scumm\scumm-md5.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1088,7 +1088,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit105]

-FileName=..\..\engines\scumm\script.h

+FileName=..\..\engines\scumm\sound.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1098,7 +1098,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit106]

-FileName=..\..\engines\scumm\script_c64.cpp

+FileName=..\..\engines\scumm\sound.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1108,7 +1108,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit107]

-FileName=..\..\engines\scumm\script_v2.cpp

+FileName=..\..\engines\scumm\string.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1118,7 +1118,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit108]

-FileName=..\..\engines\scumm\script_v5.cpp

+FileName=..\..\engines\scumm\thumbnail.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1128,7 +1128,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit109]

-FileName=..\..\engines\scumm\script_v6.cpp

+FileName=..\..\engines\scumm\usage_bits.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1138,7 +1138,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit110]

-FileName=..\..\engines\scumm\script_v6he.cpp

+FileName=..\..\engines\scumm\usage_bits.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1148,7 +1148,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit111]

-FileName=..\..\engines\scumm\script_v7he.cpp

+FileName=..\..\engines\scumm\util.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1158,7 +1158,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit112]

-FileName=..\..\engines\scumm\script_v8.cpp

+FileName=..\..\engines\scumm\util.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1168,7 +1168,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit113]

-FileName=..\..\engines\scumm\script_v72he.cpp

+FileName=..\..\engines\scumm\vars.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1178,7 +1178,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit114]

-FileName=..\..\engines\scumm\script_v80he.cpp

+FileName=..\..\engines\scumm\verbs.cpp

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1188,7 +1188,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit115]

-FileName=..\..\engines\scumm\script_v90he.cpp

+FileName=..\..\engines\scumm\verbs.h

 CompileCpp=1

 Folder=scumm

 Compile=1

@@ -1198,9 +1198,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit116]

-FileName=..\..\engines\scumm\script_v100he.cpp

+FileName=..\..\engines\scumm\he\floodfill_he.cpp

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1208,9 +1208,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit117]

-FileName=..\..\engines\scumm\scumm.cpp

+FileName=..\..\engines\scumm\he\floodfill_he.h

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1218,9 +1218,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit118]

-FileName=..\..\engines\scumm\scumm.h

+FileName=..\..\engines\scumm\he\intern_he.h

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1228,9 +1228,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit119]

-FileName=..\..\engines\scumm\scumm-md5.h

+FileName=..\..\engines\scumm\he\logic_he.cpp

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1238,9 +1238,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit120]

-FileName=..\..\engines\scumm\sound.cpp

+FileName=..\..\engines\scumm\he\logic_he.h

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1248,9 +1248,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit121]

-FileName=..\..\engines\scumm\sound.h

+FileName=..\..\engines\scumm\he\palette_he.cpp

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1258,9 +1258,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit122]

-FileName=..\..\engines\scumm\sound_he.cpp

+FileName=..\..\engines\scumm\he\resource_he.cpp

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1268,9 +1268,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit123]

-FileName=..\..\engines\scumm\sprite_he.cpp

+FileName=..\..\engines\scumm\he\resource_he.h

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1278,9 +1278,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit124]

-FileName=..\..\engines\scumm\sprite_he.h

+FileName=..\..\engines\scumm\he\script_v60he.cpp

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1288,9 +1288,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit125]

-FileName=..\..\engines\scumm\string.cpp

+FileName=..\..\engines\scumm\he\script_v70he.cpp

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1298,9 +1298,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit126]

-FileName=..\..\engines\scumm\thumbnail.cpp

+FileName=..\..\engines\scumm\he\script_v72he.cpp

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1308,9 +1308,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit127]

-FileName=..\..\engines\scumm\usage_bits.cpp

+FileName=..\..\engines\scumm\he\script_v80he.cpp

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1318,9 +1318,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit128]

-FileName=..\..\engines\scumm\usage_bits.h

+FileName=..\..\engines\scumm\he\script_v90he.cpp

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1328,9 +1328,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit129]

-FileName=..\..\engines\scumm\util.cpp

+FileName=..\..\engines\scumm\he\script_v100he.cpp

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1338,9 +1338,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit130]

-FileName=..\..\engines\scumm\util.h

+FileName=..\..\engines\scumm\he\sound_he.cpp

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1348,9 +1348,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit131]

-FileName=..\..\engines\scumm\vars.cpp

+FileName=..\..\engines\scumm\he\sprite_he.cpp

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1358,9 +1358,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit132]

-FileName=..\..\engines\scumm\verbs.cpp

+FileName=..\..\engines\scumm\he\sprite_he.h

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1368,9 +1368,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit133]

-FileName=..\..\engines\scumm\verbs.h

+FileName=..\..\engines\scumm\he\wiz_he.cpp

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

@@ -1378,9 +1378,9 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit134]

-FileName=..\..\engines\scumm\wiz_he.cpp

+FileName=..\..\engines\scumm\he\wiz_he.h

 CompileCpp=1

-Folder=scumm

+Folder=he

 Compile=1

 Link=1

 Priority=1000

diff --git a/dists/devcpp/simon.dev b/dists/devcpp/simon.dev
index c7ca8bb51c..534492fc74 100644
--- a/dists/devcpp/simon.dev
+++ b/dists/devcpp/simon.dev
@@ -1,7 +1,7 @@
 [Project]

 FileName=simon.dev

 Name=simon

-UnitCount=22

+UnitCount=23

 Type=2

 Ver=1

 ObjFiles=

@@ -267,3 +267,13 @@ Priority=1000
 OverrideBuildCmd=0

 BuildCmd=

 

+[Unit23]

+FileName=..\..\engines\simon\oracle.cpp

+CompileCpp=1

+Folder=simon

+Compile=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

diff --git a/dists/devcpp/sword2.dev b/dists/devcpp/sword2.dev
index 8338e36d79..3d5ab091d2 100644
--- a/dists/devcpp/sword2.dev
+++ b/dists/devcpp/sword2.dev
@@ -1,7 +1,7 @@
 [Project]

 FileName=sword2.dev

 Name=sword2

-UnitCount=52

+UnitCount=51

 Type=2

 Ver=1

 ObjFiles=

@@ -198,7 +198,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit16]

-FileName=..\..\engines\sword2\icons.h

+FileName=..\..\engines\sword2\interpreter.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -208,7 +208,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit17]

-FileName=..\..\engines\sword2\interpreter.cpp

+FileName=..\..\engines\sword2\interpreter.h

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -218,7 +218,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit18]

-FileName=..\..\engines\sword2\interpreter.h

+FileName=..\..\engines\sword2\layers.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -228,7 +228,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit19]

-FileName=..\..\engines\sword2\layers.cpp

+FileName=..\..\engines\sword2\logic.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -238,7 +238,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit20]

-FileName=..\..\engines\sword2\logic.cpp

+FileName=..\..\engines\sword2\logic.h

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -248,7 +248,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit21]

-FileName=..\..\engines\sword2\logic.h

+FileName=..\..\engines\sword2\maketext.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -258,7 +258,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit22]

-FileName=..\..\engines\sword2\maketext.cpp

+FileName=..\..\engines\sword2\maketext.h

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -268,7 +268,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit23]

-FileName=..\..\engines\sword2\maketext.h

+FileName=..\..\engines\sword2\memory.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -278,7 +278,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit24]

-FileName=..\..\engines\sword2\memory.cpp

+FileName=..\..\engines\sword2\memory.h

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -288,7 +288,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit25]

-FileName=..\..\engines\sword2\memory.h

+FileName=..\..\engines\sword2\menu.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -298,7 +298,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit26]

-FileName=..\..\engines\sword2\menu.cpp

+FileName=..\..\engines\sword2\mouse.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -308,7 +308,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit27]

-FileName=..\..\engines\sword2\mouse.cpp

+FileName=..\..\engines\sword2\mouse.h

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -318,7 +318,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit28]

-FileName=..\..\engines\sword2\mouse.h

+FileName=..\..\engines\sword2\music.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -328,7 +328,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit29]

-FileName=..\..\engines\sword2\music.cpp

+FileName=..\..\engines\sword2\object.h

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -338,7 +338,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit30]

-FileName=..\..\engines\sword2\object.h

+FileName=..\..\engines\sword2\palette.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -348,7 +348,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit31]

-FileName=..\..\engines\sword2\palette.cpp

+FileName=..\..\engines\sword2\protocol.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -358,7 +358,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit32]

-FileName=..\..\engines\sword2\protocol.cpp

+FileName=..\..\engines\sword2\rdwin.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -368,7 +368,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit33]

-FileName=..\..\engines\sword2\rdwin.cpp

+FileName=..\..\engines\sword2\render.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -378,7 +378,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit34]

-FileName=..\..\engines\sword2\render.cpp

+FileName=..\..\engines\sword2\resman.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -388,7 +388,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit35]

-FileName=..\..\engines\sword2\resman.cpp

+FileName=..\..\engines\sword2\resman.h

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -398,7 +398,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit36]

-FileName=..\..\engines\sword2\resman.h

+FileName=..\..\engines\sword2\router.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -408,7 +408,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit37]

-FileName=..\..\engines\sword2\router.cpp

+FileName=..\..\engines\sword2\router.h

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -418,7 +418,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit38]

-FileName=..\..\engines\sword2\router.h

+FileName=..\..\engines\sword2\saveload.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -428,7 +428,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit39]

-FileName=..\..\engines\sword2\saveload.cpp

+FileName=..\..\engines\sword2\saveload.h

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -438,7 +438,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit40]

-FileName=..\..\engines\sword2\saveload.h

+FileName=..\..\engines\sword2\screen.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -448,7 +448,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit41]

-FileName=..\..\engines\sword2\screen.cpp

+FileName=..\..\engines\sword2\screen.h

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -458,7 +458,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit42]

-FileName=..\..\engines\sword2\screen.h

+FileName=..\..\engines\sword2\scroll.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -468,7 +468,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit43]

-FileName=..\..\engines\sword2\scroll.cpp

+FileName=..\..\engines\sword2\sound.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -478,7 +478,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit44]

-FileName=..\..\engines\sword2\sound.cpp

+FileName=..\..\engines\sword2\sound.h

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -488,7 +488,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit45]

-FileName=..\..\engines\sword2\sound.h

+FileName=..\..\engines\sword2\speech.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -498,7 +498,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit46]

-FileName=..\..\engines\sword2\speech.cpp

+FileName=..\..\engines\sword2\sprite.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -508,7 +508,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit47]

-FileName=..\..\engines\sword2\sprite.cpp

+FileName=..\..\engines\sword2\startup.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -518,7 +518,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit48]

-FileName=..\..\engines\sword2\startup.cpp

+FileName=..\..\engines\sword2\sword2.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -528,7 +528,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit49]

-FileName=..\..\engines\sword2\sword2.cpp

+FileName=..\..\engines\sword2\sword2.h

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -538,7 +538,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit50]

-FileName=..\..\engines\sword2\sword2.h

+FileName=..\..\engines\sword2\sync.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1

@@ -548,7 +548,7 @@ OverrideBuildCmd=0
 BuildCmd=

 

 [Unit51]

-FileName=..\..\engines\sword2\sync.cpp

+FileName=..\..\engines\sword2\walker.cpp

 CompileCpp=1

 Folder=sword2

 Compile=1