Merge remote branch 'upstream/master' into pegasus

7 files changed, 2309 insertions, 921 deletions

diff --git a/dists/iphone/scummvm.xcodeproj/project.pbxproj b/dists/iphone/scummvm.xcodeproj/project.pbxproj
index 6e44f351d1..08b67b61b3 100755
--- a/dists/iphone/scummvm.xcodeproj/project.pbxproj
+++ b/dists/iphone/scummvm.xcodeproj/project.pbxproj
@@ -36,7 +36,6 @@
 		8CB5A9E41253FDF500CB6BC7 /* teenagent.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CB5A9D81253FDF500CB6BC7 /* teenagent.dat */; };
 		8CD1ED0B126202AB00FA198C /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC6126202AA00FA198C /* detection.cpp */; };
 		8CD1ED0C126202AB00FA198C /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC7126202AA00FA198C /* display.cpp */; };
-		8CD1ED0D126202AB00FA198C /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC9126202AA00FA198C /* engine.cpp */; };
 		8CD1ED0E126202AB00FA198C /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCB126202AA00FA198C /* file.cpp */; };
 		8CD1ED0F126202AB00FA198C /* hugo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCF126202AA00FA198C /* hugo.cpp */; };
 		8CD1ED10126202AB00FA198C /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD1126202AA00FA198C /* intro.cpp */; };
@@ -68,7 +67,6 @@
 		8CD1ED2E126202AB00FA198C /* toon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED09126202AA00FA198C /* toon.cpp */; };
 		8CD1ED2F126202AB00FA198C /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC6126202AA00FA198C /* detection.cpp */; };
 		8CD1ED30126202AB00FA198C /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC7126202AA00FA198C /* display.cpp */; };
-		8CD1ED31126202AB00FA198C /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC9126202AA00FA198C /* engine.cpp */; };
 		8CD1ED32126202AB00FA198C /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCB126202AA00FA198C /* file.cpp */; };
 		8CD1ED33126202AB00FA198C /* hugo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCF126202AA00FA198C /* hugo.cpp */; };
 		8CD1ED34126202AB00FA198C /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD1126202AA00FA198C /* intro.cpp */; };
@@ -100,7 +98,6 @@
 		8CD1ED52126202AB00FA198C /* toon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED09126202AA00FA198C /* toon.cpp */; };
 		8CD1ED53126202AB00FA198C /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC6126202AA00FA198C /* detection.cpp */; };
 		8CD1ED54126202AB00FA198C /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC7126202AA00FA198C /* display.cpp */; };
-		8CD1ED55126202AB00FA198C /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC9126202AA00FA198C /* engine.cpp */; };
 		8CD1ED56126202AB00FA198C /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCB126202AA00FA198C /* file.cpp */; };
 		8CD1ED57126202AB00FA198C /* hugo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCF126202AA00FA198C /* hugo.cpp */; };
 		8CD1ED58126202AB00FA198C /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD1126202AA00FA198C /* intro.cpp */; };
@@ -238,41 +235,14 @@
 		DF093EA80F63CB26002D821E /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477910D81F4E900B6D1FB /* console.cpp */; };
 		DF093EA90F63CB26002D821E /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477940D81F4E900B6D1FB /* debugger.cpp */; };
 		DF093EAA0F63CB26002D821E /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477960D81F4E900B6D1FB /* dialog.cpp */; };
-		DF093EAB0F63CB26002D821E /* editable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477980D81F4E900B6D1FB /* editable.cpp */; };
-		DF093EAC0F63CB26002D821E /* EditTextWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4779A0D81F4E900B6D1FB /* EditTextWidget.cpp */; };
 		DF093EAD0F63CB26002D821E /* Key.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4779E0D81F4E900B6D1FB /* Key.cpp */; };
 		DF093EAE0F63CB26002D821E /* launcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A20D81F4E900B6D1FB /* launcher.cpp */; };
-		DF093EAF0F63CB26002D821E /* ListWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A40D81F4E900B6D1FB /* ListWidget.cpp */; };
 		DF093EB00F63CB26002D821E /* massadd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A60D81F4E900B6D1FB /* massadd.cpp */; };
 		DF093EB10F63CB26002D821E /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A80D81F4E900B6D1FB /* message.cpp */; };
 		DF093EB20F63CB26002D821E /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AD0D81F4E900B6D1FB /* object.cpp */; };
 		DF093EB30F63CB26002D821E /* options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AF0D81F4E900B6D1FB /* options.cpp */; };
-		DF093EB40F63CB26002D821E /* PopUpWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B10D81F4E900B6D1FB /* PopUpWidget.cpp */; };
-		DF093EB50F63CB26002D821E /* ScrollBarWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B30D81F4E900B6D1FB /* ScrollBarWidget.cpp */; };
-		DF093EB60F63CB26002D821E /* TabWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B50D81F4E900B6D1FB /* TabWidget.cpp */; };
 		DF093EB70F63CB26002D821E /* themebrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477BA0D81F4E900B6D1FB /* themebrowser.cpp */; };
 		DF093EB80F63CB26002D821E /* widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477C40D81F4E900B6D1FB /* widget.cpp */; };
-		DF093EBB0F63CB26002D821E /* audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477CB0D81F4E900B6D1FB /* audiocd.cpp */; };
-		DF093EBC0F63CB26002D821E /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477CD0D81F4E900B6D1FB /* audiostream.cpp */; };
-		DF093EBE0F63CB26002D821E /* fmopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D10D81F4E900B6D1FB /* fmopl.cpp */; };
-		DF093EC00F63CB26002D821E /* mididrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D50D81F4E900B6D1FB /* mididrv.cpp */; };
-		DF093EC10F63CB26002D821E /* midiparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D70D81F4E900B6D1FB /* midiparser.cpp */; };
-		DF093EC20F63CB26002D821E /* midiparser_smf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D90D81F4E900B6D1FB /* midiparser_smf.cpp */; };
-		DF093EC30F63CB26002D821E /* midiparser_xmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DA0D81F4E900B6D1FB /* midiparser_xmidi.cpp */; };
-		DF093EC40F63CB26002D821E /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DB0D81F4E900B6D1FB /* mixer.cpp */; };
-		DF093EC50F63CB26002D821E /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DE0D81F4E900B6D1FB /* infogrames.cpp */; };
-		DF093EC60F63CB26002D821E /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E00D81F4E900B6D1FB /* module.cpp */; };
-		DF093EC70F63CB26002D821E /* paula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E20D81F4E900B6D1FB /* paula.cpp */; };
-		DF093EC80F63CB26002D821E /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E40D81F4E900B6D1FB /* protracker.cpp */; };
-		DF093EC90F63CB26002D821E /* rjp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E60D81F4E900B6D1FB /* rjp1.cpp */; };
-		DF093ECA0F63CB26002D821E /* soundfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E80D81F4E900B6D1FB /* soundfx.cpp */; };
-		DF093ECC0F63CB26002D821E /* mpu401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477ED0D81F4E900B6D1FB /* mpu401.cpp */; };
-		DF093ECD0F63CB26002D821E /* null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477EF0D81F4E900B6D1FB /* null.cpp */; };
-		DF093ECE0F63CB26002D821E /* rate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F00D81F4E900B6D1FB /* rate.cpp */; };
-		DF093ECF0F63CB26002D821E /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F70D81F4E900B6D1FB /* adlib.cpp */; };
-		DF093ED00F63CB26002D821E /* fluidsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F90D81F4E900B6D1FB /* fluidsynth.cpp */; };
-		DF093ED10F63CB26002D821E /* pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE478210D81F4E900B6D1FB /* pcspk.cpp */; };
-		DF093ED20F63CB26002D821E /* ym2612.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE478230D81F4E900B6D1FB /* ym2612.cpp */; };
 		DF093ED60F63CB26002D821E /* memorypool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD511460DF3383500854012 /* memorypool.cpp */; };
 		DF093ED70F63CB26002D821E /* seq.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD517E10DF33CAC00854012 /* seq.cpp */; };
 		DF093ED80F63CB26002D821E /* scaler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD5183B0DF3411800854012 /* scaler.cpp */; };
@@ -900,7 +870,6 @@
 		DF09417A0F63CB26002D821E /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A400E7BBBB400F5680E /* archive.cpp */; };
 		DF09417B0F63CB26002D821E /* unarj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A450E7BBBB400F5680E /* unarj.cpp */; };
 		DF09417C0F63CB26002D821E /* stdiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A6B0E7BBD5700F5680E /* stdiostream.cpp */; };
-		DF09417D0F63CB26002D821E /* musicplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A6F0E7BBDB200F5680E /* musicplugin.cpp */; };
 		DF09417E0F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF00ED5FC77001CB19F /* saveload.cpp */; };
 		DF09417F0F63CB26002D821E /* ThemeEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF40ED5FC77001CB19F /* ThemeEngine.cpp */; };
 		DF0941800F63CB26002D821E /* ThemeEval.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF60ED5FC77001CB19F /* ThemeEval.cpp */; };
@@ -917,7 +886,6 @@
 		DF09418B0F63CB26002D821E /* thumbnail_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */; };
 		DF09418C0F63CB26002D821E /* dither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFB900F485D890006E566 /* dither.cpp */; };
 		DF0941920F63CB26002D821E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD10F485DFB0006E566 /* debug.cpp */; };
-		DF0941930F63CB26002D821E /* gui-manager.hcpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* gui-manager.hcpp */; };
 		DF0941940F63CB26002D821E /* posix-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBF80F4860A60006E566 /* posix-saves.cpp */; };
 		DF0941950F63CB26002D821E /* bmv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC1F0F4862520006E566 /* bmv.cpp */; };
 		DF0941960F63CB26002D821E /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC200F4862520006E566 /* dialogs.cpp */; };
@@ -989,12 +957,9 @@
 		DF09420D0F63CB26002D821E /* timer_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573CBD0F5A85E100961A72 /* timer_lol.cpp */; };
 		DF0942100F63CB26002D821E /* sprites_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2870F62D55C00D756B6 /* sprites_lol.cpp */; };
 		DF0942110F63CB26002D821E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2A30F62D79E00D756B6 /* script.cpp */; };
-		DF0942140F63CB26002D821E /* timestamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2B80F62D91000D756B6 /* timestamp.cpp */; };
 		DF0942150F63CB26002D821E /* pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5C0F63CAD4002D821E /* pn.cpp */; };
 		DF0942160F63CB26002D821E /* script_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5D0F63CAD4002D821E /* script_pn.cpp */; };
 		DF0942170F63CB26002D821E /* vga_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5E0F63CAD4002D821E /* vga_pn.cpp */; };
-		DF0942430F63CB9A002D821E /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0942350F63CB9A002D821E /* events.cpp */; };
-		DF0942450F63CB9A002D821E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0942370F63CB9A002D821E /* graphics.cpp */; };
 		DF0942470F63CB9A002D821E /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0942390F63CB9A002D821E /* main.cpp */; };
 		DF09424A0F63CB9A002D821E /* sdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09423C0F63CB9A002D821E /* sdl.cpp */; };
 		DF0943730F63D1DA002D821E /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A170E7BB34E00F5680E /* CoreFoundation.framework */; };
@@ -1029,9 +994,255 @@
 		DF0E303A1252C5BD0082D593 /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0E30391252C5BD0082D593 /* cms.cpp */; };
 		DF0E303B1252C5BD0082D593 /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0E30391252C5BD0082D593 /* cms.cpp */; };
 		DF0E303C1252C5BD0082D593 /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0E30391252C5BD0082D593 /* cms.cpp */; };
-		DF0E30411252C6090082D593 /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0E303F1252C6090082D593 /* cms.cpp */; };
-		DF0E30421252C6090082D593 /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0E303F1252C6090082D593 /* cms.cpp */; };
-		DF0E30431252C6090082D593 /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0E303F1252C6090082D593 /* cms.cpp */; };
+		DF203F471380C06E0056300A /* gui-manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F461380C06E0056300A /* gui-manager.cpp */; };
+		DF203F481380C06E0056300A /* gui-manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F461380C06E0056300A /* gui-manager.cpp */; };
+		DF203F491380C06E0056300A /* gui-manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F461380C06E0056300A /* gui-manager.cpp */; };
+		DF203F631380C2750056300A /* avi_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F531380C2740056300A /* avi_decoder.cpp */; };
+		DF203F641380C2750056300A /* coktel_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F551380C2740056300A /* coktel_decoder.cpp */; };
+		DF203F651380C2750056300A /* dxa_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F571380C2740056300A /* dxa_decoder.cpp */; };
+		DF203F661380C2750056300A /* flic_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F591380C2740056300A /* flic_decoder.cpp */; };
+		DF203F681380C2750056300A /* qt_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5D1380C2740056300A /* qt_decoder.cpp */; };
+		DF203F691380C2750056300A /* smk_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5F1380C2750056300A /* smk_decoder.cpp */; };
+		DF203F6A1380C2750056300A /* video_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F611380C2750056300A /* video_decoder.cpp */; };
+		DF203F6B1380C2750056300A /* avi_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F531380C2740056300A /* avi_decoder.cpp */; };
+		DF203F6C1380C2750056300A /* coktel_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F551380C2740056300A /* coktel_decoder.cpp */; };
+		DF203F6D1380C2750056300A /* dxa_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F571380C2740056300A /* dxa_decoder.cpp */; };
+		DF203F6E1380C2750056300A /* flic_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F591380C2740056300A /* flic_decoder.cpp */; };
+		DF203F701380C2750056300A /* qt_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5D1380C2740056300A /* qt_decoder.cpp */; };
+		DF203F711380C2750056300A /* smk_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5F1380C2750056300A /* smk_decoder.cpp */; };
+		DF203F721380C2750056300A /* video_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F611380C2750056300A /* video_decoder.cpp */; };
+		DF203F731380C2750056300A /* avi_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F531380C2740056300A /* avi_decoder.cpp */; };
+		DF203F741380C2750056300A /* coktel_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F551380C2740056300A /* coktel_decoder.cpp */; };
+		DF203F751380C2750056300A /* dxa_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F571380C2740056300A /* dxa_decoder.cpp */; };
+		DF203F761380C2750056300A /* flic_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F591380C2740056300A /* flic_decoder.cpp */; };
+		DF203F781380C2750056300A /* qt_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5D1380C2740056300A /* qt_decoder.cpp */; };
+		DF203F791380C2750056300A /* smk_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5F1380C2750056300A /* smk_decoder.cpp */; };
+		DF203F7A1380C2750056300A /* video_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F611380C2750056300A /* video_decoder.cpp */; };
+		DF203F951380C2920056300A /* cdtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7C1380C2920056300A /* cdtoons.cpp */; };
+		DF203F961380C2920056300A /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7E1380C2920056300A /* cinepak.cpp */; };
+		DF203F971380C2920056300A /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F811380C2920056300A /* indeo3.cpp */; };
+		DF203F981380C2920056300A /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F831380C2920056300A /* mjpeg.cpp */; };
+		DF203F991380C2920056300A /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F851380C2920056300A /* msrle.cpp */; };
+		DF203F9A1380C2920056300A /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F871380C2920056300A /* msvideo1.cpp */; };
+		DF203F9B1380C2920056300A /* qdm2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F891380C2920056300A /* qdm2.cpp */; };
+		DF203F9C1380C2920056300A /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8C1380C2920056300A /* qtrle.cpp */; };
+		DF203F9D1380C2920056300A /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8E1380C2920056300A /* rpza.cpp */; };
+		DF203F9E1380C2920056300A /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F901380C2920056300A /* smc.cpp */; };
+		DF203F9F1380C2920056300A /* truemotion1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F921380C2920056300A /* truemotion1.cpp */; };
+		DF203FA01380C2920056300A /* cdtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7C1380C2920056300A /* cdtoons.cpp */; };
+		DF203FA11380C2920056300A /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7E1380C2920056300A /* cinepak.cpp */; };
+		DF203FA21380C2920056300A /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F811380C2920056300A /* indeo3.cpp */; };
+		DF203FA31380C2920056300A /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F831380C2920056300A /* mjpeg.cpp */; };
+		DF203FA41380C2920056300A /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F851380C2920056300A /* msrle.cpp */; };
+		DF203FA51380C2920056300A /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F871380C2920056300A /* msvideo1.cpp */; };
+		DF203FA61380C2920056300A /* qdm2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F891380C2920056300A /* qdm2.cpp */; };
+		DF203FA71380C2920056300A /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8C1380C2920056300A /* qtrle.cpp */; };
+		DF203FA81380C2920056300A /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8E1380C2920056300A /* rpza.cpp */; };
+		DF203FA91380C2920056300A /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F901380C2920056300A /* smc.cpp */; };
+		DF203FAA1380C2920056300A /* truemotion1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F921380C2920056300A /* truemotion1.cpp */; };
+		DF203FAB1380C2920056300A /* cdtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7C1380C2920056300A /* cdtoons.cpp */; };
+		DF203FAC1380C2920056300A /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7E1380C2920056300A /* cinepak.cpp */; };
+		DF203FAD1380C2920056300A /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F811380C2920056300A /* indeo3.cpp */; };
+		DF203FAE1380C2920056300A /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F831380C2920056300A /* mjpeg.cpp */; };
+		DF203FAF1380C2920056300A /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F851380C2920056300A /* msrle.cpp */; };
+		DF203FB01380C2920056300A /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F871380C2920056300A /* msvideo1.cpp */; };
+		DF203FB11380C2920056300A /* qdm2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F891380C2920056300A /* qdm2.cpp */; };
+		DF203FB21380C2920056300A /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8C1380C2920056300A /* qtrle.cpp */; };
+		DF203FB31380C2920056300A /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8E1380C2920056300A /* rpza.cpp */; };
+		DF203FB41380C2920056300A /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F901380C2920056300A /* smc.cpp */; };
+		DF203FB51380C2920056300A /* truemotion1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F921380C2920056300A /* truemotion1.cpp */; };
+		DF203FD51380C3BC0056300A /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC01380C3BC0056300A /* console.cpp */; };
+		DF203FD61380C3BC0056300A /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC21380C3BC0056300A /* dialogs.cpp */; };
+		DF203FD71380C3BC0056300A /* file_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC41380C3BC0056300A /* file_v1d.cpp */; };
+		DF203FD81380C3BC0056300A /* file_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC51380C3BC0056300A /* file_v1w.cpp */; };
+		DF203FD91380C3BC0056300A /* file_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC61380C3BC0056300A /* file_v2d.cpp */; };
+		DF203FDA1380C3BC0056300A /* file_v2w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC71380C3BC0056300A /* file_v2w.cpp */; };
+		DF203FDB1380C3BC0056300A /* file_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC81380C3BC0056300A /* file_v3d.cpp */; };
+		DF203FDC1380C3BC0056300A /* object_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC91380C3BC0056300A /* object_v1d.cpp */; };
+		DF203FDD1380C3BC0056300A /* object_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCA1380C3BC0056300A /* object_v1w.cpp */; };
+		DF203FDE1380C3BC0056300A /* object_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCB1380C3BC0056300A /* object_v2d.cpp */; };
+		DF203FDF1380C3BC0056300A /* object_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCC1380C3BC0056300A /* object_v3d.cpp */; };
+		DF203FE01380C3BC0056300A /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCD1380C3BC0056300A /* object.cpp */; };
+		DF203FE11380C3BC0056300A /* parser_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCF1380C3BC0056300A /* parser_v1d.cpp */; };
+		DF203FE21380C3BC0056300A /* parser_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD01380C3BC0056300A /* parser_v1w.cpp */; };
+		DF203FE31380C3BC0056300A /* parser_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD11380C3BC0056300A /* parser_v2d.cpp */; };
+		DF203FE41380C3BC0056300A /* parser_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD21380C3BC0056300A /* parser_v3d.cpp */; };
+		DF203FE51380C3BC0056300A /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD31380C3BC0056300A /* text.cpp */; };
+		DF203FE61380C3BC0056300A /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC01380C3BC0056300A /* console.cpp */; };
+		DF203FE71380C3BC0056300A /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC21380C3BC0056300A /* dialogs.cpp */; };
+		DF203FE81380C3BC0056300A /* file_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC41380C3BC0056300A /* file_v1d.cpp */; };
+		DF203FE91380C3BC0056300A /* file_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC51380C3BC0056300A /* file_v1w.cpp */; };
+		DF203FEA1380C3BC0056300A /* file_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC61380C3BC0056300A /* file_v2d.cpp */; };
+		DF203FEB1380C3BC0056300A /* file_v2w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC71380C3BC0056300A /* file_v2w.cpp */; };
+		DF203FEC1380C3BC0056300A /* file_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC81380C3BC0056300A /* file_v3d.cpp */; };
+		DF203FED1380C3BC0056300A /* object_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC91380C3BC0056300A /* object_v1d.cpp */; };
+		DF203FEE1380C3BC0056300A /* object_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCA1380C3BC0056300A /* object_v1w.cpp */; };
+		DF203FEF1380C3BC0056300A /* object_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCB1380C3BC0056300A /* object_v2d.cpp */; };
+		DF203FF01380C3BC0056300A /* object_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCC1380C3BC0056300A /* object_v3d.cpp */; };
+		DF203FF11380C3BC0056300A /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCD1380C3BC0056300A /* object.cpp */; };
+		DF203FF21380C3BC0056300A /* parser_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCF1380C3BC0056300A /* parser_v1d.cpp */; };
+		DF203FF31380C3BC0056300A /* parser_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD01380C3BC0056300A /* parser_v1w.cpp */; };
+		DF203FF41380C3BC0056300A /* parser_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD11380C3BC0056300A /* parser_v2d.cpp */; };
+		DF203FF51380C3BC0056300A /* parser_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD21380C3BC0056300A /* parser_v3d.cpp */; };
+		DF203FF61380C3BC0056300A /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD31380C3BC0056300A /* text.cpp */; };
+		DF203FF71380C3BC0056300A /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC01380C3BC0056300A /* console.cpp */; };
+		DF203FF81380C3BC0056300A /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC21380C3BC0056300A /* dialogs.cpp */; };
+		DF203FF91380C3BC0056300A /* file_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC41380C3BC0056300A /* file_v1d.cpp */; };
+		DF203FFA1380C3BC0056300A /* file_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC51380C3BC0056300A /* file_v1w.cpp */; };
+		DF203FFB1380C3BC0056300A /* file_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC61380C3BC0056300A /* file_v2d.cpp */; };
+		DF203FFC1380C3BC0056300A /* file_v2w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC71380C3BC0056300A /* file_v2w.cpp */; };
+		DF203FFD1380C3BC0056300A /* file_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC81380C3BC0056300A /* file_v3d.cpp */; };
+		DF203FFE1380C3BC0056300A /* object_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC91380C3BC0056300A /* object_v1d.cpp */; };
+		DF203FFF1380C3BC0056300A /* object_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCA1380C3BC0056300A /* object_v1w.cpp */; };
+		DF2040001380C3BC0056300A /* object_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCB1380C3BC0056300A /* object_v2d.cpp */; };
+		DF2040011380C3BC0056300A /* object_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCC1380C3BC0056300A /* object_v3d.cpp */; };
+		DF2040021380C3BC0056300A /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCD1380C3BC0056300A /* object.cpp */; };
+		DF2040031380C3BC0056300A /* parser_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCF1380C3BC0056300A /* parser_v1d.cpp */; };
+		DF2040041380C3BC0056300A /* parser_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD01380C3BC0056300A /* parser_v1w.cpp */; };
+		DF2040051380C3BC0056300A /* parser_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD11380C3BC0056300A /* parser_v2d.cpp */; };
+		DF2040061380C3BC0056300A /* parser_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD21380C3BC0056300A /* parser_v3d.cpp */; };
+		DF2040071380C3BC0056300A /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD31380C3BC0056300A /* text.cpp */; };
+		DF20402E1380C8B70056300A /* editable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040221380C8B70056300A /* editable.cpp */; };
+		DF20402F1380C8B70056300A /* edittext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040241380C8B70056300A /* edittext.cpp */; };
+		DF2040301380C8B70056300A /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040261380C8B70056300A /* list.cpp */; };
+		DF2040311380C8B70056300A /* popup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040281380C8B70056300A /* popup.cpp */; };
+		DF2040321380C8B70056300A /* scrollbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402A1380C8B70056300A /* scrollbar.cpp */; };
+		DF2040331380C8B70056300A /* tab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402C1380C8B70056300A /* tab.cpp */; };
+		DF2040341380C8B70056300A /* editable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040221380C8B70056300A /* editable.cpp */; };
+		DF2040351380C8B70056300A /* edittext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040241380C8B70056300A /* edittext.cpp */; };
+		DF2040361380C8B70056300A /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040261380C8B70056300A /* list.cpp */; };
+		DF2040371380C8B70056300A /* popup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040281380C8B70056300A /* popup.cpp */; };
+		DF2040381380C8B70056300A /* scrollbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402A1380C8B70056300A /* scrollbar.cpp */; };
+		DF2040391380C8B70056300A /* tab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402C1380C8B70056300A /* tab.cpp */; };
+		DF20403A1380C8B70056300A /* editable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040221380C8B70056300A /* editable.cpp */; };
+		DF20403B1380C8B70056300A /* edittext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040241380C8B70056300A /* edittext.cpp */; };
+		DF20403C1380C8B70056300A /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040261380C8B70056300A /* list.cpp */; };
+		DF20403D1380C8B70056300A /* popup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040281380C8B70056300A /* popup.cpp */; };
+		DF20403E1380C8B70056300A /* scrollbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402A1380C8B70056300A /* scrollbar.cpp */; };
+		DF20403F1380C8B70056300A /* tab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402C1380C8B70056300A /* tab.cpp */; };
+		DF20405E1380CA230056300A /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040471380CA230056300A /* audiostream.cpp */; };
+		DF20405F1380CA230056300A /* fmopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040491380CA230056300A /* fmopl.cpp */; };
+		DF2040601380CA230056300A /* mididrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404B1380CA230056300A /* mididrv.cpp */; };
+		DF2040611380CA230056300A /* midiparser_smf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404D1380CA230056300A /* midiparser_smf.cpp */; };
+		DF2040621380CA230056300A /* midiparser_xmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404E1380CA230056300A /* midiparser_xmidi.cpp */; };
+		DF2040631380CA230056300A /* midiparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404F1380CA230056300A /* midiparser.cpp */; };
+		DF2040641380CA230056300A /* midiplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040511380CA230056300A /* midiplayer.cpp */; };
+		DF2040651380CA230056300A /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040541380CA230056300A /* mixer.cpp */; };
+		DF2040661380CA230056300A /* mpu401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040561380CA230056300A /* mpu401.cpp */; };
+		DF2040671380CA230056300A /* musicplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040581380CA230056300A /* musicplugin.cpp */; };
+		DF2040681380CA230056300A /* rate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405A1380CA230056300A /* rate.cpp */; };
+		DF2040691380CA230056300A /* timestamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405C1380CA230056300A /* timestamp.cpp */; };
+		DF20406A1380CA230056300A /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040471380CA230056300A /* audiostream.cpp */; };
+		DF20406B1380CA230056300A /* fmopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040491380CA230056300A /* fmopl.cpp */; };
+		DF20406C1380CA230056300A /* mididrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404B1380CA230056300A /* mididrv.cpp */; };
+		DF20406D1380CA230056300A /* midiparser_smf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404D1380CA230056300A /* midiparser_smf.cpp */; };
+		DF20406E1380CA230056300A /* midiparser_xmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404E1380CA230056300A /* midiparser_xmidi.cpp */; };
+		DF20406F1380CA230056300A /* midiparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404F1380CA230056300A /* midiparser.cpp */; };
+		DF2040701380CA230056300A /* midiplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040511380CA230056300A /* midiplayer.cpp */; };
+		DF2040711380CA230056300A /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040541380CA230056300A /* mixer.cpp */; };
+		DF2040721380CA230056300A /* mpu401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040561380CA230056300A /* mpu401.cpp */; };
+		DF2040731380CA230056300A /* musicplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040581380CA230056300A /* musicplugin.cpp */; };
+		DF2040741380CA230056300A /* rate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405A1380CA230056300A /* rate.cpp */; };
+		DF2040751380CA230056300A /* timestamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405C1380CA230056300A /* timestamp.cpp */; };
+		DF2040761380CA230056300A /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040471380CA230056300A /* audiostream.cpp */; };
+		DF2040771380CA230056300A /* fmopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040491380CA230056300A /* fmopl.cpp */; };
+		DF2040781380CA230056300A /* mididrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404B1380CA230056300A /* mididrv.cpp */; };
+		DF2040791380CA230056300A /* midiparser_smf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404D1380CA230056300A /* midiparser_smf.cpp */; };
+		DF20407A1380CA230056300A /* midiparser_xmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404E1380CA230056300A /* midiparser_xmidi.cpp */; };
+		DF20407B1380CA230056300A /* midiparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404F1380CA230056300A /* midiparser.cpp */; };
+		DF20407C1380CA230056300A /* midiplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040511380CA230056300A /* midiplayer.cpp */; };
+		DF20407D1380CA230056300A /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040541380CA230056300A /* mixer.cpp */; };
+		DF20407E1380CA230056300A /* mpu401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040561380CA230056300A /* mpu401.cpp */; };
+		DF20407F1380CA230056300A /* musicplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040581380CA230056300A /* musicplugin.cpp */; };
+		DF2040801380CA230056300A /* rate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405A1380CA230056300A /* rate.cpp */; };
+		DF2040811380CA230056300A /* timestamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405C1380CA230056300A /* timestamp.cpp */; };
+		DF20409A1380CA400056300A /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040841380CA400056300A /* adpcm.cpp */; };
+		DF20409B1380CA400056300A /* aiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040861380CA400056300A /* aiff.cpp */; };
+		DF20409C1380CA400056300A /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040881380CA400056300A /* flac.cpp */; };
+		DF20409D1380CA400056300A /* iff_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408A1380CA400056300A /* iff_sound.cpp */; };
+		DF20409E1380CA400056300A /* mac_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408C1380CA400056300A /* mac_snd.cpp */; };
+		DF20409F1380CA400056300A /* mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408E1380CA400056300A /* mp3.cpp */; };
+		DF2040A01380CA400056300A /* raw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040901380CA400056300A /* raw.cpp */; };
+		DF2040A11380CA400056300A /* vag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040921380CA400056300A /* vag.cpp */; };
+		DF2040A21380CA400056300A /* voc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040941380CA400056300A /* voc.cpp */; };
+		DF2040A31380CA400056300A /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040961380CA400056300A /* vorbis.cpp */; };
+		DF2040A41380CA400056300A /* wave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040981380CA400056300A /* wave.cpp */; };
+		DF2040A51380CA400056300A /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040841380CA400056300A /* adpcm.cpp */; };
+		DF2040A61380CA400056300A /* aiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040861380CA400056300A /* aiff.cpp */; };
+		DF2040A71380CA400056300A /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040881380CA400056300A /* flac.cpp */; };
+		DF2040A81380CA400056300A /* iff_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408A1380CA400056300A /* iff_sound.cpp */; };
+		DF2040A91380CA400056300A /* mac_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408C1380CA400056300A /* mac_snd.cpp */; };
+		DF2040AA1380CA400056300A /* mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408E1380CA400056300A /* mp3.cpp */; };
+		DF2040AB1380CA400056300A /* raw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040901380CA400056300A /* raw.cpp */; };
+		DF2040AC1380CA400056300A /* vag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040921380CA400056300A /* vag.cpp */; };
+		DF2040AD1380CA400056300A /* voc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040941380CA400056300A /* voc.cpp */; };
+		DF2040AE1380CA400056300A /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040961380CA400056300A /* vorbis.cpp */; };
+		DF2040AF1380CA400056300A /* wave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040981380CA400056300A /* wave.cpp */; };
+		DF2040B01380CA400056300A /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040841380CA400056300A /* adpcm.cpp */; };
+		DF2040B11380CA400056300A /* aiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040861380CA400056300A /* aiff.cpp */; };
+		DF2040B21380CA400056300A /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040881380CA400056300A /* flac.cpp */; };
+		DF2040B31380CA400056300A /* iff_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408A1380CA400056300A /* iff_sound.cpp */; };
+		DF2040B41380CA400056300A /* mac_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408C1380CA400056300A /* mac_snd.cpp */; };
+		DF2040B51380CA400056300A /* mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408E1380CA400056300A /* mp3.cpp */; };
+		DF2040B61380CA400056300A /* raw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040901380CA400056300A /* raw.cpp */; };
+		DF2040B71380CA400056300A /* vag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040921380CA400056300A /* vag.cpp */; };
+		DF2040B81380CA400056300A /* voc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040941380CA400056300A /* voc.cpp */; };
+		DF2040B91380CA400056300A /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040961380CA400056300A /* vorbis.cpp */; };
+		DF2040BA1380CA400056300A /* wave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040981380CA400056300A /* wave.cpp */; };
+		DF2040CC1380CA810056300A /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BC1380CA810056300A /* infogrames.cpp */; };
+		DF2040CD1380CA810056300A /* maxtrax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BE1380CA810056300A /* maxtrax.cpp */; };
+		DF2040CE1380CA810056300A /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C01380CA810056300A /* module.cpp */; };
+		DF2040CF1380CA810056300A /* paula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C21380CA810056300A /* paula.cpp */; };
+		DF2040D01380CA810056300A /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C41380CA810056300A /* protracker.cpp */; };
+		DF2040D11380CA810056300A /* rjp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C61380CA810056300A /* rjp1.cpp */; };
+		DF2040D21380CA810056300A /* soundfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C81380CA810056300A /* soundfx.cpp */; };
+		DF2040D31380CA810056300A /* tfmx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040CA1380CA810056300A /* tfmx.cpp */; };
+		DF2040D41380CA810056300A /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BC1380CA810056300A /* infogrames.cpp */; };
+		DF2040D51380CA810056300A /* maxtrax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BE1380CA810056300A /* maxtrax.cpp */; };
+		DF2040D61380CA810056300A /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C01380CA810056300A /* module.cpp */; };
+		DF2040D71380CA810056300A /* paula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C21380CA810056300A /* paula.cpp */; };
+		DF2040D81380CA810056300A /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C41380CA810056300A /* protracker.cpp */; };
+		DF2040D91380CA810056300A /* rjp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C61380CA810056300A /* rjp1.cpp */; };
+		DF2040DA1380CA810056300A /* soundfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C81380CA810056300A /* soundfx.cpp */; };
+		DF2040DB1380CA810056300A /* tfmx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040CA1380CA810056300A /* tfmx.cpp */; };
+		DF2040DC1380CA810056300A /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BC1380CA810056300A /* infogrames.cpp */; };
+		DF2040DD1380CA810056300A /* maxtrax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BE1380CA810056300A /* maxtrax.cpp */; };
+		DF2040DE1380CA810056300A /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C01380CA810056300A /* module.cpp */; };
+		DF2040DF1380CA810056300A /* paula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C21380CA810056300A /* paula.cpp */; };
+		DF2040E01380CA810056300A /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C41380CA810056300A /* protracker.cpp */; };
+		DF2040E11380CA810056300A /* rjp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C61380CA810056300A /* rjp1.cpp */; };
+		DF2040E21380CA810056300A /* soundfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C81380CA810056300A /* soundfx.cpp */; };
+		DF2040E31380CA810056300A /* tfmx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040CA1380CA810056300A /* tfmx.cpp */; };
+		DF2040F41380CAA40056300A /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E51380CAA40056300A /* adlib.cpp */; };
+		DF2040F51380CAA40056300A /* appleiigs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E61380CAA40056300A /* appleiigs.cpp */; };
+		DF2040F61380CAA40056300A /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E71380CAA40056300A /* cms.cpp */; };
+		DF2040F71380CAA40056300A /* eas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E91380CAA40056300A /* eas.cpp */; };
+		DF2040F81380CAA40056300A /* fluidsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EB1380CAA40056300A /* fluidsynth.cpp */; };
+		DF2040F91380CAA40056300A /* mt32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EC1380CAA40056300A /* mt32.cpp */; };
+		DF2040FA1380CAA40056300A /* pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040ED1380CAA40056300A /* pcspk.cpp */; };
+		DF2040FB1380CAA40056300A /* sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EF1380CAA40056300A /* sid.cpp */; };
+		DF2040FC1380CAA40056300A /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040F11380CAA40056300A /* wave6581.cpp */; };
+		DF2040FD1380CAA40056300A /* ym2612.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040F21380CAA40056300A /* ym2612.cpp */; };
+		DF2040FE1380CAA40056300A /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E51380CAA40056300A /* adlib.cpp */; };
+		DF2040FF1380CAA40056300A /* appleiigs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E61380CAA40056300A /* appleiigs.cpp */; };
+		DF2041001380CAA40056300A /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E71380CAA40056300A /* cms.cpp */; };
+		DF2041011380CAA40056300A /* eas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E91380CAA40056300A /* eas.cpp */; };
+		DF2041021380CAA40056300A /* fluidsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EB1380CAA40056300A /* fluidsynth.cpp */; };
+		DF2041031380CAA40056300A /* mt32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EC1380CAA40056300A /* mt32.cpp */; };
+		DF2041041380CAA40056300A /* pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040ED1380CAA40056300A /* pcspk.cpp */; };
+		DF2041051380CAA40056300A /* sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EF1380CAA40056300A /* sid.cpp */; };
+		DF2041061380CAA40056300A /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040F11380CAA40056300A /* wave6581.cpp */; };
+		DF2041071380CAA40056300A /* ym2612.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040F21380CAA40056300A /* ym2612.cpp */; };
+		DF2041081380CAA40056300A /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E51380CAA40056300A /* adlib.cpp */; };
+		DF2041091380CAA40056300A /* appleiigs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E61380CAA40056300A /* appleiigs.cpp */; };
+		DF20410A1380CAA40056300A /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E71380CAA40056300A /* cms.cpp */; };
+		DF20410B1380CAA40056300A /* eas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E91380CAA40056300A /* eas.cpp */; };
+		DF20410C1380CAA40056300A /* fluidsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EB1380CAA40056300A /* fluidsynth.cpp */; };
+		DF20410D1380CAA40056300A /* mt32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EC1380CAA40056300A /* mt32.cpp */; };
+		DF20410E1380CAA40056300A /* pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040ED1380CAA40056300A /* pcspk.cpp */; };
+		DF20410F1380CAA40056300A /* sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EF1380CAA40056300A /* sid.cpp */; };
+		DF2041101380CAA40056300A /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040F11380CAA40056300A /* wave6581.cpp */; };
+		DF2041111380CAA40056300A /* ym2612.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040F21380CAA40056300A /* ym2612.cpp */; };
 		DF224E040FB23BC500C8E453 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF224E020FB23BC500C8E453 /* OpenGLES.framework */; };
 		DF224E050FB23BC500C8E453 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF224E020FB23BC500C8E453 /* OpenGLES.framework */; };
 		DF2EC3E510E6490800765801 /* browser_osx.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC3E410E6490800765801 /* browser_osx.mm */; };
@@ -1053,15 +1264,8 @@
 		DF2EC50B10E64DB300765801 /* textconsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC50910E64DB300765801 /* textconsole.cpp */; };
 		DF2EC50C10E64DB300765801 /* textconsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC50910E64DB300765801 /* textconsole.cpp */; };
 		DF2EC50D10E64DB300765801 /* textconsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC50910E64DB300765801 /* textconsole.cpp */; };
-		DF2EC51210E64E3100765801 /* sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC51010E64E3100765801 /* sid.cpp */; };
-		DF2EC51310E64E3100765801 /* sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC51010E64E3100765801 /* sid.cpp */; };
-		DF2EC51410E64E3100765801 /* sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC51010E64E3100765801 /* sid.cpp */; };
-		DF2EC51810E64EE600765801 /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC51710E64EE600765801 /* wave6581.cpp */; };
-		DF2EC51910E64EE600765801 /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC51710E64EE600765801 /* wave6581.cpp */; };
-		DF2EC51A10E64EE600765801 /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC51710E64EE600765801 /* wave6581.cpp */; };
 		DF2FFB930F485D890006E566 /* dither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFB900F485D890006E566 /* dither.cpp */; };
 		DF2FFBD30F485DFB0006E566 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD10F485DFB0006E566 /* debug.cpp */; };
-		DF2FFBD90F485E360006E566 /* gui-manager.hcpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* gui-manager.hcpp */; };
 		DF2FFBFC0F4860A60006E566 /* posix-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBF80F4860A60006E566 /* posix-saves.cpp */; };
 		DF2FFC290F4862520006E566 /* bmv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC1F0F4862520006E566 /* bmv.cpp */; };
 		DF2FFC2A0F4862520006E566 /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC200F4862520006E566 /* dialogs.cpp */; };
@@ -1109,36 +1313,6 @@
 		DF2FFD2B0F48717F0006E566 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = DF2FFD290F48717F0006E566 /* Default.png */; };
 		DF2FFD2C0F48717F0006E566 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = DF2FFD2A0F48717F0006E566 /* icon.png */; };
 		DF2FFD2D0F48719E0006E566 /* scummclassic.zip in Resources */ = {isa = PBXBuildFile; fileRef = DF2FFBDB0F485E480006E566 /* scummclassic.zip */; };
-		DF45B11F116627DA009B85CC /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0F7116627DA009B85CC /* adpcm.cpp */; };
-		DF45B121116627DA009B85CC /* aiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0FA116627DA009B85CC /* aiff.cpp */; };
-		DF45B123116627DA009B85CC /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0FD116627DA009B85CC /* flac.cpp */; };
-		DF45B125116627DA009B85CC /* iff_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B100116627DA009B85CC /* iff_sound.cpp */; };
-		DF45B127116627DA009B85CC /* mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B103116627DA009B85CC /* mp3.cpp */; };
-		DF45B129116627DA009B85CC /* raw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B106116627DA009B85CC /* raw.cpp */; };
-		DF45B12B116627DA009B85CC /* vag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B109116627DA009B85CC /* vag.cpp */; };
-		DF45B12D116627DA009B85CC /* voc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B10C116627DA009B85CC /* voc.cpp */; };
-		DF45B12F116627DA009B85CC /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B10F116627DA009B85CC /* vorbis.cpp */; };
-		DF45B131116627DA009B85CC /* wave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B112116627DA009B85CC /* wave.cpp */; };
-		DF45B13D116627DA009B85CC /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0F7116627DA009B85CC /* adpcm.cpp */; };
-		DF45B13F116627DA009B85CC /* aiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0FA116627DA009B85CC /* aiff.cpp */; };
-		DF45B141116627DA009B85CC /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0FD116627DA009B85CC /* flac.cpp */; };
-		DF45B143116627DA009B85CC /* iff_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B100116627DA009B85CC /* iff_sound.cpp */; };
-		DF45B145116627DA009B85CC /* mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B103116627DA009B85CC /* mp3.cpp */; };
-		DF45B147116627DA009B85CC /* raw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B106116627DA009B85CC /* raw.cpp */; };
-		DF45B149116627DA009B85CC /* vag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B109116627DA009B85CC /* vag.cpp */; };
-		DF45B14B116627DA009B85CC /* voc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B10C116627DA009B85CC /* voc.cpp */; };
-		DF45B14D116627DA009B85CC /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B10F116627DA009B85CC /* vorbis.cpp */; };
-		DF45B14F116627DA009B85CC /* wave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B112116627DA009B85CC /* wave.cpp */; };
-		DF45B15B116627DA009B85CC /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0F7116627DA009B85CC /* adpcm.cpp */; };
-		DF45B15D116627DA009B85CC /* aiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0FA116627DA009B85CC /* aiff.cpp */; };
-		DF45B15F116627DA009B85CC /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B0FD116627DA009B85CC /* flac.cpp */; };
-		DF45B161116627DA009B85CC /* iff_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B100116627DA009B85CC /* iff_sound.cpp */; };
-		DF45B163116627DA009B85CC /* mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B103116627DA009B85CC /* mp3.cpp */; };
-		DF45B165116627DA009B85CC /* raw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B106116627DA009B85CC /* raw.cpp */; };
-		DF45B167116627DA009B85CC /* vag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B109116627DA009B85CC /* vag.cpp */; };
-		DF45B169116627DA009B85CC /* voc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B10C116627DA009B85CC /* voc.cpp */; };
-		DF45B16B116627DA009B85CC /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B10F116627DA009B85CC /* vorbis.cpp */; };
-		DF45B16D116627DA009B85CC /* wave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B112116627DA009B85CC /* wave.cpp */; };
 		DF45B1CA116628A5009B85CC /* animate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B176116628A5009B85CC /* animate.cpp */; };
 		DF45B1CB116628A5009B85CC /* cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B178116628A5009B85CC /* cache.cpp */; };
 		DF45B1CC116628A5009B85CC /* compare.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B17A116628A5009B85CC /* compare.cpp */; };
@@ -1229,6 +1403,137 @@
 		DF45B244116628A5009B85CC /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1C1116628A5009B85CC /* music.cpp */; };
 		DF45B245116628A5009B85CC /* soundcmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1C3116628A5009B85CC /* soundcmd.cpp */; };
 		DF45B246116628A5009B85CC /* seq_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1C6116628A5009B85CC /* seq_decoder.cpp */; };
+		DF46B6F31381E18900D08723 /* coroutine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F21381E18900D08723 /* coroutine.cpp */; };
+		DF46B6F41381E18900D08723 /* coroutine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F21381E18900D08723 /* coroutine.cpp */; };
+		DF46B6F51381E18900D08723 /* coroutine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F21381E18900D08723 /* coroutine.cpp */; };
+		DF46B6FF1381E1FF00D08723 /* towns_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F71381E1FF00D08723 /* towns_audio.cpp */; };
+		DF46B7001381E1FF00D08723 /* towns_euphony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F91381E1FF00D08723 /* towns_euphony.cpp */; };
+		DF46B7011381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FB1381E1FF00D08723 /* towns_pc98_driver.cpp */; };
+		DF46B7021381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FD1381E1FF00D08723 /* towns_pc98_fmsynth.cpp */; };
+		DF46B7031381E1FF00D08723 /* towns_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F71381E1FF00D08723 /* towns_audio.cpp */; };
+		DF46B7041381E1FF00D08723 /* towns_euphony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F91381E1FF00D08723 /* towns_euphony.cpp */; };
+		DF46B7051381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FB1381E1FF00D08723 /* towns_pc98_driver.cpp */; };
+		DF46B7061381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FD1381E1FF00D08723 /* towns_pc98_fmsynth.cpp */; };
+		DF46B7071381E1FF00D08723 /* towns_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F71381E1FF00D08723 /* towns_audio.cpp */; };
+		DF46B7081381E1FF00D08723 /* towns_euphony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F91381E1FF00D08723 /* towns_euphony.cpp */; };
+		DF46B7091381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FB1381E1FF00D08723 /* towns_pc98_driver.cpp */; };
+		DF46B70A1381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FD1381E1FF00D08723 /* towns_pc98_fmsynth.cpp */; };
+		DF46B7191381E27000D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B70F1381E27000D08723 /* console.cpp */; };
+		DF46B71A1381E27000D08723 /* databases.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7111381E27000D08723 /* databases.cpp */; };
+		DF46B71B1381E27000D08723 /* dbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7131381E27000D08723 /* dbase.cpp */; };
+		DF46B71C1381E27000D08723 /* iniconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7151381E27000D08723 /* iniconfig.cpp */; };
+		DF46B71D1381E27000D08723 /* init_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7171381E27000D08723 /* init_v7.cpp */; };
+		DF46B71E1381E27000D08723 /* inter_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7181381E27000D08723 /* inter_inca2.cpp */; };
+		DF46B71F1381E27000D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B70F1381E27000D08723 /* console.cpp */; };
+		DF46B7201381E27000D08723 /* databases.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7111381E27000D08723 /* databases.cpp */; };
+		DF46B7211381E27000D08723 /* dbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7131381E27000D08723 /* dbase.cpp */; };
+		DF46B7221381E27000D08723 /* iniconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7151381E27000D08723 /* iniconfig.cpp */; };
+		DF46B7231381E27000D08723 /* init_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7171381E27000D08723 /* init_v7.cpp */; };
+		DF46B7241381E27000D08723 /* inter_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7181381E27000D08723 /* inter_inca2.cpp */; };
+		DF46B7251381E27000D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B70F1381E27000D08723 /* console.cpp */; };
+		DF46B7261381E27000D08723 /* databases.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7111381E27000D08723 /* databases.cpp */; };
+		DF46B7271381E27000D08723 /* dbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7131381E27000D08723 /* dbase.cpp */; };
+		DF46B7281381E27000D08723 /* iniconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7151381E27000D08723 /* iniconfig.cpp */; };
+		DF46B7291381E27000D08723 /* init_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7171381E27000D08723 /* init_v7.cpp */; };
+		DF46B72A1381E27000D08723 /* inter_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7181381E27000D08723 /* inter_inca2.cpp */; };
+		DF46B7441381E40500D08723 /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7421381E40500D08723 /* log.cpp */; };
+		DF46B7451381E40500D08723 /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7421381E40500D08723 /* log.cpp */; };
+		DF46B7461381E40500D08723 /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7421381E40500D08723 /* log.cpp */; };
+		DF46B7491381E40F00D08723 /* modular-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7471381E40F00D08723 /* modular-backend.cpp */; };
+		DF46B74A1381E40F00D08723 /* modular-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7471381E40F00D08723 /* modular-backend.cpp */; };
+		DF46B74B1381E40F00D08723 /* modular-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7471381E40F00D08723 /* modular-backend.cpp */; };
+		DF46B7541381E46700D08723 /* player_v2base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7511381E46700D08723 /* player_v2base.cpp */; };
+		DF46B7551381E46700D08723 /* player_v2base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7511381E46700D08723 /* player_v2base.cpp */; };
+		DF46B7561381E46700D08723 /* player_v2base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7511381E46700D08723 /* player_v2base.cpp */; };
+		DF46B75E1381E4A400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B75B1381E4A400D08723 /* console.cpp */; };
+		DF46B75F1381E4A400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B75B1381E4A400D08723 /* console.cpp */; };
+		DF46B7601381E4A400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B75B1381E4A400D08723 /* console.cpp */; };
+		DF46B7631381E4D400D08723 /* robot_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7611381E4D400D08723 /* robot_decoder.cpp */; };
+		DF46B7641381E4D400D08723 /* robot_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7611381E4D400D08723 /* robot_decoder.cpp */; };
+		DF46B7651381E4D400D08723 /* robot_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7611381E4D400D08723 /* robot_decoder.cpp */; };
+		DF46B7671381E4E400D08723 /* vm_types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7661381E4E400D08723 /* vm_types.cpp */; };
+		DF46B7681381E4E400D08723 /* vm_types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7661381E4E400D08723 /* vm_types.cpp */; };
+		DF46B7691381E4E400D08723 /* vm_types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7661381E4E400D08723 /* vm_types.cpp */; };
+		DF46B77B1381E54200D08723 /* dcl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B76F1381E54200D08723 /* dcl.cpp */; };
+		DF46B77C1381E54200D08723 /* iff_container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7721381E54200D08723 /* iff_container.cpp */; };
+		DF46B77D1381E54200D08723 /* winexe_ne.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7751381E54200D08723 /* winexe_ne.cpp */; };
+		DF46B77E1381E54200D08723 /* winexe_pe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7771381E54200D08723 /* winexe_pe.cpp */; };
+		DF46B77F1381E54200D08723 /* winexe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7791381E54200D08723 /* winexe.cpp */; };
+		DF46B7801381E54200D08723 /* dcl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B76F1381E54200D08723 /* dcl.cpp */; };
+		DF46B7811381E54200D08723 /* iff_container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7721381E54200D08723 /* iff_container.cpp */; };
+		DF46B7821381E54200D08723 /* winexe_ne.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7751381E54200D08723 /* winexe_ne.cpp */; };
+		DF46B7831381E54200D08723 /* winexe_pe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7771381E54200D08723 /* winexe_pe.cpp */; };
+		DF46B7841381E54200D08723 /* winexe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7791381E54200D08723 /* winexe.cpp */; };
+		DF46B7851381E54200D08723 /* dcl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B76F1381E54200D08723 /* dcl.cpp */; };
+		DF46B7861381E54200D08723 /* iff_container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7721381E54200D08723 /* iff_container.cpp */; };
+		DF46B7871381E54200D08723 /* winexe_ne.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7751381E54200D08723 /* winexe_ne.cpp */; };
+		DF46B7881381E54200D08723 /* winexe_pe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7771381E54200D08723 /* winexe_pe.cpp */; };
+		DF46B7891381E54200D08723 /* winexe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7791381E54200D08723 /* winexe.cpp */; };
+		DF46B7931381E58000D08723 /* png.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B78F1381E58000D08723 /* png.cpp */; };
+		DF46B7941381E58000D08723 /* wincursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7911381E58000D08723 /* wincursor.cpp */; };
+		DF46B7951381E58000D08723 /* png.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B78F1381E58000D08723 /* png.cpp */; };
+		DF46B7961381E58000D08723 /* wincursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7911381E58000D08723 /* wincursor.cpp */; };
+		DF46B7971381E58000D08723 /* png.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B78F1381E58000D08723 /* png.cpp */; };
+		DF46B7981381E58000D08723 /* wincursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7911381E58000D08723 /* wincursor.cpp */; };
+		DF46B79F1381E5B500D08723 /* winfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B79D1381E5B500D08723 /* winfont.cpp */; };
+		DF46B7A01381E5B500D08723 /* winfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B79D1381E5B500D08723 /* winfont.cpp */; };
+		DF46B7A11381E5B500D08723 /* winfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B79D1381E5B500D08723 /* winfont.cpp */; };
+		DF46B7A51381E5D900D08723 /* sdl-timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7A31381E5D900D08723 /* sdl-timer.cpp */; };
+		DF46B7A91381E5F100D08723 /* header.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7A81381E5F100D08723 /* header.cpp */; };
+		DF46B7AA1381E5F100D08723 /* header.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7A81381E5F100D08723 /* header.cpp */; };
+		DF46B7AB1381E5F100D08723 /* header.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7A81381E5F100D08723 /* header.cpp */; };
+		DF46B7B41381E67800D08723 /* sdl-mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7B21381E67800D08723 /* sdl-mutex.cpp */; };
+		DF46B7B51381E67800D08723 /* sdl-mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7B21381E67800D08723 /* sdl-mutex.cpp */; };
+		DF46B7B61381E67800D08723 /* sdl-mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7B21381E67800D08723 /* sdl-mutex.cpp */; };
+		DF46B7BD1381E6C000D08723 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7BB1381E6C000D08723 /* object.cpp */; };
+		DF46B7BE1381E6C000D08723 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7BB1381E6C000D08723 /* object.cpp */; };
+		DF46B7BF1381E6C000D08723 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7BB1381E6C000D08723 /* object.cpp */; };
+		DF46B7C81381E72500D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7C61381E72500D08723 /* console.cpp */; };
+		DF46B7C91381E72500D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7C61381E72500D08723 /* console.cpp */; };
+		DF46B7CA1381E72500D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7C61381E72500D08723 /* console.cpp */; };
+		DF46B7CF1381E76300D08723 /* sdl-events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7CD1381E76300D08723 /* sdl-events.cpp */; };
+		DF46B7D61381E7C600D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7D41381E7C600D08723 /* console.cpp */; };
+		DF46B7D71381E7C600D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7D41381E7C600D08723 /* console.cpp */; };
+		DF46B7D81381E7C600D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7D41381E7C600D08723 /* console.cpp */; };
+		DF46B83C1381F13500D08723 /* saveload_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B83B1381F13500D08723 /* saveload_v7.cpp */; };
+		DF46B83D1381F13500D08723 /* saveload_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B83B1381F13500D08723 /* saveload_v7.cpp */; };
+		DF46B83E1381F13500D08723 /* saveload_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B83B1381F13500D08723 /* saveload_v7.cpp */; };
+		DF46B8441381F35500D08723 /* saveload_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8431381F35500D08723 /* saveload_inca2.cpp */; };
+		DF46B8451381F35500D08723 /* saveload_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8431381F35500D08723 /* saveload_inca2.cpp */; };
+		DF46B8461381F35500D08723 /* saveload_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8431381F35500D08723 /* saveload_inca2.cpp */; };
+		DF46B8481381F38700D08723 /* inter_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8471381F38700D08723 /* inter_v7.cpp */; };
+		DF46B8491381F38700D08723 /* inter_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8471381F38700D08723 /* inter_v7.cpp */; };
+		DF46B84A1381F38700D08723 /* inter_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8471381F38700D08723 /* inter_v7.cpp */; };
+		DF46B84D1381F39E00D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B84B1381F39E00D08723 /* console.cpp */; };
+		DF46B84E1381F39E00D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B84B1381F39E00D08723 /* console.cpp */; };
+		DF46B84F1381F39E00D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B84B1381F39E00D08723 /* console.cpp */; };
+		DF46B8521381F3B400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8501381F3B400D08723 /* console.cpp */; };
+		DF46B8531381F3B400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8501381F3B400D08723 /* console.cpp */; };
+		DF46B8541381F3B400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8501381F3B400D08723 /* console.cpp */; };
+		DF46B8601381F44E00D08723 /* dbopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85A1381F44E00D08723 /* dbopl.cpp */; };
+		DF46B8611381F44E00D08723 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85C1381F44E00D08723 /* dosbox.cpp */; };
+		DF46B8621381F44E00D08723 /* mame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85E1381F44E00D08723 /* mame.cpp */; };
+		DF46B8631381F44E00D08723 /* dbopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85A1381F44E00D08723 /* dbopl.cpp */; };
+		DF46B8641381F44E00D08723 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85C1381F44E00D08723 /* dosbox.cpp */; };
+		DF46B8651381F44E00D08723 /* mame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85E1381F44E00D08723 /* mame.cpp */; };
+		DF46B8661381F44E00D08723 /* dbopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85A1381F44E00D08723 /* dbopl.cpp */; };
+		DF46B8671381F44E00D08723 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85C1381F44E00D08723 /* dosbox.cpp */; };
+		DF46B8681381F44E00D08723 /* mame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85E1381F44E00D08723 /* mame.cpp */; };
+		DF46B8711381F4A200D08723 /* sdl-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B86F1381F4A200D08723 /* sdl-audiocd.cpp */; };
+		DF46B8721381F4A200D08723 /* sdl-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B86F1381F4A200D08723 /* sdl-audiocd.cpp */; };
+		DF46B8731381F4A200D08723 /* sdl-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B86F1381F4A200D08723 /* sdl-audiocd.cpp */; };
+		DF46B87D1381F4F200D08723 /* default-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B87B1381F4F200D08723 /* default-audiocd.cpp */; };
+		DF46B87E1381F4F200D08723 /* default-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B87B1381F4F200D08723 /* default-audiocd.cpp */; };
+		DF46B87F1381F4F200D08723 /* default-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B87B1381F4F200D08723 /* default-audiocd.cpp */; };
+		DF46B8891381F5D800D08723 /* sdl-provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8871381F5D800D08723 /* sdl-provider.cpp */; };
+		DF46B88A1381F5D800D08723 /* sdl-provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8871381F5D800D08723 /* sdl-provider.cpp */; };
+		DF46B88B1381F5D800D08723 /* sdl-provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8871381F5D800D08723 /* sdl-provider.cpp */; };
+		DF46B8921381F62B00D08723 /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8901381F62B00D08723 /* adpcm.cpp */; };
+		DF46B8931381F62B00D08723 /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8901381F62B00D08723 /* adpcm.cpp */; };
+		DF46B8941381F62B00D08723 /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8901381F62B00D08723 /* adpcm.cpp */; };
+		DF46B89B1381F6C400D08723 /* null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8991381F6C400D08723 /* null.cpp */; };
+		DF46B89C1381F6C400D08723 /* null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8991381F6C400D08723 /* null.cpp */; };
+		DF46B89D1381F6C400D08723 /* null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8991381F6C400D08723 /* null.cpp */; };
 		DF573C080F5A81EA00961A72 /* state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573C010F5A81EA00961A72 /* state.cpp */; };
 		DF573CBB0F5A85B300961A72 /* exec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573CBA0F5A85B300961A72 /* exec.cpp */; };
 		DF573CBE0F5A85E100961A72 /* timer_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573CBD0F5A85E100961A72 /* timer_lol.cpp */; };
@@ -1253,20 +1558,10 @@
 		DF6118550FE3A8990042AD3F /* disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118540FE3A8990042AD3F /* disk.cpp */; };
 		DF6118560FE3A8990042AD3F /* disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118540FE3A8990042AD3F /* disk.cpp */; };
 		DF6118570FE3A8990042AD3F /* disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118540FE3A8990042AD3F /* disk.cpp */; };
-		DF6118680FE3A9410042AD3F /* dxa_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118600FE3A9410042AD3F /* dxa_decoder.cpp */; };
-		DF6118690FE3A9410042AD3F /* flic_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118620FE3A9410042AD3F /* flic_decoder.cpp */; };
-		DF61186A0FE3A9410042AD3F /* smk_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118640FE3A9410042AD3F /* smk_decoder.cpp */; };
-		DF61186D0FE3A9410042AD3F /* dxa_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118600FE3A9410042AD3F /* dxa_decoder.cpp */; };
-		DF61186E0FE3A9410042AD3F /* flic_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118620FE3A9410042AD3F /* flic_decoder.cpp */; };
-		DF61186F0FE3A9410042AD3F /* smk_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118640FE3A9410042AD3F /* smk_decoder.cpp */; };
-		DF6118720FE3A9410042AD3F /* dxa_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118600FE3A9410042AD3F /* dxa_decoder.cpp */; };
-		DF6118730FE3A9410042AD3F /* flic_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118620FE3A9410042AD3F /* flic_decoder.cpp */; };
-		DF6118740FE3A9410042AD3F /* smk_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118640FE3A9410042AD3F /* smk_decoder.cpp */; };
 		DF6118890FE3A9AA0042AD3F /* saveconverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118790FE3A9AA0042AD3F /* saveconverter.cpp */; };
 		DF61188A0FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187B0FE3A9AA0042AD3F /* saveconverter_v2.cpp */; };
 		DF61188B0FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187C0FE3A9AA0042AD3F /* saveconverter_v3.cpp */; };
 		DF61188C0FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187D0FE3A9AA0042AD3F /* saveconverter_v4.cpp */; };
-		DF61188D0FE3A9AA0042AD3F /* saveconverter_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187E0FE3A9AA0042AD3F /* saveconverter_v6.cpp */; };
 		DF61188E0FE3A9AA0042AD3F /* savefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187F0FE3A9AA0042AD3F /* savefile.cpp */; };
 		DF61188F0FE3A9AA0042AD3F /* savehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118810FE3A9AA0042AD3F /* savehandler.cpp */; };
 		DF6118900FE3A9AA0042AD3F /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118830FE3A9AA0042AD3F /* saveload.cpp */; };
@@ -1278,7 +1573,6 @@
 		DF6118960FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187B0FE3A9AA0042AD3F /* saveconverter_v2.cpp */; };
 		DF6118970FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187C0FE3A9AA0042AD3F /* saveconverter_v3.cpp */; };
 		DF6118980FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187D0FE3A9AA0042AD3F /* saveconverter_v4.cpp */; };
-		DF6118990FE3A9AA0042AD3F /* saveconverter_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187E0FE3A9AA0042AD3F /* saveconverter_v6.cpp */; };
 		DF61189A0FE3A9AA0042AD3F /* savefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187F0FE3A9AA0042AD3F /* savefile.cpp */; };
 		DF61189B0FE3A9AA0042AD3F /* savehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118810FE3A9AA0042AD3F /* savehandler.cpp */; };
 		DF61189C0FE3A9AA0042AD3F /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118830FE3A9AA0042AD3F /* saveload.cpp */; };
@@ -1290,7 +1584,6 @@
 		DF6118A20FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187B0FE3A9AA0042AD3F /* saveconverter_v2.cpp */; };
 		DF6118A30FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187C0FE3A9AA0042AD3F /* saveconverter_v3.cpp */; };
 		DF6118A40FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187D0FE3A9AA0042AD3F /* saveconverter_v4.cpp */; };
-		DF6118A50FE3A9AA0042AD3F /* saveconverter_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187E0FE3A9AA0042AD3F /* saveconverter_v6.cpp */; };
 		DF6118A60FE3A9AA0042AD3F /* savefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187F0FE3A9AA0042AD3F /* savefile.cpp */; };
 		DF6118A70FE3A9AA0042AD3F /* savehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118810FE3A9AA0042AD3F /* savehandler.cpp */; };
 		DF6118A80FE3A9AA0042AD3F /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118830FE3A9AA0042AD3F /* saveload.cpp */; };
@@ -1317,9 +1610,6 @@
 		DF6118C80FE3AABD0042AD3F /* player_v2cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118C60FE3AABD0042AD3F /* player_v2cms.cpp */; };
 		DF6118C90FE3AABD0042AD3F /* player_v2cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118C60FE3AABD0042AD3F /* player_v2cms.cpp */; };
 		DF6118CC0FE3AAFD0042AD3F /* hardwarekeys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118CB0FE3AAFD0042AD3F /* hardwarekeys.cpp */; };
-		DF6118D10FE3AB560042AD3F /* mame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118CF0FE3AB560042AD3F /* mame.cpp */; };
-		DF6118D20FE3AB560042AD3F /* mame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118CF0FE3AB560042AD3F /* mame.cpp */; };
-		DF6118D30FE3AB560042AD3F /* mame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118CF0FE3AB560042AD3F /* mame.cpp */; };
 		DF6BF4C410529DA50069811F /* conversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4C010529DA50069811F /* conversion.cpp */; };
 		DF6BF4C510529DA50069811F /* jpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4C210529DA50069811F /* jpeg.cpp */; };
 		DF6BF4C610529DA50069811F /* conversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4C010529DA50069811F /* conversion.cpp */; };
@@ -1353,12 +1643,6 @@
 		DF6BF4FF10529F140069811F /* EventRecorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4F810529F140069811F /* EventRecorder.cpp */; };
 		DF6BF50010529F140069811F /* EventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4F710529F140069811F /* EventDispatcher.cpp */; };
 		DF6BF50110529F140069811F /* EventRecorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4F810529F140069811F /* EventRecorder.cpp */; };
-		DF6BF50610529F540069811F /* maxtrax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF50210529F540069811F /* maxtrax.cpp */; };
-		DF6BF50710529F540069811F /* tfmx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF50410529F540069811F /* tfmx.cpp */; };
-		DF6BF50810529F540069811F /* maxtrax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF50210529F540069811F /* maxtrax.cpp */; };
-		DF6BF50910529F540069811F /* tfmx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF50410529F540069811F /* tfmx.cpp */; };
-		DF6BF50A10529F540069811F /* maxtrax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF50210529F540069811F /* maxtrax.cpp */; };
-		DF6BF50B10529F540069811F /* tfmx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF50410529F540069811F /* tfmx.cpp */; };
 		DF7585CE100CB66E00CC3324 /* expression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C3100CB66E00CC3324 /* expression.cpp */; };
 		DF7585CF100CB66E00CC3324 /* hotspots.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C5100CB66E00CC3324 /* hotspots.cpp */; };
 		DF7585D0100CB66E00CC3324 /* init_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C7100CB66E00CC3324 /* init_v6.cpp */; };
@@ -1435,9 +1719,6 @@
 		DF7F289311FF247300159131 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F289111FF247300159131 /* translation.cpp */; };
 		DF7F289511FF247300159131 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F289111FF247300159131 /* translation.cpp */; };
 		DF7F289711FF247300159131 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F289111FF247300159131 /* translation.cpp */; };
-		DF7F28A011FF24B000159131 /* mac_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F289E11FF24B000159131 /* mac_snd.cpp */; };
-		DF7F28A111FF24B000159131 /* mac_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F289E11FF24B000159131 /* mac_snd.cpp */; };
-		DF7F28A211FF24B000159131 /* mac_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F289E11FF24B000159131 /* mac_snd.cpp */; };
 		DF7F28A511FF24C400159131 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F28A311FF24C400159131 /* console.cpp */; };
 		DF7F28A611FF24C400159131 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F28A311FF24C400159131 /* console.cpp */; };
 		DF7F28A711FF24C400159131 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F28A311FF24C400159131 /* console.cpp */; };
@@ -2067,28 +2348,9 @@
 		DF842A470E7BBBB400F5680E /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A400E7BBBB400F5680E /* archive.cpp */; };
 		DF842A490E7BBBB400F5680E /* unarj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A450E7BBBB400F5680E /* unarj.cpp */; };
 		DF842A6D0E7BBD5700F5680E /* stdiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A6B0E7BBD5700F5680E /* stdiostream.cpp */; };
-		DF842A710E7BBDB200F5680E /* musicplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A6F0E7BBDB200F5680E /* musicplugin.cpp */; };
-		DF895BFE124C24350077F6E8 /* coktel_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895BFC124C24350077F6E8 /* coktel_decoder.cpp */; };
-		DF895BFF124C24350077F6E8 /* coktel_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895BFC124C24350077F6E8 /* coktel_decoder.cpp */; };
-		DF895C00124C24350077F6E8 /* coktel_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895BFC124C24350077F6E8 /* coktel_decoder.cpp */; };
 		DF895C03124C24680077F6E8 /* player_towns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C01124C24680077F6E8 /* player_towns.cpp */; };
 		DF895C04124C24680077F6E8 /* player_towns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C01124C24680077F6E8 /* player_towns.cpp */; };
 		DF895C05124C24680077F6E8 /* player_towns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C01124C24680077F6E8 /* player_towns.cpp */; };
-		DF895C09124C24B60077F6E8 /* appleiigs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C08124C24B50077F6E8 /* appleiigs.cpp */; };
-		DF895C0A124C24B60077F6E8 /* appleiigs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C08124C24B50077F6E8 /* appleiigs.cpp */; };
-		DF895C0B124C24B60077F6E8 /* appleiigs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C08124C24B50077F6E8 /* appleiigs.cpp */; };
-		DF895C15124C24C10077F6E8 /* towns_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C0D124C24C00077F6E8 /* towns_audio.cpp */; };
-		DF895C16124C24C10077F6E8 /* towns_euphony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C0F124C24C00077F6E8 /* towns_euphony.cpp */; };
-		DF895C17124C24C10077F6E8 /* towns_pc98_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C11124C24C00077F6E8 /* towns_pc98_driver.cpp */; };
-		DF895C18124C24C10077F6E8 /* towns_pc98_fmsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C13124C24C00077F6E8 /* towns_pc98_fmsynth.cpp */; };
-		DF895C19124C24C10077F6E8 /* towns_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C0D124C24C00077F6E8 /* towns_audio.cpp */; };
-		DF895C1A124C24C10077F6E8 /* towns_euphony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C0F124C24C00077F6E8 /* towns_euphony.cpp */; };
-		DF895C1B124C24C10077F6E8 /* towns_pc98_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C11124C24C00077F6E8 /* towns_pc98_driver.cpp */; };
-		DF895C1C124C24C10077F6E8 /* towns_pc98_fmsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C13124C24C00077F6E8 /* towns_pc98_fmsynth.cpp */; };
-		DF895C1D124C24C10077F6E8 /* towns_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C0D124C24C00077F6E8 /* towns_audio.cpp */; };
-		DF895C1E124C24C10077F6E8 /* towns_euphony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C0F124C24C00077F6E8 /* towns_euphony.cpp */; };
-		DF895C1F124C24C10077F6E8 /* towns_pc98_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C11124C24C00077F6E8 /* towns_pc98_driver.cpp */; };
-		DF895C20124C24C10077F6E8 /* towns_pc98_fmsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C13124C24C00077F6E8 /* towns_pc98_fmsynth.cpp */; };
 		DF895C25124C25150077F6E8 /* init_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C24124C25150077F6E8 /* init_fascin.cpp */; };
 		DF895C26124C25150077F6E8 /* init_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C24124C25150077F6E8 /* init_fascin.cpp */; };
 		DF895C27124C25150077F6E8 /* init_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C24124C25150077F6E8 /* init_fascin.cpp */; };
@@ -2101,27 +2363,8 @@
 		DF895C41124C271F0077F6E8 /* icon4.png in Resources */ = {isa = PBXBuildFile; fileRef = DF895C40124C271F0077F6E8 /* icon4.png */; };
 		DF895C42124C271F0077F6E8 /* icon4.png in Resources */ = {isa = PBXBuildFile; fileRef = DF895C40124C271F0077F6E8 /* icon4.png */; };
 		DF895C43124C271F0077F6E8 /* icon4.png in Resources */ = {isa = PBXBuildFile; fileRef = DF895C40124C271F0077F6E8 /* icon4.png */; };
-		DF895CB8124E58980077F6E8 /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAB124E58980077F6E8 /* indeo3.cpp */; };
-		DF895CB9124E58980077F6E8 /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAD124E58980077F6E8 /* mjpeg.cpp */; };
-		DF895CBA124E58980077F6E8 /* qdm2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAF124E58980077F6E8 /* qdm2.cpp */; };
-		DF895CBB124E58980077F6E8 /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB2124E58980077F6E8 /* qtrle.cpp */; };
-		DF895CBC124E58980077F6E8 /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB4124E58980077F6E8 /* rpza.cpp */; };
-		DF895CBD124E58990077F6E8 /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB6124E58980077F6E8 /* smc.cpp */; };
-		DF895CBE124E58990077F6E8 /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAB124E58980077F6E8 /* indeo3.cpp */; };
-		DF895CBF124E58990077F6E8 /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAD124E58980077F6E8 /* mjpeg.cpp */; };
-		DF895CC0124E58990077F6E8 /* qdm2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAF124E58980077F6E8 /* qdm2.cpp */; };
-		DF895CC1124E58990077F6E8 /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB2124E58980077F6E8 /* qtrle.cpp */; };
-		DF895CC2124E58990077F6E8 /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB4124E58980077F6E8 /* rpza.cpp */; };
-		DF895CC3124E58990077F6E8 /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB6124E58980077F6E8 /* smc.cpp */; };
-		DF895CC4124E58990077F6E8 /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAB124E58980077F6E8 /* indeo3.cpp */; };
-		DF895CC5124E58990077F6E8 /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAD124E58980077F6E8 /* mjpeg.cpp */; };
-		DF895CC6124E58990077F6E8 /* qdm2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CAF124E58980077F6E8 /* qdm2.cpp */; };
-		DF895CC7124E58990077F6E8 /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB2124E58980077F6E8 /* qtrle.cpp */; };
-		DF895CC8124E58990077F6E8 /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB4124E58980077F6E8 /* rpza.cpp */; };
-		DF895CC9124E58990077F6E8 /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895CB6124E58980077F6E8 /* smc.cpp */; };
 		DF89C2880F62D55C00D756B6 /* sprites_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2870F62D55C00D756B6 /* sprites_lol.cpp */; };
 		DF89C2A40F62D79E00D756B6 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2A30F62D79E00D756B6 /* script.cpp */; };
-		DF89C2BB0F62D91000D756B6 /* timestamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2B80F62D91000D756B6 /* timestamp.cpp */; };
 		DF90E9BF10AEDA9B00C8F93F /* selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90E9BD10AEDA9B00C8F93F /* selector.cpp */; };
 		DF90E9C110AEDA9B00C8F93F /* selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90E9BD10AEDA9B00C8F93F /* selector.cpp */; };
 		DF90E9C310AEDA9B00C8F93F /* selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90E9BD10AEDA9B00C8F93F /* selector.cpp */; };
@@ -2131,12 +2374,6 @@
 		DF90EAAD10B0236F00C8F93F /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAAB10B0236F00C8F93F /* staticres.cpp */; };
 		DF90EAAE10B0236F00C8F93F /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAAB10B0236F00C8F93F /* staticres.cpp */; };
 		DF90EAAF10B0236F00C8F93F /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAAB10B0236F00C8F93F /* staticres.cpp */; };
-		DF90EAB810B023D100C8F93F /* avi_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAB610B023D100C8F93F /* avi_decoder.cpp */; };
-		DF90EAB910B023D100C8F93F /* avi_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAB610B023D100C8F93F /* avi_decoder.cpp */; };
-		DF90EABA10B023D100C8F93F /* avi_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAB610B023D100C8F93F /* avi_decoder.cpp */; };
-		DF90EAC310B023F400C8F93F /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAC110B023F400C8F93F /* msvideo1.cpp */; };
-		DF90EAC410B023F400C8F93F /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAC110B023F400C8F93F /* msvideo1.cpp */; };
-		DF90EAC510B023F400C8F93F /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAC110B023F400C8F93F /* msvideo1.cpp */; };
 		DF9B9248118E46730069C19D /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF9B9246118E46730069C19D /* error.cpp */; };
 		DF9B9249118E46730069C19D /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF9B9246118E46730069C19D /* error.cpp */; };
 		DF9B924A118E46730069C19D /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF9B9246118E46730069C19D /* error.cpp */; };
@@ -2151,15 +2388,13 @@
 		DFAAAFFC0F0112DF003E9390 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAAFFB0F0112DF003E9390 /* detection.cpp */; };
 		DFAAB0020F011392003E9390 /* thumbnail_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */; };
 		DFAAD23D0F50120E00C3A4E2 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAD2390F50120E00C3A4E2 /* console.cpp */; };
-		DFB0576811B753AF0015AE65 /* mpeg_player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0576211B753AF0015AE65 /* mpeg_player.cpp */; };
-		DFB0576911B753AF0015AE65 /* qt_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0576411B753AF0015AE65 /* qt_decoder.cpp */; };
-		DFB0576A11B753AF0015AE65 /* video_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0576611B753AF0015AE65 /* video_decoder.cpp */; };
-		DFB0576B11B753AF0015AE65 /* mpeg_player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0576211B753AF0015AE65 /* mpeg_player.cpp */; };
-		DFB0576C11B753AF0015AE65 /* qt_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0576411B753AF0015AE65 /* qt_decoder.cpp */; };
-		DFB0576D11B753AF0015AE65 /* video_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0576611B753AF0015AE65 /* video_decoder.cpp */; };
-		DFB0576E11B753AF0015AE65 /* mpeg_player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0576211B753AF0015AE65 /* mpeg_player.cpp */; };
-		DFB0576F11B753AF0015AE65 /* qt_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0576411B753AF0015AE65 /* qt_decoder.cpp */; };
-		DFB0577011B753AF0015AE65 /* video_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0576611B753AF0015AE65 /* video_decoder.cpp */; };
+		DFADEBB313820DF500C46364 /* maccursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB113820DF500C46364 /* maccursor.cpp */; };
+		DFADEBB413820DF500C46364 /* maccursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB113820DF500C46364 /* maccursor.cpp */; };
+		DFADEBB513820DF500C46364 /* maccursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB113820DF500C46364 /* maccursor.cpp */; };
+		DFADEBB713820E0C00C46364 /* posix-fs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB613820E0C00C46364 /* posix-fs.cpp */; };
+		DFADEBB813820E0C00C46364 /* posix-fs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB613820E0C00C46364 /* posix-fs.cpp */; };
+		DFADEBB913820E0C00C46364 /* posix-fs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB613820E0C00C46364 /* posix-fs.cpp */; };
+		DFADEC071382140300C46364 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DFADEC061382140300C46364 /* libz.dylib */; };
 		DFB0577611B753DA0015AE65 /* rational.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0577411B753DA0015AE65 /* rational.cpp */; };
 		DFB0577711B753DA0015AE65 /* rational.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0577411B753DA0015AE65 /* rational.cpp */; };
 		DFB0577811B753DA0015AE65 /* rational.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0577411B753DA0015AE65 /* rational.cpp */; };
@@ -2175,9 +2410,6 @@
 		DFB0579111B7547D0015AE65 /* pict.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0578F11B7547D0015AE65 /* pict.cpp */; };
 		DFB0579211B7547D0015AE65 /* pict.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0578F11B7547D0015AE65 /* pict.cpp */; };
 		DFB0579311B7547D0015AE65 /* pict.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0578F11B7547D0015AE65 /* pict.cpp */; };
-		DFB0579811B7549C0015AE65 /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0579611B7549C0015AE65 /* cinepak.cpp */; };
-		DFB0579911B7549C0015AE65 /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0579611B7549C0015AE65 /* cinepak.cpp */; };
-		DFB0579A11B7549C0015AE65 /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0579611B7549C0015AE65 /* cinepak.cpp */; };
 		DFC831210F48AF19005EF03C /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8301A0F48AF18005EF03C /* detection.cpp */; };
 		DFC831240F48AF19005EF03C /* gc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8301E0F48AF18005EF03C /* gc.cpp */; };
 		DFC831270F48AF19005EF03C /* kernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830230F48AF18005EF03C /* kernel.cpp */; };
@@ -2207,9 +2439,6 @@
 		DFCDC6F711662AAB00A7D2A0 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6F611662AAB00A7D2A0 /* resource.cpp */; };
 		DFCDC6F811662AAB00A7D2A0 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6F611662AAB00A7D2A0 /* resource.cpp */; };
 		DFCDC6F911662AAB00A7D2A0 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6F611662AAB00A7D2A0 /* resource.cpp */; };
-		DFCDC6FE11662AD700A7D2A0 /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6FC11662AD700A7D2A0 /* msrle.cpp */; };
-		DFCDC6FF11662AD700A7D2A0 /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6FC11662AD700A7D2A0 /* msrle.cpp */; };
-		DFCDC70011662AD700A7D2A0 /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6FC11662AD700A7D2A0 /* msrle.cpp */; };
 		DFCDC70411662B0200A7D2A0 /* saveload_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC70311662B0200A7D2A0 /* saveload_fascin.cpp */; };
 		DFCDC70511662B0200A7D2A0 /* saveload_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC70311662B0200A7D2A0 /* saveload_fascin.cpp */; };
 		DFCDC70611662B0200A7D2A0 /* saveload_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC70311662B0200A7D2A0 /* saveload_fascin.cpp */; };
@@ -2268,41 +2497,14 @@
 		DFE47C200D81F4E900B6D1FB /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477910D81F4E900B6D1FB /* console.cpp */; };
 		DFE47C210D81F4E900B6D1FB /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477940D81F4E900B6D1FB /* debugger.cpp */; };
 		DFE47C220D81F4E900B6D1FB /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477960D81F4E900B6D1FB /* dialog.cpp */; };
-		DFE47C230D81F4E900B6D1FB /* editable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477980D81F4E900B6D1FB /* editable.cpp */; };
-		DFE47C240D81F4E900B6D1FB /* EditTextWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4779A0D81F4E900B6D1FB /* EditTextWidget.cpp */; };
 		DFE47C260D81F4E900B6D1FB /* Key.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4779E0D81F4E900B6D1FB /* Key.cpp */; };
 		DFE47C280D81F4E900B6D1FB /* launcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A20D81F4E900B6D1FB /* launcher.cpp */; };
-		DFE47C290D81F4E900B6D1FB /* ListWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A40D81F4E900B6D1FB /* ListWidget.cpp */; };
 		DFE47C2A0D81F4E900B6D1FB /* massadd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A60D81F4E900B6D1FB /* massadd.cpp */; };
 		DFE47C2B0D81F4E900B6D1FB /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A80D81F4E900B6D1FB /* message.cpp */; };
 		DFE47C2E0D81F4E900B6D1FB /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AD0D81F4E900B6D1FB /* object.cpp */; };
 		DFE47C2F0D81F4E900B6D1FB /* options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AF0D81F4E900B6D1FB /* options.cpp */; };
-		DFE47C300D81F4E900B6D1FB /* PopUpWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B10D81F4E900B6D1FB /* PopUpWidget.cpp */; };
-		DFE47C310D81F4E900B6D1FB /* ScrollBarWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B30D81F4E900B6D1FB /* ScrollBarWidget.cpp */; };
-		DFE47C320D81F4E900B6D1FB /* TabWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B50D81F4E900B6D1FB /* TabWidget.cpp */; };
 		DFE47C350D81F4E900B6D1FB /* themebrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477BA0D81F4E900B6D1FB /* themebrowser.cpp */; };
 		DFE47C3B0D81F4E900B6D1FB /* widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477C40D81F4E900B6D1FB /* widget.cpp */; };
-		DFE47C3E0D81F4E900B6D1FB /* audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477CB0D81F4E900B6D1FB /* audiocd.cpp */; };
-		DFE47C3F0D81F4E900B6D1FB /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477CD0D81F4E900B6D1FB /* audiostream.cpp */; };
-		DFE47C410D81F4E900B6D1FB /* fmopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D10D81F4E900B6D1FB /* fmopl.cpp */; };
-		DFE47C430D81F4E900B6D1FB /* mididrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D50D81F4E900B6D1FB /* mididrv.cpp */; };
-		DFE47C440D81F4E900B6D1FB /* midiparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D70D81F4E900B6D1FB /* midiparser.cpp */; };
-		DFE47C450D81F4E900B6D1FB /* midiparser_smf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D90D81F4E900B6D1FB /* midiparser_smf.cpp */; };
-		DFE47C460D81F4E900B6D1FB /* midiparser_xmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DA0D81F4E900B6D1FB /* midiparser_xmidi.cpp */; };
-		DFE47C470D81F4E900B6D1FB /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DB0D81F4E900B6D1FB /* mixer.cpp */; };
-		DFE47C480D81F4E900B6D1FB /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DE0D81F4E900B6D1FB /* infogrames.cpp */; };
-		DFE47C490D81F4E900B6D1FB /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E00D81F4E900B6D1FB /* module.cpp */; };
-		DFE47C4A0D81F4E900B6D1FB /* paula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E20D81F4E900B6D1FB /* paula.cpp */; };
-		DFE47C4B0D81F4E900B6D1FB /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E40D81F4E900B6D1FB /* protracker.cpp */; };
-		DFE47C4C0D81F4E900B6D1FB /* rjp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E60D81F4E900B6D1FB /* rjp1.cpp */; };
-		DFE47C4D0D81F4E900B6D1FB /* soundfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E80D81F4E900B6D1FB /* soundfx.cpp */; };
-		DFE47C500D81F4E900B6D1FB /* mpu401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477ED0D81F4E900B6D1FB /* mpu401.cpp */; };
-		DFE47C510D81F4E900B6D1FB /* null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477EF0D81F4E900B6D1FB /* null.cpp */; };
-		DFE47C520D81F4E900B6D1FB /* rate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F00D81F4E900B6D1FB /* rate.cpp */; };
-		DFE47C570D81F4E900B6D1FB /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F70D81F4E900B6D1FB /* adlib.cpp */; };
-		DFE47C580D81F4E900B6D1FB /* fluidsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F90D81F4E900B6D1FB /* fluidsynth.cpp */; };
-		DFE47C740D81F4E900B6D1FB /* pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE478210D81F4E900B6D1FB /* pcspk.cpp */; };
-		DFE47C750D81F4E900B6D1FB /* ym2612.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE478230D81F4E900B6D1FB /* ym2612.cpp */; };
 		DFE47C870D81F86900B6D1FB /* kyra.dat in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C810D81F86900B6D1FB /* kyra.dat */; };
 		DFE47C880D81F86900B6D1FB /* lure.dat in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C820D81F86900B6D1FB /* lure.dat */; };
 		DFE47C890D81F86900B6D1FB /* queen.tbl in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C830D81F86900B6D1FB /* queen.tbl */; };
@@ -2318,11 +2520,6 @@
 		DFEC5D361166C67300C90552 /* savestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D341166C67300C90552 /* savestate.cpp */; };
 		DFEC5D371166C67300C90552 /* savestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D341166C67300C90552 /* savestate.cpp */; };
 		DFEC5D381166C67300C90552 /* savestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D341166C67300C90552 /* savestate.cpp */; };
-		DFEC5D3F1166C6B400C90552 /* dbopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D3D1166C6B400C90552 /* dbopl.cpp */; };
-		DFEC5D401166C6B400C90552 /* dbopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D3D1166C6B400C90552 /* dbopl.cpp */; };
-		DFEC5D411166C6B400C90552 /* dbopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D3D1166C6B400C90552 /* dbopl.cpp */; };
-		DFF958AF0FB222F300A3EC78 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958A90FB222F300A3EC78 /* dosbox.cpp */; };
-		DFF958B20FB222F300A3EC78 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958A90FB222F300A3EC78 /* dosbox.cpp */; };
 		DFF959050FB22D3000A3EC78 /* libmad.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DFD6476C0F49F7EF008E18EF /* libmad.a */; };
 		DFF959060FB22D3100A3EC78 /* libFLAC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DFD6476B0F49F7EF008E18EF /* libFLAC.a */; };
 		DFF959080FB22D3300A3EC78 /* libvorbisidec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DFD6476F0F49F7EF008E18EF /* libvorbisidec.a */; };
@@ -2375,41 +2572,14 @@
 		DFF9593E0FB22D5700A3EC78 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477910D81F4E900B6D1FB /* console.cpp */; };
 		DFF9593F0FB22D5700A3EC78 /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477940D81F4E900B6D1FB /* debugger.cpp */; };
 		DFF959400FB22D5700A3EC78 /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477960D81F4E900B6D1FB /* dialog.cpp */; };
-		DFF959410FB22D5700A3EC78 /* editable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477980D81F4E900B6D1FB /* editable.cpp */; };
-		DFF959420FB22D5700A3EC78 /* EditTextWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4779A0D81F4E900B6D1FB /* EditTextWidget.cpp */; };
 		DFF959430FB22D5700A3EC78 /* Key.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4779E0D81F4E900B6D1FB /* Key.cpp */; };
 		DFF959440FB22D5700A3EC78 /* launcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A20D81F4E900B6D1FB /* launcher.cpp */; };
-		DFF959450FB22D5700A3EC78 /* ListWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A40D81F4E900B6D1FB /* ListWidget.cpp */; };
 		DFF959460FB22D5700A3EC78 /* massadd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A60D81F4E900B6D1FB /* massadd.cpp */; };
 		DFF959470FB22D5700A3EC78 /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A80D81F4E900B6D1FB /* message.cpp */; };
 		DFF959480FB22D5700A3EC78 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AD0D81F4E900B6D1FB /* object.cpp */; };
 		DFF959490FB22D5700A3EC78 /* options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AF0D81F4E900B6D1FB /* options.cpp */; };
-		DFF9594A0FB22D5700A3EC78 /* PopUpWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B10D81F4E900B6D1FB /* PopUpWidget.cpp */; };
-		DFF9594B0FB22D5700A3EC78 /* ScrollBarWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B30D81F4E900B6D1FB /* ScrollBarWidget.cpp */; };
-		DFF9594C0FB22D5700A3EC78 /* TabWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477B50D81F4E900B6D1FB /* TabWidget.cpp */; };
 		DFF9594D0FB22D5700A3EC78 /* themebrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477BA0D81F4E900B6D1FB /* themebrowser.cpp */; };
 		DFF9594E0FB22D5700A3EC78 /* widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477C40D81F4E900B6D1FB /* widget.cpp */; };
-		DFF959510FB22D5700A3EC78 /* audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477CB0D81F4E900B6D1FB /* audiocd.cpp */; };
-		DFF959520FB22D5700A3EC78 /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477CD0D81F4E900B6D1FB /* audiostream.cpp */; };
-		DFF959540FB22D5700A3EC78 /* fmopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D10D81F4E900B6D1FB /* fmopl.cpp */; };
-		DFF959560FB22D5700A3EC78 /* mididrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D50D81F4E900B6D1FB /* mididrv.cpp */; };
-		DFF959570FB22D5700A3EC78 /* midiparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D70D81F4E900B6D1FB /* midiparser.cpp */; };
-		DFF959580FB22D5700A3EC78 /* midiparser_smf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477D90D81F4E900B6D1FB /* midiparser_smf.cpp */; };
-		DFF959590FB22D5700A3EC78 /* midiparser_xmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DA0D81F4E900B6D1FB /* midiparser_xmidi.cpp */; };
-		DFF9595A0FB22D5700A3EC78 /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DB0D81F4E900B6D1FB /* mixer.cpp */; };
-		DFF9595B0FB22D5700A3EC78 /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477DE0D81F4E900B6D1FB /* infogrames.cpp */; };
-		DFF9595C0FB22D5700A3EC78 /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E00D81F4E900B6D1FB /* module.cpp */; };
-		DFF9595D0FB22D5700A3EC78 /* paula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E20D81F4E900B6D1FB /* paula.cpp */; };
-		DFF9595E0FB22D5700A3EC78 /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E40D81F4E900B6D1FB /* protracker.cpp */; };
-		DFF9595F0FB22D5700A3EC78 /* rjp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E60D81F4E900B6D1FB /* rjp1.cpp */; };
-		DFF959600FB22D5700A3EC78 /* soundfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477E80D81F4E900B6D1FB /* soundfx.cpp */; };
-		DFF959620FB22D5700A3EC78 /* mpu401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477ED0D81F4E900B6D1FB /* mpu401.cpp */; };
-		DFF959630FB22D5700A3EC78 /* null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477EF0D81F4E900B6D1FB /* null.cpp */; };
-		DFF959640FB22D5700A3EC78 /* rate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F00D81F4E900B6D1FB /* rate.cpp */; };
-		DFF959650FB22D5700A3EC78 /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F70D81F4E900B6D1FB /* adlib.cpp */; };
-		DFF959660FB22D5700A3EC78 /* fluidsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477F90D81F4E900B6D1FB /* fluidsynth.cpp */; };
-		DFF959670FB22D5700A3EC78 /* pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE478210D81F4E900B6D1FB /* pcspk.cpp */; };
-		DFF959680FB22D5700A3EC78 /* ym2612.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE478230D81F4E900B6D1FB /* ym2612.cpp */; };
 		DFF9596C0FB22D5700A3EC78 /* memorypool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD511460DF3383500854012 /* memorypool.cpp */; };
 		DFF9596D0FB22D5700A3EC78 /* seq.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD517E10DF33CAC00854012 /* seq.cpp */; };
 		DFF9596E0FB22D5700A3EC78 /* scaler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD5183B0DF3411800854012 /* scaler.cpp */; };
@@ -3040,7 +3210,6 @@
 		DFF95C0F0FB22D5700A3EC78 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A400E7BBBB400F5680E /* archive.cpp */; };
 		DFF95C100FB22D5700A3EC78 /* unarj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A450E7BBBB400F5680E /* unarj.cpp */; };
 		DFF95C110FB22D5700A3EC78 /* stdiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A6B0E7BBD5700F5680E /* stdiostream.cpp */; };
-		DFF95C120FB22D5700A3EC78 /* musicplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A6F0E7BBDB200F5680E /* musicplugin.cpp */; };
 		DFF95C130FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF00ED5FC77001CB19F /* saveload.cpp */; };
 		DFF95C140FB22D5700A3EC78 /* ThemeEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF40ED5FC77001CB19F /* ThemeEngine.cpp */; };
 		DFF95C150FB22D5700A3EC78 /* ThemeEval.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF60ED5FC77001CB19F /* ThemeEval.cpp */; };
@@ -3057,7 +3226,6 @@
 		DFF95C200FB22D5700A3EC78 /* thumbnail_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */; };
 		DFF95C210FB22D5700A3EC78 /* dither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFB900F485D890006E566 /* dither.cpp */; };
 		DFF95C270FB22D5700A3EC78 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD10F485DFB0006E566 /* debug.cpp */; };
-		DFF95C280FB22D5700A3EC78 /* gui-manager.hcpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* gui-manager.hcpp */; };
 		DFF95C290FB22D5700A3EC78 /* posix-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBF80F4860A60006E566 /* posix-saves.cpp */; };
 		DFF95C2A0FB22D5700A3EC78 /* bmv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC1F0F4862520006E566 /* bmv.cpp */; };
 		DFF95C2B0FB22D5700A3EC78 /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC200F4862520006E566 /* dialogs.cpp */; };
@@ -3129,7 +3297,6 @@
 		DFF95C920FB22D5700A3EC78 /* timer_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573CBD0F5A85E100961A72 /* timer_lol.cpp */; };
 		DFF95C940FB22D5700A3EC78 /* sprites_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2870F62D55C00D756B6 /* sprites_lol.cpp */; };
 		DFF95C950FB22D5700A3EC78 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2A30F62D79E00D756B6 /* script.cpp */; };
-		DFF95C980FB22D5700A3EC78 /* timestamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2B80F62D91000D756B6 /* timestamp.cpp */; };
 		DFF95C990FB22D5700A3EC78 /* pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5C0F63CAD4002D821E /* pn.cpp */; };
 		DFF95C9A0FB22D5700A3EC78 /* script_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5D0F63CAD4002D821E /* script_pn.cpp */; };
 		DFF95C9B0FB22D5700A3EC78 /* vga_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5E0F63CAD4002D821E /* vga_pn.cpp */; };
@@ -3144,7 +3311,6 @@
 		DFF95CB30FB22D5700A3EC78 /* inter_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC0F0FAC4E1900A5AFD7 /* inter_fascin.cpp */; };
 		DFF95CB40FB22D5700A3EC78 /* script_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC260FAC4EAB00A5AFD7 /* script_v3.cpp */; };
 		DFF95CB50FB22D5700A3EC78 /* script_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC270FAC4EAB00A5AFD7 /* script_v4.cpp */; };
-		DFF95CB70FB22D5700A3EC78 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958A90FB222F300A3EC78 /* dosbox.cpp */; };
 		DFF95CBC0FB22D5700A3EC78 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A160E7BB34E00F5680E /* CoreAudio.framework */; };
 		DFF95CBD0FB22D5700A3EC78 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A170E7BB34E00F5680E /* CoreFoundation.framework */; };
 		DFF95CBE0FB22D5700A3EC78 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A180E7BB34E00F5680E /* Foundation.framework */; };
@@ -3203,12 +3369,9 @@
 		8CD1ECC6126202AA00FA198C /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
 		8CD1ECC7126202AA00FA198C /* display.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = display.cpp; sourceTree = "<group>"; };
 		8CD1ECC8126202AA00FA198C /* display.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = display.h; sourceTree = "<group>"; };
-		8CD1ECC9126202AA00FA198C /* engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = engine.cpp; sourceTree = "<group>"; };
-		8CD1ECCA126202AA00FA198C /* engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = engine.h; sourceTree = "<group>"; };
 		8CD1ECCB126202AA00FA198C /* file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file.cpp; sourceTree = "<group>"; };
 		8CD1ECCC126202AA00FA198C /* file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = file.h; sourceTree = "<group>"; };
 		8CD1ECCD126202AA00FA198C /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = "<group>"; };
-		8CD1ECCE126202AA00FA198C /* global.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = global.h; sourceTree = "<group>"; };
 		8CD1ECCF126202AA00FA198C /* hugo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hugo.cpp; sourceTree = "<group>"; };
 		8CD1ECD0126202AA00FA198C /* hugo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hugo.h; sourceTree = "<group>"; };
 		8CD1ECD1126202AA00FA198C /* intro.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = intro.cpp; sourceTree = "<group>"; };
@@ -3305,8 +3468,6 @@
 		DF093E5D0F63CAD4002D821E /* script_pn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_pn.cpp; sourceTree = "<group>"; };
 		DF093E5E0F63CAD4002D821E /* vga_pn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vga_pn.cpp; sourceTree = "<group>"; };
 		DF09422A0F63CB26002D821E /* ScummVM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ScummVM.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		DF0942350F63CB9A002D821E /* events.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = events.cpp; sourceTree = "<group>"; };
-		DF0942370F63CB9A002D821E /* graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = graphics.cpp; sourceTree = "<group>"; };
 		DF0942390F63CB9A002D821E /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
 		DF09423C0F63CB9A002D821E /* sdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdl.cpp; sourceTree = "<group>"; };
 		DF09423D0F63CB9A002D821E /* sdl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdl.h; sourceTree = "<group>"; };
@@ -3339,8 +3500,156 @@
 		DF09CC260FAC4EAB00A5AFD7 /* script_v3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v3.cpp; sourceTree = "<group>"; };
 		DF09CC270FAC4EAB00A5AFD7 /* script_v4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v4.cpp; sourceTree = "<group>"; };
 		DF0E30391252C5BD0082D593 /* cms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cms.cpp; sourceTree = "<group>"; };
-		DF0E303F1252C6090082D593 /* cms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cms.cpp; sourceTree = "<group>"; };
-		DF0E30401252C6090082D593 /* cms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cms.h; sourceTree = "<group>"; };
+		DF203F461380C06E0056300A /* gui-manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "gui-manager.cpp"; sourceTree = "<group>"; };
+		DF203F531380C2740056300A /* avi_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = avi_decoder.cpp; path = ../../video/avi_decoder.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F541380C2740056300A /* avi_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = avi_decoder.h; path = ../../video/avi_decoder.h; sourceTree = SOURCE_ROOT; };
+		DF203F551380C2740056300A /* coktel_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = coktel_decoder.cpp; path = ../../video/coktel_decoder.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F561380C2740056300A /* coktel_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = coktel_decoder.h; path = ../../video/coktel_decoder.h; sourceTree = SOURCE_ROOT; };
+		DF203F571380C2740056300A /* dxa_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dxa_decoder.cpp; path = ../../video/dxa_decoder.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F581380C2740056300A /* dxa_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dxa_decoder.h; path = ../../video/dxa_decoder.h; sourceTree = SOURCE_ROOT; };
+		DF203F591380C2740056300A /* flic_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = flic_decoder.cpp; path = ../../video/flic_decoder.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F5A1380C2740056300A /* flic_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = flic_decoder.h; path = ../../video/flic_decoder.h; sourceTree = SOURCE_ROOT; };
+		DF203F5D1380C2740056300A /* qt_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qt_decoder.cpp; path = ../../video/qt_decoder.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F5E1380C2750056300A /* qt_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qt_decoder.h; path = ../../video/qt_decoder.h; sourceTree = SOURCE_ROOT; };
+		DF203F5F1380C2750056300A /* smk_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = smk_decoder.cpp; path = ../../video/smk_decoder.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F601380C2750056300A /* smk_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = smk_decoder.h; path = ../../video/smk_decoder.h; sourceTree = SOURCE_ROOT; };
+		DF203F611380C2750056300A /* video_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = video_decoder.cpp; path = ../../video/video_decoder.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F621380C2750056300A /* video_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = video_decoder.h; path = ../../video/video_decoder.h; sourceTree = SOURCE_ROOT; };
+		DF203F7C1380C2920056300A /* cdtoons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cdtoons.cpp; path = ../../video/codecs/cdtoons.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F7D1380C2920056300A /* cdtoons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cdtoons.h; path = ../../video/codecs/cdtoons.h; sourceTree = SOURCE_ROOT; };
+		DF203F7E1380C2920056300A /* cinepak.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cinepak.cpp; path = ../../video/codecs/cinepak.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F7F1380C2920056300A /* cinepak.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cinepak.h; path = ../../video/codecs/cinepak.h; sourceTree = SOURCE_ROOT; };
+		DF203F801380C2920056300A /* codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = codec.h; path = ../../video/codecs/codec.h; sourceTree = SOURCE_ROOT; };
+		DF203F811380C2920056300A /* indeo3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = indeo3.cpp; path = ../../video/codecs/indeo3.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F821380C2920056300A /* indeo3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = indeo3.h; path = ../../video/codecs/indeo3.h; sourceTree = SOURCE_ROOT; };
+		DF203F831380C2920056300A /* mjpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mjpeg.cpp; path = ../../video/codecs/mjpeg.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F841380C2920056300A /* mjpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mjpeg.h; path = ../../video/codecs/mjpeg.h; sourceTree = SOURCE_ROOT; };
+		DF203F851380C2920056300A /* msrle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = msrle.cpp; path = ../../video/codecs/msrle.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F861380C2920056300A /* msrle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = msrle.h; path = ../../video/codecs/msrle.h; sourceTree = SOURCE_ROOT; };
+		DF203F871380C2920056300A /* msvideo1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = msvideo1.cpp; path = ../../video/codecs/msvideo1.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F881380C2920056300A /* msvideo1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = msvideo1.h; path = ../../video/codecs/msvideo1.h; sourceTree = SOURCE_ROOT; };
+		DF203F891380C2920056300A /* qdm2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qdm2.cpp; path = ../../video/codecs/qdm2.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F8A1380C2920056300A /* qdm2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qdm2.h; path = ../../video/codecs/qdm2.h; sourceTree = SOURCE_ROOT; };
+		DF203F8B1380C2920056300A /* qdm2data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qdm2data.h; path = ../../video/codecs/qdm2data.h; sourceTree = SOURCE_ROOT; };
+		DF203F8C1380C2920056300A /* qtrle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qtrle.cpp; path = ../../video/codecs/qtrle.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F8D1380C2920056300A /* qtrle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qtrle.h; path = ../../video/codecs/qtrle.h; sourceTree = SOURCE_ROOT; };
+		DF203F8E1380C2920056300A /* rpza.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rpza.cpp; path = ../../video/codecs/rpza.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F8F1380C2920056300A /* rpza.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rpza.h; path = ../../video/codecs/rpza.h; sourceTree = SOURCE_ROOT; };
+		DF203F901380C2920056300A /* smc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = smc.cpp; path = ../../video/codecs/smc.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F911380C2920056300A /* smc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = smc.h; path = ../../video/codecs/smc.h; sourceTree = SOURCE_ROOT; };
+		DF203F921380C2920056300A /* truemotion1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = truemotion1.cpp; path = ../../video/codecs/truemotion1.cpp; sourceTree = SOURCE_ROOT; };
+		DF203F931380C2920056300A /* truemotion1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = truemotion1.h; path = ../../video/codecs/truemotion1.h; sourceTree = SOURCE_ROOT; };
+		DF203F941380C2920056300A /* truemotion1data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = truemotion1data.h; path = ../../video/codecs/truemotion1data.h; sourceTree = SOURCE_ROOT; };
+		DF203FC01380C3BC0056300A /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
+		DF203FC11380C3BC0056300A /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
+		DF203FC21380C3BC0056300A /* dialogs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dialogs.cpp; sourceTree = "<group>"; };
+		DF203FC31380C3BC0056300A /* dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dialogs.h; sourceTree = "<group>"; };
+		DF203FC41380C3BC0056300A /* file_v1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_v1d.cpp; sourceTree = "<group>"; };
+		DF203FC51380C3BC0056300A /* file_v1w.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_v1w.cpp; sourceTree = "<group>"; };
+		DF203FC61380C3BC0056300A /* file_v2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_v2d.cpp; sourceTree = "<group>"; };
+		DF203FC71380C3BC0056300A /* file_v2w.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_v2w.cpp; sourceTree = "<group>"; };
+		DF203FC81380C3BC0056300A /* file_v3d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_v3d.cpp; sourceTree = "<group>"; };
+		DF203FC91380C3BC0056300A /* object_v1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object_v1d.cpp; sourceTree = "<group>"; };
+		DF203FCA1380C3BC0056300A /* object_v1w.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object_v1w.cpp; sourceTree = "<group>"; };
+		DF203FCB1380C3BC0056300A /* object_v2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object_v2d.cpp; sourceTree = "<group>"; };
+		DF203FCC1380C3BC0056300A /* object_v3d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object_v3d.cpp; sourceTree = "<group>"; };
+		DF203FCD1380C3BC0056300A /* object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object.cpp; sourceTree = "<group>"; };
+		DF203FCE1380C3BC0056300A /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; };
+		DF203FCF1380C3BC0056300A /* parser_v1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser_v1d.cpp; sourceTree = "<group>"; };
+		DF203FD01380C3BC0056300A /* parser_v1w.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser_v1w.cpp; sourceTree = "<group>"; };
+		DF203FD11380C3BC0056300A /* parser_v2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser_v2d.cpp; sourceTree = "<group>"; };
+		DF203FD21380C3BC0056300A /* parser_v3d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser_v3d.cpp; sourceTree = "<group>"; };
+		DF203FD31380C3BC0056300A /* text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text.cpp; sourceTree = "<group>"; };
+		DF203FD41380C3BC0056300A /* text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text.h; sourceTree = "<group>"; };
+		DF2040221380C8B70056300A /* editable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = editable.cpp; path = widgets/editable.cpp; sourceTree = "<group>"; };
+		DF2040231380C8B70056300A /* editable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = editable.h; path = widgets/editable.h; sourceTree = "<group>"; };
+		DF2040241380C8B70056300A /* edittext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = edittext.cpp; path = widgets/edittext.cpp; sourceTree = "<group>"; };
+		DF2040251380C8B70056300A /* edittext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = edittext.h; path = widgets/edittext.h; sourceTree = "<group>"; };
+		DF2040261380C8B70056300A /* list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = list.cpp; path = widgets/list.cpp; sourceTree = "<group>"; };
+		DF2040271380C8B70056300A /* list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = list.h; path = widgets/list.h; sourceTree = "<group>"; };
+		DF2040281380C8B70056300A /* popup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = popup.cpp; path = widgets/popup.cpp; sourceTree = "<group>"; };
+		DF2040291380C8B70056300A /* popup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = popup.h; path = widgets/popup.h; sourceTree = "<group>"; };
+		DF20402A1380C8B70056300A /* scrollbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = scrollbar.cpp; path = widgets/scrollbar.cpp; sourceTree = "<group>"; };
+		DF20402B1380C8B70056300A /* scrollbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scrollbar.h; path = widgets/scrollbar.h; sourceTree = "<group>"; };
+		DF20402C1380C8B70056300A /* tab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tab.cpp; path = widgets/tab.cpp; sourceTree = "<group>"; };
+		DF20402D1380C8B70056300A /* tab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tab.h; path = widgets/tab.h; sourceTree = "<group>"; };
+		DF2040471380CA230056300A /* audiostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = audiostream.cpp; path = ../../audio/audiostream.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040481380CA230056300A /* audiostream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audiostream.h; path = ../../audio/audiostream.h; sourceTree = SOURCE_ROOT; };
+		DF2040491380CA230056300A /* fmopl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fmopl.cpp; path = ../../audio/fmopl.cpp; sourceTree = SOURCE_ROOT; };
+		DF20404A1380CA230056300A /* fmopl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fmopl.h; path = ../../audio/fmopl.h; sourceTree = SOURCE_ROOT; };
+		DF20404B1380CA230056300A /* mididrv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mididrv.cpp; path = ../../audio/mididrv.cpp; sourceTree = SOURCE_ROOT; };
+		DF20404C1380CA230056300A /* mididrv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mididrv.h; path = ../../audio/mididrv.h; sourceTree = SOURCE_ROOT; };
+		DF20404D1380CA230056300A /* midiparser_smf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = midiparser_smf.cpp; path = ../../audio/midiparser_smf.cpp; sourceTree = SOURCE_ROOT; };
+		DF20404E1380CA230056300A /* midiparser_xmidi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = midiparser_xmidi.cpp; path = ../../audio/midiparser_xmidi.cpp; sourceTree = SOURCE_ROOT; };
+		DF20404F1380CA230056300A /* midiparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = midiparser.cpp; path = ../../audio/midiparser.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040501380CA230056300A /* midiparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = midiparser.h; path = ../../audio/midiparser.h; sourceTree = SOURCE_ROOT; };
+		DF2040511380CA230056300A /* midiplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = midiplayer.cpp; path = ../../audio/midiplayer.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040521380CA230056300A /* midiplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = midiplayer.h; path = ../../audio/midiplayer.h; sourceTree = SOURCE_ROOT; };
+		DF2040531380CA230056300A /* mixer_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mixer_intern.h; path = ../../audio/mixer_intern.h; sourceTree = SOURCE_ROOT; };
+		DF2040541380CA230056300A /* mixer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mixer.cpp; path = ../../audio/mixer.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040551380CA230056300A /* mixer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mixer.h; path = ../../audio/mixer.h; sourceTree = SOURCE_ROOT; };
+		DF2040561380CA230056300A /* mpu401.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mpu401.cpp; path = ../../audio/mpu401.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040571380CA230056300A /* mpu401.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mpu401.h; path = ../../audio/mpu401.h; sourceTree = SOURCE_ROOT; };
+		DF2040581380CA230056300A /* musicplugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = musicplugin.cpp; path = ../../audio/musicplugin.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040591380CA230056300A /* musicplugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = musicplugin.h; path = ../../audio/musicplugin.h; sourceTree = SOURCE_ROOT; };
+		DF20405A1380CA230056300A /* rate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rate.cpp; path = ../../audio/rate.cpp; sourceTree = SOURCE_ROOT; };
+		DF20405B1380CA230056300A /* rate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rate.h; path = ../../audio/rate.h; sourceTree = SOURCE_ROOT; };
+		DF20405C1380CA230056300A /* timestamp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = timestamp.cpp; path = ../../audio/timestamp.cpp; sourceTree = SOURCE_ROOT; };
+		DF20405D1380CA230056300A /* timestamp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = timestamp.h; path = ../../audio/timestamp.h; sourceTree = SOURCE_ROOT; };
+		DF2040831380CA400056300A /* adpcm_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = adpcm_intern.h; path = ../../audio/decoders/adpcm_intern.h; sourceTree = SOURCE_ROOT; };
+		DF2040841380CA400056300A /* adpcm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = adpcm.cpp; path = ../../audio/decoders/adpcm.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040851380CA400056300A /* adpcm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = adpcm.h; path = ../../audio/decoders/adpcm.h; sourceTree = SOURCE_ROOT; };
+		DF2040861380CA400056300A /* aiff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aiff.cpp; path = ../../audio/decoders/aiff.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040871380CA400056300A /* aiff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aiff.h; path = ../../audio/decoders/aiff.h; sourceTree = SOURCE_ROOT; };
+		DF2040881380CA400056300A /* flac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = flac.cpp; path = ../../audio/decoders/flac.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040891380CA400056300A /* flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = flac.h; path = ../../audio/decoders/flac.h; sourceTree = SOURCE_ROOT; };
+		DF20408A1380CA400056300A /* iff_sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = iff_sound.cpp; path = ../../audio/decoders/iff_sound.cpp; sourceTree = SOURCE_ROOT; };
+		DF20408B1380CA400056300A /* iff_sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iff_sound.h; path = ../../audio/decoders/iff_sound.h; sourceTree = SOURCE_ROOT; };
+		DF20408C1380CA400056300A /* mac_snd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mac_snd.cpp; path = ../../audio/decoders/mac_snd.cpp; sourceTree = SOURCE_ROOT; };
+		DF20408D1380CA400056300A /* mac_snd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mac_snd.h; path = ../../audio/decoders/mac_snd.h; sourceTree = SOURCE_ROOT; };
+		DF20408E1380CA400056300A /* mp3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mp3.cpp; path = ../../audio/decoders/mp3.cpp; sourceTree = SOURCE_ROOT; };
+		DF20408F1380CA400056300A /* mp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mp3.h; path = ../../audio/decoders/mp3.h; sourceTree = SOURCE_ROOT; };
+		DF2040901380CA400056300A /* raw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = raw.cpp; path = ../../audio/decoders/raw.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040911380CA400056300A /* raw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = raw.h; path = ../../audio/decoders/raw.h; sourceTree = SOURCE_ROOT; };
+		DF2040921380CA400056300A /* vag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vag.cpp; path = ../../audio/decoders/vag.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040931380CA400056300A /* vag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vag.h; path = ../../audio/decoders/vag.h; sourceTree = SOURCE_ROOT; };
+		DF2040941380CA400056300A /* voc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = voc.cpp; path = ../../audio/decoders/voc.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040951380CA400056300A /* voc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = voc.h; path = ../../audio/decoders/voc.h; sourceTree = SOURCE_ROOT; };
+		DF2040961380CA400056300A /* vorbis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vorbis.cpp; path = ../../audio/decoders/vorbis.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040971380CA400056300A /* vorbis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vorbis.h; path = ../../audio/decoders/vorbis.h; sourceTree = SOURCE_ROOT; };
+		DF2040981380CA400056300A /* wave.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wave.cpp; path = ../../audio/decoders/wave.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040991380CA400056300A /* wave.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wave.h; path = ../../audio/decoders/wave.h; sourceTree = SOURCE_ROOT; };
+		DF2040BC1380CA810056300A /* infogrames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = infogrames.cpp; path = ../../audio/mods/infogrames.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040BD1380CA810056300A /* infogrames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = infogrames.h; path = ../../audio/mods/infogrames.h; sourceTree = SOURCE_ROOT; };
+		DF2040BE1380CA810056300A /* maxtrax.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = maxtrax.cpp; path = ../../audio/mods/maxtrax.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040BF1380CA810056300A /* maxtrax.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = maxtrax.h; path = ../../audio/mods/maxtrax.h; sourceTree = SOURCE_ROOT; };
+		DF2040C01380CA810056300A /* module.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = module.cpp; path = ../../audio/mods/module.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040C11380CA810056300A /* module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = module.h; path = ../../audio/mods/module.h; sourceTree = SOURCE_ROOT; };
+		DF2040C21380CA810056300A /* paula.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = paula.cpp; path = ../../audio/mods/paula.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040C31380CA810056300A /* paula.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = paula.h; path = ../../audio/mods/paula.h; sourceTree = SOURCE_ROOT; };
+		DF2040C41380CA810056300A /* protracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = protracker.cpp; path = ../../audio/mods/protracker.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040C51380CA810056300A /* protracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = protracker.h; path = ../../audio/mods/protracker.h; sourceTree = SOURCE_ROOT; };
+		DF2040C61380CA810056300A /* rjp1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rjp1.cpp; path = ../../audio/mods/rjp1.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040C71380CA810056300A /* rjp1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rjp1.h; path = ../../audio/mods/rjp1.h; sourceTree = SOURCE_ROOT; };
+		DF2040C81380CA810056300A /* soundfx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = soundfx.cpp; path = ../../audio/mods/soundfx.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040C91380CA810056300A /* soundfx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = soundfx.h; path = ../../audio/mods/soundfx.h; sourceTree = SOURCE_ROOT; };
+		DF2040CA1380CA810056300A /* tfmx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tfmx.cpp; path = ../../audio/mods/tfmx.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040CB1380CA810056300A /* tfmx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tfmx.h; path = ../../audio/mods/tfmx.h; sourceTree = SOURCE_ROOT; };
+		DF2040E51380CAA40056300A /* adlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = adlib.cpp; path = ../../audio/softsynth/adlib.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040E61380CAA40056300A /* appleiigs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = appleiigs.cpp; path = ../../audio/softsynth/appleiigs.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040E71380CAA40056300A /* cms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cms.cpp; path = ../../audio/softsynth/cms.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040E81380CAA40056300A /* cms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cms.h; path = ../../audio/softsynth/cms.h; sourceTree = SOURCE_ROOT; };
+		DF2040E91380CAA40056300A /* eas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = eas.cpp; path = ../../audio/softsynth/eas.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040EA1380CAA40056300A /* emumidi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = emumidi.h; path = ../../audio/softsynth/emumidi.h; sourceTree = SOURCE_ROOT; };
+		DF2040EB1380CAA40056300A /* fluidsynth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fluidsynth.cpp; path = ../../audio/softsynth/fluidsynth.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040EC1380CAA40056300A /* mt32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mt32.cpp; path = ../../audio/softsynth/mt32.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040ED1380CAA40056300A /* pcspk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pcspk.cpp; path = ../../audio/softsynth/pcspk.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040EE1380CAA40056300A /* pcspk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pcspk.h; path = ../../audio/softsynth/pcspk.h; sourceTree = SOURCE_ROOT; };
+		DF2040EF1380CAA40056300A /* sid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sid.cpp; path = ../../audio/softsynth/sid.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040F01380CAA40056300A /* sid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sid.h; path = ../../audio/softsynth/sid.h; sourceTree = SOURCE_ROOT; };
+		DF2040F11380CAA40056300A /* wave6581.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wave6581.cpp; path = ../../audio/softsynth/wave6581.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040F21380CAA40056300A /* ym2612.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ym2612.cpp; path = ../../audio/softsynth/ym2612.cpp; sourceTree = SOURCE_ROOT; };
+		DF2040F31380CAA40056300A /* ym2612.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ym2612.h; path = ../../audio/softsynth/ym2612.h; sourceTree = SOURCE_ROOT; };
 		DF224E020FB23BC500C8E453 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
 		DF2EC3E410E6490800765801 /* browser_osx.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = browser_osx.mm; sourceTree = "<group>"; };
 		DF2EC3F610E64C0C00765801 /* dialogs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dialogs.cpp; sourceTree = "<group>"; };
@@ -3354,16 +3663,12 @@
 		DF2EC50010E64D7C00765801 /* player_sid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_sid.h; sourceTree = "<group>"; };
 		DF2EC50910E64DB300765801 /* textconsole.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = textconsole.cpp; sourceTree = "<group>"; };
 		DF2EC50A10E64DB300765801 /* textconsole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textconsole.h; sourceTree = "<group>"; };
-		DF2EC51010E64E3100765801 /* sid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sid.cpp; sourceTree = "<group>"; };
-		DF2EC51110E64E3100765801 /* sid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sid.h; sourceTree = "<group>"; };
-		DF2EC51710E64EE600765801 /* wave6581.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wave6581.cpp; sourceTree = "<group>"; };
 		DF2FFB900F485D890006E566 /* dither.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dither.cpp; sourceTree = "<group>"; };
 		DF2FFB910F485D890006E566 /* dither.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dither.h; sourceTree = "<group>"; };
 		DF2FFB920F485D890006E566 /* pixelformat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pixelformat.h; sourceTree = "<group>"; };
 		DF2FFBD10F485DFB0006E566 /* debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug.cpp; sourceTree = "<group>"; };
 		DF2FFBD20F485DFB0006E566 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-		DF2FFBD50F485E360006E566 /* gui-manager.hcpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gui-manager.hcpp; sourceTree = "<group>"; };
-		DF2FFBD60F485E360006E566 /* gui-manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui-manager.h; sourceTree = "<group>"; };
+		DF2FFBD60F485E360006E566 /* gui-manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gui-manager.h"; sourceTree = "<group>"; };
 		DF2FFBDB0F485E480006E566 /* scummclassic.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = scummclassic.zip; sourceTree = "<group>"; };
 		DF2FFBF80F4860A60006E566 /* posix-saves.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "posix-saves.cpp"; sourceTree = "<group>"; };
 		DF2FFBF90F4860A60006E566 /* posix-saves.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "posix-saves.h"; sourceTree = "<group>"; };
@@ -3441,26 +3746,6 @@
 		DF2FFD0F0F4870E50006E566 /* tucker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tucker.h; sourceTree = "<group>"; };
 		DF2FFD290F48717F0006E566 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
 		DF2FFD2A0F48717F0006E566 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
-		DF45B0F7116627DA009B85CC /* adpcm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adpcm.cpp; sourceTree = "<group>"; };
-		DF45B0F8116627DA009B85CC /* adpcm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adpcm.h; sourceTree = "<group>"; };
-		DF45B0FA116627DA009B85CC /* aiff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = aiff.cpp; sourceTree = "<group>"; };
-		DF45B0FB116627DA009B85CC /* aiff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aiff.h; sourceTree = "<group>"; };
-		DF45B0FD116627DA009B85CC /* flac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = flac.cpp; sourceTree = "<group>"; };
-		DF45B0FE116627DA009B85CC /* flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = flac.h; sourceTree = "<group>"; };
-		DF45B100116627DA009B85CC /* iff_sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iff_sound.cpp; sourceTree = "<group>"; };
-		DF45B101116627DA009B85CC /* iff_sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iff_sound.h; sourceTree = "<group>"; };
-		DF45B103116627DA009B85CC /* mp3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mp3.cpp; sourceTree = "<group>"; };
-		DF45B104116627DA009B85CC /* mp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mp3.h; sourceTree = "<group>"; };
-		DF45B106116627DA009B85CC /* raw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = raw.cpp; sourceTree = "<group>"; };
-		DF45B107116627DA009B85CC /* raw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = raw.h; sourceTree = "<group>"; };
-		DF45B109116627DA009B85CC /* vag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vag.cpp; sourceTree = "<group>"; };
-		DF45B10A116627DA009B85CC /* vag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vag.h; sourceTree = "<group>"; };
-		DF45B10C116627DA009B85CC /* voc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = voc.cpp; sourceTree = "<group>"; };
-		DF45B10D116627DA009B85CC /* voc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = voc.h; sourceTree = "<group>"; };
-		DF45B10F116627DA009B85CC /* vorbis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vorbis.cpp; sourceTree = "<group>"; };
-		DF45B110116627DA009B85CC /* vorbis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vorbis.h; sourceTree = "<group>"; };
-		DF45B112116627DA009B85CC /* wave.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wave.cpp; sourceTree = "<group>"; };
-		DF45B113116627DA009B85CC /* wave.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wave.h; sourceTree = "<group>"; };
 		DF45B176116628A5009B85CC /* animate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animate.cpp; sourceTree = "<group>"; };
 		DF45B177116628A5009B85CC /* animate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = animate.h; sourceTree = "<group>"; };
 		DF45B178116628A5009B85CC /* cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cache.cpp; sourceTree = "<group>"; };
@@ -3523,6 +3808,97 @@
 		DF45B1C4116628A5009B85CC /* soundcmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = soundcmd.h; sourceTree = "<group>"; };
 		DF45B1C6116628A5009B85CC /* seq_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = seq_decoder.cpp; sourceTree = "<group>"; };
 		DF45B1C7116628A5009B85CC /* seq_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = seq_decoder.h; sourceTree = "<group>"; };
+		DF46B6F21381E18900D08723 /* coroutine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coroutine.cpp; sourceTree = "<group>"; };
+		DF46B6F71381E1FF00D08723 /* towns_audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_audio.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_audio.cpp; sourceTree = SOURCE_ROOT; };
+		DF46B6F81381E1FF00D08723 /* towns_audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = towns_audio.h; path = ../../audio/softsynth/fmtowns_pc98/towns_audio.h; sourceTree = SOURCE_ROOT; };
+		DF46B6F91381E1FF00D08723 /* towns_euphony.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_euphony.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_euphony.cpp; sourceTree = SOURCE_ROOT; };
+		DF46B6FA1381E1FF00D08723 /* towns_euphony.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = towns_euphony.h; path = ../../audio/softsynth/fmtowns_pc98/towns_euphony.h; sourceTree = SOURCE_ROOT; };
+		DF46B6FB1381E1FF00D08723 /* towns_pc98_driver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_pc98_driver.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp; sourceTree = SOURCE_ROOT; };
+		DF46B6FC1381E1FF00D08723 /* towns_pc98_driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = towns_pc98_driver.h; path = ../../audio/softsynth/fmtowns_pc98/towns_pc98_driver.h; sourceTree = SOURCE_ROOT; };
+		DF46B6FD1381E1FF00D08723 /* towns_pc98_fmsynth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_pc98_fmsynth.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp; sourceTree = SOURCE_ROOT; };
+		DF46B6FE1381E1FF00D08723 /* towns_pc98_fmsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = towns_pc98_fmsynth.h; path = ../../audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h; sourceTree = SOURCE_ROOT; };
+		DF46B70F1381E27000D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
+		DF46B7101381E27000D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
+		DF46B7111381E27000D08723 /* databases.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = databases.cpp; sourceTree = "<group>"; };
+		DF46B7121381E27000D08723 /* databases.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = databases.h; sourceTree = "<group>"; };
+		DF46B7131381E27000D08723 /* dbase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dbase.cpp; sourceTree = "<group>"; };
+		DF46B7141381E27000D08723 /* dbase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dbase.h; sourceTree = "<group>"; };
+		DF46B7151381E27000D08723 /* iniconfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iniconfig.cpp; sourceTree = "<group>"; };
+		DF46B7161381E27000D08723 /* iniconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iniconfig.h; sourceTree = "<group>"; };
+		DF46B7171381E27000D08723 /* init_v7.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = init_v7.cpp; sourceTree = "<group>"; };
+		DF46B7181381E27000D08723 /* inter_inca2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter_inca2.cpp; sourceTree = "<group>"; };
+		DF46B7421381E40500D08723 /* log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = log.cpp; path = log/log.cpp; sourceTree = "<group>"; };
+		DF46B7431381E40500D08723 /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = log.h; path = log/log.h; sourceTree = "<group>"; };
+		DF46B7471381E40F00D08723 /* modular-backend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "modular-backend.cpp"; sourceTree = "<group>"; };
+		DF46B7481381E40F00D08723 /* modular-backend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "modular-backend.h"; sourceTree = "<group>"; };
+		DF46B7501381E46700D08723 /* actor_he.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actor_he.h; sourceTree = "<group>"; };
+		DF46B7511381E46700D08723 /* player_v2base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_v2base.cpp; sourceTree = "<group>"; };
+		DF46B7521381E46700D08723 /* player_v2base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_v2base.h; sourceTree = "<group>"; };
+		DF46B7531381E46700D08723 /* player_v2cms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_v2cms.h; sourceTree = "<group>"; };
+		DF46B75B1381E4A400D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
+		DF46B75C1381E4A400D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
+		DF46B75D1381E4A400D08723 /* detection_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = detection_tables.h; sourceTree = "<group>"; };
+		DF46B7611381E4D400D08723 /* robot_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = robot_decoder.cpp; sourceTree = "<group>"; };
+		DF46B7621381E4D400D08723 /* robot_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = robot_decoder.h; sourceTree = "<group>"; };
+		DF46B7661381E4E400D08723 /* vm_types.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vm_types.cpp; sourceTree = "<group>"; };
+		DF46B76E1381E54200D08723 /* bufferedstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bufferedstream.h; sourceTree = "<group>"; };
+		DF46B76F1381E54200D08723 /* dcl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dcl.cpp; sourceTree = "<group>"; };
+		DF46B7701381E54200D08723 /* dcl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dcl.h; sourceTree = "<group>"; };
+		DF46B7711381E54200D08723 /* forbidden.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = forbidden.h; sourceTree = "<group>"; };
+		DF46B7721381E54200D08723 /* iff_container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iff_container.cpp; sourceTree = "<group>"; };
+		DF46B7731381E54200D08723 /* substream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = substream.h; sourceTree = "<group>"; };
+		DF46B7741381E54200D08723 /* translation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = translation.h; sourceTree = "<group>"; };
+		DF46B7751381E54200D08723 /* winexe_ne.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winexe_ne.cpp; sourceTree = "<group>"; };
+		DF46B7761381E54200D08723 /* winexe_ne.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winexe_ne.h; sourceTree = "<group>"; };
+		DF46B7771381E54200D08723 /* winexe_pe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winexe_pe.cpp; sourceTree = "<group>"; };
+		DF46B7781381E54200D08723 /* winexe_pe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winexe_pe.h; sourceTree = "<group>"; };
+		DF46B7791381E54200D08723 /* winexe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winexe.cpp; sourceTree = "<group>"; };
+		DF46B77A1381E54200D08723 /* winexe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winexe.h; sourceTree = "<group>"; };
+		DF46B78E1381E58000D08723 /* palette.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palette.h; sourceTree = "<group>"; };
+		DF46B78F1381E58000D08723 /* png.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = png.cpp; sourceTree = "<group>"; };
+		DF46B7901381E58000D08723 /* png.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = png.h; sourceTree = "<group>"; };
+		DF46B7911381E58000D08723 /* wincursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wincursor.cpp; sourceTree = "<group>"; };
+		DF46B7921381E58000D08723 /* wincursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wincursor.h; sourceTree = "<group>"; };
+		DF46B79D1381E5B500D08723 /* winfont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winfont.cpp; sourceTree = "<group>"; };
+		DF46B79E1381E5B500D08723 /* winfont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winfont.h; sourceTree = "<group>"; };
+		DF46B7A31381E5D900D08723 /* sdl-timer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "sdl-timer.cpp"; path = "sdl/sdl-timer.cpp"; sourceTree = "<group>"; };
+		DF46B7A41381E5D900D08723 /* sdl-timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sdl-timer.h"; path = "sdl/sdl-timer.h"; sourceTree = "<group>"; };
+		DF46B7A81381E5F100D08723 /* header.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = header.cpp; sourceTree = "<group>"; };
+		DF46B7B21381E67800D08723 /* sdl-mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "sdl-mutex.cpp"; path = "mutex/sdl/sdl-mutex.cpp"; sourceTree = "<group>"; };
+		DF46B7B31381E67800D08723 /* sdl-mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sdl-mutex.h"; path = "mutex/sdl/sdl-mutex.h"; sourceTree = "<group>"; };
+		DF46B7BB1381E6C000D08723 /* object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object.cpp; sourceTree = "<group>"; };
+		DF46B7BC1381E6C000D08723 /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; };
+		DF46B7C61381E72500D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
+		DF46B7C71381E72500D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
+		DF46B7CD1381E76300D08723 /* sdl-events.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "sdl-events.cpp"; path = "events/sdl/sdl-events.cpp"; sourceTree = "<group>"; };
+		DF46B7CE1381E76300D08723 /* sdl-events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sdl-events.h"; path = "events/sdl/sdl-events.h"; sourceTree = "<group>"; };
+		DF46B7D41381E7C600D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
+		DF46B7D51381E7C600D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
+		DF46B83B1381F13500D08723 /* saveload_v7.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_v7.cpp; sourceTree = "<group>"; };
+		DF46B8431381F35500D08723 /* saveload_inca2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_inca2.cpp; sourceTree = "<group>"; };
+		DF46B8471381F38700D08723 /* inter_v7.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter_v7.cpp; sourceTree = "<group>"; };
+		DF46B84B1381F39E00D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
+		DF46B84C1381F39E00D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
+		DF46B8501381F3B400D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
+		DF46B8511381F3B400D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
+		DF46B85A1381F44E00D08723 /* dbopl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dbopl.cpp; path = ../../audio/softsynth/opl/dbopl.cpp; sourceTree = SOURCE_ROOT; };
+		DF46B85B1381F44E00D08723 /* dbopl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dbopl.h; path = ../../audio/softsynth/opl/dbopl.h; sourceTree = SOURCE_ROOT; };
+		DF46B85C1381F44E00D08723 /* dosbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dosbox.cpp; path = ../../audio/softsynth/opl/dosbox.cpp; sourceTree = SOURCE_ROOT; };
+		DF46B85D1381F44E00D08723 /* dosbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dosbox.h; path = ../../audio/softsynth/opl/dosbox.h; sourceTree = SOURCE_ROOT; };
+		DF46B85E1381F44E00D08723 /* mame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mame.cpp; path = ../../audio/softsynth/opl/mame.cpp; sourceTree = SOURCE_ROOT; };
+		DF46B85F1381F44E00D08723 /* mame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mame.h; path = ../../audio/softsynth/opl/mame.h; sourceTree = SOURCE_ROOT; };
+		DF46B86F1381F4A200D08723 /* sdl-audiocd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "sdl-audiocd.cpp"; path = "audiocd/sdl/sdl-audiocd.cpp"; sourceTree = "<group>"; };
+		DF46B8701381F4A200D08723 /* sdl-audiocd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sdl-audiocd.h"; path = "audiocd/sdl/sdl-audiocd.h"; sourceTree = "<group>"; };
+		DF46B87B1381F4F200D08723 /* default-audiocd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "default-audiocd.cpp"; path = "audiocd/default/default-audiocd.cpp"; sourceTree = "<group>"; };
+		DF46B87C1381F4F200D08723 /* default-audiocd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "default-audiocd.h"; path = "audiocd/default/default-audiocd.h"; sourceTree = "<group>"; };
+		DF46B8801381F4FF00D08723 /* audiocd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audiocd.h; path = audiocd/audiocd.h; sourceTree = "<group>"; };
+		DF46B8851381F56400D08723 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
+		DF46B8871381F5D800D08723 /* sdl-provider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "sdl-provider.cpp"; path = "sdl/sdl-provider.cpp"; sourceTree = "<group>"; };
+		DF46B8881381F5D800D08723 /* sdl-provider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sdl-provider.h"; path = "sdl/sdl-provider.h"; sourceTree = "<group>"; };
+		DF46B8901381F62B00D08723 /* adpcm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adpcm.cpp; sourceTree = "<group>"; };
+		DF46B8911381F62B00D08723 /* adpcm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adpcm.h; sourceTree = "<group>"; };
+		DF46B8991381F6C400D08723 /* null.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = null.cpp; path = ../../audio/null.cpp; sourceTree = SOURCE_ROOT; };
+		DF46B89A1381F6C400D08723 /* null.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = null.h; path = ../../audio/null.h; sourceTree = SOURCE_ROOT; };
 		DF573BFE0F5A81EA00961A72 /* kernel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kernel.h; sourceTree = "<group>"; };
 		DF573BFF0F5A81EA00961A72 /* script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script.h; sourceTree = "<group>"; };
 		DF573C000F5A81EA00961A72 /* seg_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = seg_manager.h; sourceTree = "<group>"; };
@@ -3546,19 +3922,11 @@
 		DF6118450FE3A8250042AD3F /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
 		DF6118460FE3A8250042AD3F /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
 		DF6118540FE3A8990042AD3F /* disk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = disk.cpp; sourceTree = "<group>"; };
-		DF6118590FE3A9020042AD3F /* helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = helper.h; sourceTree = "<group>"; };
-		DF6118600FE3A9410042AD3F /* dxa_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dxa_decoder.cpp; sourceTree = "<group>"; };
-		DF6118610FE3A9410042AD3F /* dxa_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dxa_decoder.h; sourceTree = "<group>"; };
-		DF6118620FE3A9410042AD3F /* flic_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = flic_decoder.cpp; sourceTree = "<group>"; };
-		DF6118630FE3A9410042AD3F /* flic_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = flic_decoder.h; sourceTree = "<group>"; };
-		DF6118640FE3A9410042AD3F /* smk_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = smk_decoder.cpp; sourceTree = "<group>"; };
-		DF6118650FE3A9410042AD3F /* smk_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smk_decoder.h; sourceTree = "<group>"; };
 		DF6118790FE3A9AA0042AD3F /* saveconverter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveconverter.cpp; sourceTree = "<group>"; };
 		DF61187A0FE3A9AA0042AD3F /* saveconverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = saveconverter.h; sourceTree = "<group>"; };
 		DF61187B0FE3A9AA0042AD3F /* saveconverter_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveconverter_v2.cpp; sourceTree = "<group>"; };
 		DF61187C0FE3A9AA0042AD3F /* saveconverter_v3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveconverter_v3.cpp; sourceTree = "<group>"; };
 		DF61187D0FE3A9AA0042AD3F /* saveconverter_v4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveconverter_v4.cpp; sourceTree = "<group>"; };
-		DF61187E0FE3A9AA0042AD3F /* saveconverter_v6.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveconverter_v6.cpp; sourceTree = "<group>"; };
 		DF61187F0FE3A9AA0042AD3F /* savefile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = savefile.cpp; sourceTree = "<group>"; };
 		DF6118800FE3A9AA0042AD3F /* savefile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = savefile.h; sourceTree = "<group>"; };
 		DF6118810FE3A9AA0042AD3F /* savehandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = savehandler.cpp; sourceTree = "<group>"; };
@@ -3577,8 +3945,6 @@
 		DF6118B70FE3AA280042AD3F /* text_lol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text_lol.h; sourceTree = "<group>"; };
 		DF6118C60FE3AABD0042AD3F /* player_v2cms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_v2cms.cpp; sourceTree = "<group>"; };
 		DF6118CB0FE3AAFD0042AD3F /* hardwarekeys.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hardwarekeys.cpp; sourceTree = "<group>"; };
-		DF6118CF0FE3AB560042AD3F /* mame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mame.cpp; sourceTree = "<group>"; };
-		DF6118D00FE3AB560042AD3F /* mame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mame.h; sourceTree = "<group>"; };
 		DF6BF4C010529DA50069811F /* conversion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = conversion.cpp; sourceTree = "<group>"; };
 		DF6BF4C110529DA50069811F /* conversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conversion.h; sourceTree = "<group>"; };
 		DF6BF4C210529DA50069811F /* jpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jpeg.cpp; sourceTree = "<group>"; };
@@ -3597,10 +3963,6 @@
 		DF6BF4F910529F140069811F /* EventRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventRecorder.h; sourceTree = "<group>"; };
 		DF6BF4FA10529F140069811F /* list_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = list_intern.h; sourceTree = "<group>"; };
 		DF6BF4FB10529F140069811F /* serializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = serializer.h; sourceTree = "<group>"; };
-		DF6BF50210529F540069811F /* maxtrax.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maxtrax.cpp; sourceTree = "<group>"; };
-		DF6BF50310529F540069811F /* maxtrax.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maxtrax.h; sourceTree = "<group>"; };
-		DF6BF50410529F540069811F /* tfmx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tfmx.cpp; sourceTree = "<group>"; };
-		DF6BF50510529F540069811F /* tfmx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tfmx.h; sourceTree = "<group>"; };
 		DF7585C3100CB66E00CC3324 /* expression.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = expression.cpp; sourceTree = "<group>"; };
 		DF7585C4100CB66E00CC3324 /* expression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = expression.h; sourceTree = "<group>"; };
 		DF7585C5100CB66E00CC3324 /* hotspots.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hotspots.cpp; sourceTree = "<group>"; };
@@ -3661,8 +4023,6 @@
 		DF7F288911FF244F00159131 /* Tooltip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Tooltip.cpp; sourceTree = "<group>"; };
 		DF7F288A11FF244F00159131 /* Tooltip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tooltip.h; sourceTree = "<group>"; };
 		DF7F289111FF247300159131 /* translation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = translation.cpp; sourceTree = "<group>"; };
-		DF7F289E11FF24B000159131 /* mac_snd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mac_snd.cpp; sourceTree = "<group>"; };
-		DF7F289F11FF24B000159131 /* mac_snd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mac_snd.h; sourceTree = "<group>"; };
 		DF7F28A311FF24C400159131 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
 		DF7F28A411FF24C400159131 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
 		DF841FD90E7BA61800F5680E /* iphone_keyboard.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = iphone_keyboard.m; sourceTree = "<group>"; };
@@ -4705,54 +5065,21 @@
 		DF842A4C0E7BBBEB00F5680E /* posix-fs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "posix-fs.h"; sourceTree = "<group>"; };
 		DF842A6B0E7BBD5700F5680E /* stdiostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stdiostream.cpp; sourceTree = "<group>"; };
 		DF842A6C0E7BBD5700F5680E /* stdiostream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stdiostream.h; sourceTree = "<group>"; };
-		DF842A6F0E7BBDB200F5680E /* musicplugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = musicplugin.cpp; sourceTree = "<group>"; };
-		DF842A700E7BBDB200F5680E /* musicplugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = musicplugin.h; sourceTree = "<group>"; };
-		DF895BFC124C24350077F6E8 /* coktel_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coktel_decoder.cpp; sourceTree = "<group>"; };
-		DF895BFD124C24350077F6E8 /* coktel_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coktel_decoder.h; sourceTree = "<group>"; };
 		DF895C01124C24680077F6E8 /* player_towns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_towns.cpp; sourceTree = "<group>"; };
 		DF895C02124C24680077F6E8 /* player_towns.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_towns.h; sourceTree = "<group>"; };
-		DF895C08124C24B50077F6E8 /* appleiigs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = appleiigs.cpp; sourceTree = "<group>"; };
-		DF895C0D124C24C00077F6E8 /* towns_audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = towns_audio.cpp; sourceTree = "<group>"; };
-		DF895C0E124C24C00077F6E8 /* towns_audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = towns_audio.h; sourceTree = "<group>"; };
-		DF895C0F124C24C00077F6E8 /* towns_euphony.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = towns_euphony.cpp; sourceTree = "<group>"; };
-		DF895C10124C24C00077F6E8 /* towns_euphony.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = towns_euphony.h; sourceTree = "<group>"; };
-		DF895C11124C24C00077F6E8 /* towns_pc98_driver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = towns_pc98_driver.cpp; sourceTree = "<group>"; };
-		DF895C12124C24C00077F6E8 /* towns_pc98_driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = towns_pc98_driver.h; sourceTree = "<group>"; };
-		DF895C13124C24C00077F6E8 /* towns_pc98_fmsynth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = towns_pc98_fmsynth.cpp; sourceTree = "<group>"; };
-		DF895C14124C24C00077F6E8 /* towns_pc98_fmsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = towns_pc98_fmsynth.h; sourceTree = "<group>"; };
 		DF895C23124C25150077F6E8 /* detection_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = detection_tables.h; sourceTree = "<group>"; };
 		DF895C24124C25150077F6E8 /* init_fascin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = init_fascin.cpp; sourceTree = "<group>"; };
 		DF895C28124C25350077F6E8 /* kernel_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kernel_tables.h; sourceTree = "<group>"; };
 		DF895C29124C25350077F6E8 /* script_patches.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_patches.cpp; sourceTree = "<group>"; };
 		DF895C33124C26660077F6E8 /* icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-72.png"; sourceTree = "<group>"; };
 		DF895C40124C271F0077F6E8 /* icon4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon4.png; sourceTree = "<group>"; };
-		DF895CAB124E58980077F6E8 /* indeo3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = indeo3.cpp; sourceTree = "<group>"; };
-		DF895CAC124E58980077F6E8 /* indeo3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = indeo3.h; sourceTree = "<group>"; };
-		DF895CAD124E58980077F6E8 /* mjpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mjpeg.cpp; sourceTree = "<group>"; };
-		DF895CAE124E58980077F6E8 /* mjpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mjpeg.h; sourceTree = "<group>"; };
-		DF895CAF124E58980077F6E8 /* qdm2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = qdm2.cpp; sourceTree = "<group>"; };
-		DF895CB0124E58980077F6E8 /* qdm2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qdm2.h; sourceTree = "<group>"; };
-		DF895CB1124E58980077F6E8 /* qdm2data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qdm2data.h; sourceTree = "<group>"; };
-		DF895CB2124E58980077F6E8 /* qtrle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = qtrle.cpp; sourceTree = "<group>"; };
-		DF895CB3124E58980077F6E8 /* qtrle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qtrle.h; sourceTree = "<group>"; };
-		DF895CB4124E58980077F6E8 /* rpza.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rpza.cpp; sourceTree = "<group>"; };
-		DF895CB5124E58980077F6E8 /* rpza.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rpza.h; sourceTree = "<group>"; };
-		DF895CB6124E58980077F6E8 /* smc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = smc.cpp; sourceTree = "<group>"; };
-		DF895CB7124E58980077F6E8 /* smc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smc.h; sourceTree = "<group>"; };
 		DF89C2870F62D55C00D756B6 /* sprites_lol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sprites_lol.cpp; sourceTree = "<group>"; };
 		DF89C2A30F62D79E00D756B6 /* script.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script.cpp; sourceTree = "<group>"; };
-		DF89C2B80F62D91000D756B6 /* timestamp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timestamp.cpp; sourceTree = "<group>"; };
-		DF89C2B90F62D91000D756B6 /* timestamp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timestamp.h; sourceTree = "<group>"; };
 		DF90E9B410AEDA5300C8F93F /* detection_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = detection_tables.h; sourceTree = "<group>"; };
 		DF90E9BD10AEDA9B00C8F93F /* selector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = selector.cpp; sourceTree = "<group>"; };
 		DF90EAA310B0234300C8F93F /* draw_playtoons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = draw_playtoons.cpp; sourceTree = "<group>"; };
 		DF90EAAB10B0236F00C8F93F /* staticres.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = staticres.cpp; sourceTree = "<group>"; };
 		DF90EAAC10B0236F00C8F93F /* staticres.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = staticres.h; sourceTree = "<group>"; };
-		DF90EAB610B023D100C8F93F /* avi_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = avi_decoder.cpp; sourceTree = "<group>"; };
-		DF90EAB710B023D100C8F93F /* avi_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avi_decoder.h; sourceTree = "<group>"; };
-		DF90EAC010B023F400C8F93F /* codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec.h; sourceTree = "<group>"; };
-		DF90EAC110B023F400C8F93F /* msvideo1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = msvideo1.cpp; sourceTree = "<group>"; };
-		DF90EAC210B023F400C8F93F /* msvideo1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msvideo1.h; sourceTree = "<group>"; };
 		DF9B9246118E46730069C19D /* error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = error.cpp; sourceTree = "<group>"; };
 		DF9B9247118E46730069C19D /* error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = "<group>"; };
 		DF9B924F118E46A00069C19D /* fontsjis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fontsjis.cpp; sourceTree = "<group>"; };
@@ -4765,12 +5092,10 @@
 		DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thumbnail_intern.cpp; sourceTree = "<group>"; };
 		DFAAD2390F50120E00C3A4E2 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
 		DFAAD23A0F50120E00C3A4E2 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		DFB0576211B753AF0015AE65 /* mpeg_player.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mpeg_player.cpp; sourceTree = "<group>"; };
-		DFB0576311B753AF0015AE65 /* mpeg_player.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpeg_player.h; sourceTree = "<group>"; };
-		DFB0576411B753AF0015AE65 /* qt_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = qt_decoder.cpp; sourceTree = "<group>"; };
-		DFB0576511B753AF0015AE65 /* qt_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qt_decoder.h; sourceTree = "<group>"; };
-		DFB0576611B753AF0015AE65 /* video_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = video_decoder.cpp; sourceTree = "<group>"; };
-		DFB0576711B753AF0015AE65 /* video_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = video_decoder.h; sourceTree = "<group>"; };
+		DFADEBB113820DF500C46364 /* maccursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maccursor.cpp; sourceTree = "<group>"; };
+		DFADEBB213820DF500C46364 /* maccursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maccursor.h; sourceTree = "<group>"; };
+		DFADEBB613820E0C00C46364 /* posix-fs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "posix-fs.cpp"; sourceTree = "<group>"; };
+		DFADEC061382140300C46364 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		DFB0577311B753DA0015AE65 /* debug-channels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "debug-channels.h"; sourceTree = "<group>"; };
 		DFB0577411B753DA0015AE65 /* rational.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rational.cpp; sourceTree = "<group>"; };
 		DFB0577511B753DA0015AE65 /* rational.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rational.h; sourceTree = "<group>"; };
@@ -4781,8 +5106,6 @@
 		DFB0578911B754570015AE65 /* maciconbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maciconbar.h; sourceTree = "<group>"; };
 		DFB0578F11B7547D0015AE65 /* pict.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pict.cpp; sourceTree = "<group>"; };
 		DFB0579011B7547D0015AE65 /* pict.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pict.h; sourceTree = "<group>"; };
-		DFB0579611B7549C0015AE65 /* cinepak.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cinepak.cpp; sourceTree = "<group>"; };
-		DFB0579711B7549C0015AE65 /* cinepak.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cinepak.h; sourceTree = "<group>"; };
 		DFC8301A0F48AF18005EF03C /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
 		DFC8301E0F48AF18005EF03C /* gc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gc.cpp; sourceTree = "<group>"; };
 		DFC8301F0F48AF18005EF03C /* gc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gc.h; sourceTree = "<group>"; };
@@ -4811,8 +5134,6 @@
 		DFCDC6D7116629CE00A7D2A0 /* kparse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kparse.cpp; sourceTree = "<group>"; };
 		DFCDC6D8116629CE00A7D2A0 /* selector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = selector.h; sourceTree = "<group>"; };
 		DFCDC6F611662AAB00A7D2A0 /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
-		DFCDC6FC11662AD700A7D2A0 /* msrle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = msrle.cpp; sourceTree = "<group>"; };
-		DFCDC6FD11662AD700A7D2A0 /* msrle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msrle.h; sourceTree = "<group>"; };
 		DFCDC70311662B0200A7D2A0 /* saveload_fascin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_fascin.cpp; sourceTree = "<group>"; };
 		DFCDC70911662B6B00A7D2A0 /* macresman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = macresman.cpp; sourceTree = "<group>"; };
 		DFCDC70A11662B6B00A7D2A0 /* macresman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macresman.h; sourceTree = "<group>"; };
@@ -4942,16 +5263,10 @@
 		DFE477950D81F4E900B6D1FB /* debugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugger.h; sourceTree = "<group>"; };
 		DFE477960D81F4E900B6D1FB /* dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dialog.cpp; sourceTree = "<group>"; };
 		DFE477970D81F4E900B6D1FB /* dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dialog.h; sourceTree = "<group>"; };
-		DFE477980D81F4E900B6D1FB /* editable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editable.cpp; sourceTree = "<group>"; };
-		DFE477990D81F4E900B6D1FB /* editable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = editable.h; sourceTree = "<group>"; };
-		DFE4779A0D81F4E900B6D1FB /* EditTextWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditTextWidget.cpp; sourceTree = "<group>"; };
-		DFE4779B0D81F4E900B6D1FB /* EditTextWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditTextWidget.h; sourceTree = "<group>"; };
 		DFE4779E0D81F4E900B6D1FB /* Key.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Key.cpp; sourceTree = "<group>"; };
 		DFE4779F0D81F4E900B6D1FB /* Key.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Key.h; sourceTree = "<group>"; };
 		DFE477A20D81F4E900B6D1FB /* launcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = launcher.cpp; sourceTree = "<group>"; };
 		DFE477A30D81F4E900B6D1FB /* launcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = launcher.h; sourceTree = "<group>"; };
-		DFE477A40D81F4E900B6D1FB /* ListWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ListWidget.cpp; sourceTree = "<group>"; };
-		DFE477A50D81F4E900B6D1FB /* ListWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListWidget.h; sourceTree = "<group>"; };
 		DFE477A60D81F4E900B6D1FB /* massadd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = massadd.cpp; sourceTree = "<group>"; };
 		DFE477A70D81F4E900B6D1FB /* massadd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = massadd.h; sourceTree = "<group>"; };
 		DFE477A80D81F4E900B6D1FB /* message.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = message.cpp; sourceTree = "<group>"; };
@@ -4960,54 +5275,10 @@
 		DFE477AE0D81F4E900B6D1FB /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; };
 		DFE477AF0D81F4E900B6D1FB /* options.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = options.cpp; sourceTree = "<group>"; };
 		DFE477B00D81F4E900B6D1FB /* options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = options.h; sourceTree = "<group>"; };
-		DFE477B10D81F4E900B6D1FB /* PopUpWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PopUpWidget.cpp; sourceTree = "<group>"; };
-		DFE477B20D81F4E900B6D1FB /* PopUpWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopUpWidget.h; sourceTree = "<group>"; };
-		DFE477B30D81F4E900B6D1FB /* ScrollBarWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollBarWidget.cpp; sourceTree = "<group>"; };
-		DFE477B40D81F4E900B6D1FB /* ScrollBarWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollBarWidget.h; sourceTree = "<group>"; };
-		DFE477B50D81F4E900B6D1FB /* TabWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TabWidget.cpp; sourceTree = "<group>"; };
-		DFE477B60D81F4E900B6D1FB /* TabWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TabWidget.h; sourceTree = "<group>"; };
 		DFE477BA0D81F4E900B6D1FB /* themebrowser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = themebrowser.cpp; sourceTree = "<group>"; };
 		DFE477BB0D81F4E900B6D1FB /* themebrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = themebrowser.h; sourceTree = "<group>"; };
 		DFE477C40D81F4E900B6D1FB /* widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = widget.cpp; sourceTree = "<group>"; };
 		DFE477C50D81F4E900B6D1FB /* widget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = widget.h; sourceTree = "<group>"; };
-		DFE477CB0D81F4E900B6D1FB /* audiocd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audiocd.cpp; sourceTree = "<group>"; };
-		DFE477CC0D81F4E900B6D1FB /* audiocd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audiocd.h; sourceTree = "<group>"; };
-		DFE477CD0D81F4E900B6D1FB /* audiostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audiostream.cpp; sourceTree = "<group>"; };
-		DFE477CE0D81F4E900B6D1FB /* audiostream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audiostream.h; sourceTree = "<group>"; };
-		DFE477D10D81F4E900B6D1FB /* fmopl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fmopl.cpp; sourceTree = "<group>"; };
-		DFE477D20D81F4E900B6D1FB /* fmopl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fmopl.h; sourceTree = "<group>"; };
-		DFE477D50D81F4E900B6D1FB /* mididrv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mididrv.cpp; sourceTree = "<group>"; };
-		DFE477D60D81F4E900B6D1FB /* mididrv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mididrv.h; sourceTree = "<group>"; };
-		DFE477D70D81F4E900B6D1FB /* midiparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midiparser.cpp; sourceTree = "<group>"; };
-		DFE477D80D81F4E900B6D1FB /* midiparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = midiparser.h; sourceTree = "<group>"; };
-		DFE477D90D81F4E900B6D1FB /* midiparser_smf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midiparser_smf.cpp; sourceTree = "<group>"; };
-		DFE477DA0D81F4E900B6D1FB /* midiparser_xmidi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midiparser_xmidi.cpp; sourceTree = "<group>"; };
-		DFE477DB0D81F4E900B6D1FB /* mixer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mixer.cpp; sourceTree = "<group>"; };
-		DFE477DC0D81F4E900B6D1FB /* mixer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mixer.h; sourceTree = "<group>"; };
-		DFE477DE0D81F4E900B6D1FB /* infogrames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = infogrames.cpp; sourceTree = "<group>"; };
-		DFE477DF0D81F4E900B6D1FB /* infogrames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = infogrames.h; sourceTree = "<group>"; };
-		DFE477E00D81F4E900B6D1FB /* module.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = module.cpp; sourceTree = "<group>"; };
-		DFE477E10D81F4E900B6D1FB /* module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = module.h; sourceTree = "<group>"; };
-		DFE477E20D81F4E900B6D1FB /* paula.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = paula.cpp; sourceTree = "<group>"; };
-		DFE477E30D81F4E900B6D1FB /* paula.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = paula.h; sourceTree = "<group>"; };
-		DFE477E40D81F4E900B6D1FB /* protracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = protracker.cpp; sourceTree = "<group>"; };
-		DFE477E50D81F4E900B6D1FB /* protracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = protracker.h; sourceTree = "<group>"; };
-		DFE477E60D81F4E900B6D1FB /* rjp1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rjp1.cpp; sourceTree = "<group>"; };
-		DFE477E70D81F4E900B6D1FB /* rjp1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rjp1.h; sourceTree = "<group>"; };
-		DFE477E80D81F4E900B6D1FB /* soundfx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = soundfx.cpp; sourceTree = "<group>"; };
-		DFE477E90D81F4E900B6D1FB /* soundfx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = soundfx.h; sourceTree = "<group>"; };
-		DFE477ED0D81F4E900B6D1FB /* mpu401.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mpu401.cpp; sourceTree = "<group>"; };
-		DFE477EE0D81F4E900B6D1FB /* mpu401.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpu401.h; sourceTree = "<group>"; };
-		DFE477EF0D81F4E900B6D1FB /* null.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = null.cpp; sourceTree = "<group>"; };
-		DFE477F00D81F4E900B6D1FB /* rate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rate.cpp; sourceTree = "<group>"; };
-		DFE477F10D81F4E900B6D1FB /* rate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rate.h; sourceTree = "<group>"; };
-		DFE477F70D81F4E900B6D1FB /* adlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adlib.cpp; sourceTree = "<group>"; };
-		DFE477F80D81F4E900B6D1FB /* emumidi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = emumidi.h; sourceTree = "<group>"; };
-		DFE477F90D81F4E900B6D1FB /* fluidsynth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fluidsynth.cpp; sourceTree = "<group>"; };
-		DFE478210D81F4E900B6D1FB /* pcspk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pcspk.cpp; sourceTree = "<group>"; };
-		DFE478220D81F4E900B6D1FB /* pcspk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pcspk.h; sourceTree = "<group>"; };
-		DFE478230D81F4E900B6D1FB /* ym2612.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ym2612.cpp; sourceTree = "<group>"; };
-		DFE478240D81F4E900B6D1FB /* ym2612.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ym2612.h; sourceTree = "<group>"; };
 		DFE47C810D81F86900B6D1FB /* kyra.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = kyra.dat; sourceTree = "<group>"; };
 		DFE47C820D81F86900B6D1FB /* lure.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = lure.dat; sourceTree = "<group>"; };
 		DFE47C830D81F86900B6D1FB /* queen.tbl */ = {isa = PBXFileReference; lastKnownFileType = file; path = queen.tbl; sourceTree = "<group>"; };
@@ -5022,11 +5293,7 @@
 		DFEC5D0F1166C5CF00C90552 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
 		DFEC5D341166C67300C90552 /* savestate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = savestate.cpp; sourceTree = "<group>"; };
 		DFEC5D351166C67300C90552 /* savestate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = savestate.h; sourceTree = "<group>"; };
-		DFEC5D3D1166C6B400C90552 /* dbopl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dbopl.cpp; sourceTree = "<group>"; };
-		DFEC5D3E1166C6B400C90552 /* dbopl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dbopl.h; sourceTree = "<group>"; };
 		DFF4DFFC0F4B449F00C50BC7 /* Info.plist.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist.in; sourceTree = "<group>"; };
-		DFF958A90FB222F300A3EC78 /* dosbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dosbox.cpp; sourceTree = "<group>"; };
-		DFF958AA0FB222F300A3EC78 /* dosbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dosbox.h; sourceTree = "<group>"; };
 		DFF95CCA0FB22D5700A3EC78 /* ScummVM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ScummVM.app; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -5046,6 +5313,7 @@
 				DFF959080FB22D3300A3EC78 /* libvorbisidec.a in Frameworks */,
 				DFF95CCF0FB22D8500A3EC78 /* libmpeg2.a in Frameworks */,
 				DF224E040FB23BC500C8E453 /* OpenGLES.framework in Frameworks */,
+				DFADEC071382140300C46364 /* libz.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5102,6 +5370,7 @@
 				DF842A170E7BB34E00F5680E /* CoreFoundation.framework */,
 				DF842A180E7BB34E00F5680E /* Foundation.framework */,
 				DF842A190E7BB34E00F5680E /* UIKit.framework */,
+				DFADEC061382140300C46364 /* libz.dylib */,
 			);
 			name = "Linked Frameworks";
 			sourceTree = "<group>";
@@ -5126,6 +5395,8 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
+				DF2040461380C9ED0056300A /* audio */,
+				DF203F521380C2470056300A /* video */,
 				DF9B9277118E475D0069C19D /* games */,
 				DFD6476A0F49F7D2008E18EF /* libs */,
 				DF841FF50E7BA6A600F5680E /* engines */,
@@ -5134,7 +5405,6 @@
 				DFE473950D81F4E800B6D1FB /* common */,
 				DFE477520D81F4E900B6D1FB /* graphics */,
 				DFE477880D81F4E900B6D1FB /* gui */,
-				DFE477C60D81F4E900B6D1FB /* sound */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
 				DFA2A57A118E433A00344DFD /* Resources-iPad */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
@@ -5187,15 +5457,33 @@
 		8CD1ECC5126202AA00FA198C /* hugo */ = {
 			isa = PBXGroup;
 			children = (
+				DF203FC01380C3BC0056300A /* console.cpp */,
+				DF203FC11380C3BC0056300A /* console.h */,
+				DF203FC21380C3BC0056300A /* dialogs.cpp */,
+				DF203FC31380C3BC0056300A /* dialogs.h */,
+				DF203FC41380C3BC0056300A /* file_v1d.cpp */,
+				DF203FC51380C3BC0056300A /* file_v1w.cpp */,
+				DF203FC61380C3BC0056300A /* file_v2d.cpp */,
+				DF203FC71380C3BC0056300A /* file_v2w.cpp */,
+				DF203FC81380C3BC0056300A /* file_v3d.cpp */,
+				DF203FC91380C3BC0056300A /* object_v1d.cpp */,
+				DF203FCA1380C3BC0056300A /* object_v1w.cpp */,
+				DF203FCB1380C3BC0056300A /* object_v2d.cpp */,
+				DF203FCC1380C3BC0056300A /* object_v3d.cpp */,
+				DF203FCD1380C3BC0056300A /* object.cpp */,
+				DF203FCE1380C3BC0056300A /* object.h */,
+				DF203FCF1380C3BC0056300A /* parser_v1d.cpp */,
+				DF203FD01380C3BC0056300A /* parser_v1w.cpp */,
+				DF203FD11380C3BC0056300A /* parser_v2d.cpp */,
+				DF203FD21380C3BC0056300A /* parser_v3d.cpp */,
+				DF203FD31380C3BC0056300A /* text.cpp */,
+				DF203FD41380C3BC0056300A /* text.h */,
 				8CD1ECC6126202AA00FA198C /* detection.cpp */,
 				8CD1ECC7126202AA00FA198C /* display.cpp */,
 				8CD1ECC8126202AA00FA198C /* display.h */,
-				8CD1ECC9126202AA00FA198C /* engine.cpp */,
-				8CD1ECCA126202AA00FA198C /* engine.h */,
 				8CD1ECCB126202AA00FA198C /* file.cpp */,
 				8CD1ECCC126202AA00FA198C /* file.h */,
 				8CD1ECCD126202AA00FA198C /* game.h */,
-				8CD1ECCE126202AA00FA198C /* global.h */,
 				8CD1ECCF126202AA00FA198C /* hugo.cpp */,
 				8CD1ECD0126202AA00FA198C /* hugo.h */,
 				8CD1ECD1126202AA00FA198C /* intro.cpp */,
@@ -5305,8 +5593,6 @@
 			isa = PBXGroup;
 			children = (
 				DF6118CB0FE3AAFD0042AD3F /* hardwarekeys.cpp */,
-				DF0942350F63CB9A002D821E /* events.cpp */,
-				DF0942370F63CB9A002D821E /* graphics.cpp */,
 				DF0942390F63CB9A002D821E /* main.cpp */,
 				DF09423C0F63CB9A002D821E /* sdl.cpp */,
 				DF09423D0F63CB9A002D821E /* sdl.h */,
@@ -5327,28 +5613,189 @@
 			path = demos;
 			sourceTree = "<group>";
 		};
-		DF2FFB940F485D950006E566 /* video */ = {
+		DF203F521380C2470056300A /* video */ = {
 			isa = PBXGroup;
 			children = (
-				DF90EAB610B023D100C8F93F /* avi_decoder.cpp */,
-				DF90EAB710B023D100C8F93F /* avi_decoder.h */,
-				DF90EABF10B023F300C8F93F /* codecs */,
-				DF895BFC124C24350077F6E8 /* coktel_decoder.cpp */,
-				DF895BFD124C24350077F6E8 /* coktel_decoder.h */,
-				DF6118600FE3A9410042AD3F /* dxa_decoder.cpp */,
-				DF6118610FE3A9410042AD3F /* dxa_decoder.h */,
-				DF6118620FE3A9410042AD3F /* flic_decoder.cpp */,
-				DF6118630FE3A9410042AD3F /* flic_decoder.h */,
-				DFB0576211B753AF0015AE65 /* mpeg_player.cpp */,
-				DFB0576311B753AF0015AE65 /* mpeg_player.h */,
-				DFB0576411B753AF0015AE65 /* qt_decoder.cpp */,
-				DFB0576511B753AF0015AE65 /* qt_decoder.h */,
-				DF6118640FE3A9410042AD3F /* smk_decoder.cpp */,
-				DF6118650FE3A9410042AD3F /* smk_decoder.h */,
-				DFB0576611B753AF0015AE65 /* video_decoder.cpp */,
-				DFB0576711B753AF0015AE65 /* video_decoder.h */,
+				DF203F7B1380C27A0056300A /* codecs */,
+				DF203F531380C2740056300A /* avi_decoder.cpp */,
+				DF203F541380C2740056300A /* avi_decoder.h */,
+				DF203F551380C2740056300A /* coktel_decoder.cpp */,
+				DF203F561380C2740056300A /* coktel_decoder.h */,
+				DF203F571380C2740056300A /* dxa_decoder.cpp */,
+				DF203F581380C2740056300A /* dxa_decoder.h */,
+				DF203F591380C2740056300A /* flic_decoder.cpp */,
+				DF203F5A1380C2740056300A /* flic_decoder.h */,
+				DF203F5D1380C2740056300A /* qt_decoder.cpp */,
+				DF203F5E1380C2750056300A /* qt_decoder.h */,
+				DF203F5F1380C2750056300A /* smk_decoder.cpp */,
+				DF203F601380C2750056300A /* smk_decoder.h */,
+				DF203F611380C2750056300A /* video_decoder.cpp */,
+				DF203F621380C2750056300A /* video_decoder.h */,
 			);
-			path = video;
+			name = video;
+			sourceTree = "<group>";
+		};
+		DF203F7B1380C27A0056300A /* codecs */ = {
+			isa = PBXGroup;
+			children = (
+				DF203F7C1380C2920056300A /* cdtoons.cpp */,
+				DF203F7D1380C2920056300A /* cdtoons.h */,
+				DF203F7E1380C2920056300A /* cinepak.cpp */,
+				DF203F7F1380C2920056300A /* cinepak.h */,
+				DF203F801380C2920056300A /* codec.h */,
+				DF203F811380C2920056300A /* indeo3.cpp */,
+				DF203F821380C2920056300A /* indeo3.h */,
+				DF203F831380C2920056300A /* mjpeg.cpp */,
+				DF203F841380C2920056300A /* mjpeg.h */,
+				DF203F851380C2920056300A /* msrle.cpp */,
+				DF203F861380C2920056300A /* msrle.h */,
+				DF203F871380C2920056300A /* msvideo1.cpp */,
+				DF203F881380C2920056300A /* msvideo1.h */,
+				DF203F891380C2920056300A /* qdm2.cpp */,
+				DF203F8A1380C2920056300A /* qdm2.h */,
+				DF203F8B1380C2920056300A /* qdm2data.h */,
+				DF203F8C1380C2920056300A /* qtrle.cpp */,
+				DF203F8D1380C2920056300A /* qtrle.h */,
+				DF203F8E1380C2920056300A /* rpza.cpp */,
+				DF203F8F1380C2920056300A /* rpza.h */,
+				DF203F901380C2920056300A /* smc.cpp */,
+				DF203F911380C2920056300A /* smc.h */,
+				DF203F921380C2920056300A /* truemotion1.cpp */,
+				DF203F931380C2920056300A /* truemotion1.h */,
+				DF203F941380C2920056300A /* truemotion1data.h */,
+			);
+			name = codecs;
+			sourceTree = "<group>";
+		};
+		DF2040211380C8A60056300A /* widgets */ = {
+			isa = PBXGroup;
+			children = (
+				DF2040221380C8B70056300A /* editable.cpp */,
+				DF2040231380C8B70056300A /* editable.h */,
+				DF2040241380C8B70056300A /* edittext.cpp */,
+				DF2040251380C8B70056300A /* edittext.h */,
+				DF2040261380C8B70056300A /* list.cpp */,
+				DF2040271380C8B70056300A /* list.h */,
+				DF2040281380C8B70056300A /* popup.cpp */,
+				DF2040291380C8B70056300A /* popup.h */,
+				DF20402A1380C8B70056300A /* scrollbar.cpp */,
+				DF20402B1380C8B70056300A /* scrollbar.h */,
+				DF20402C1380C8B70056300A /* tab.cpp */,
+				DF20402D1380C8B70056300A /* tab.h */,
+			);
+			name = widgets;
+			sourceTree = "<group>";
+		};
+		DF2040461380C9ED0056300A /* audio */ = {
+			isa = PBXGroup;
+			children = (
+				DF46B8991381F6C400D08723 /* null.cpp */,
+				DF46B89A1381F6C400D08723 /* null.h */,
+				DF2040E41380CA8C0056300A /* softsynth */,
+				DF2040BB1380CA5C0056300A /* mods */,
+				DF2040821380CA280056300A /* decoders */,
+				DF2040471380CA230056300A /* audiostream.cpp */,
+				DF2040481380CA230056300A /* audiostream.h */,
+				DF2040491380CA230056300A /* fmopl.cpp */,
+				DF20404A1380CA230056300A /* fmopl.h */,
+				DF20404B1380CA230056300A /* mididrv.cpp */,
+				DF20404C1380CA230056300A /* mididrv.h */,
+				DF20404D1380CA230056300A /* midiparser_smf.cpp */,
+				DF20404E1380CA230056300A /* midiparser_xmidi.cpp */,
+				DF20404F1380CA230056300A /* midiparser.cpp */,
+				DF2040501380CA230056300A /* midiparser.h */,
+				DF2040511380CA230056300A /* midiplayer.cpp */,
+				DF2040521380CA230056300A /* midiplayer.h */,
+				DF2040531380CA230056300A /* mixer_intern.h */,
+				DF2040541380CA230056300A /* mixer.cpp */,
+				DF2040551380CA230056300A /* mixer.h */,
+				DF2040561380CA230056300A /* mpu401.cpp */,
+				DF2040571380CA230056300A /* mpu401.h */,
+				DF2040581380CA230056300A /* musicplugin.cpp */,
+				DF2040591380CA230056300A /* musicplugin.h */,
+				DF20405A1380CA230056300A /* rate.cpp */,
+				DF20405B1380CA230056300A /* rate.h */,
+				DF20405C1380CA230056300A /* timestamp.cpp */,
+				DF20405D1380CA230056300A /* timestamp.h */,
+			);
+			name = audio;
+			sourceTree = "<group>";
+		};
+		DF2040821380CA280056300A /* decoders */ = {
+			isa = PBXGroup;
+			children = (
+				DF2040831380CA400056300A /* adpcm_intern.h */,
+				DF2040841380CA400056300A /* adpcm.cpp */,
+				DF2040851380CA400056300A /* adpcm.h */,
+				DF2040861380CA400056300A /* aiff.cpp */,
+				DF2040871380CA400056300A /* aiff.h */,
+				DF2040881380CA400056300A /* flac.cpp */,
+				DF2040891380CA400056300A /* flac.h */,
+				DF20408A1380CA400056300A /* iff_sound.cpp */,
+				DF20408B1380CA400056300A /* iff_sound.h */,
+				DF20408C1380CA400056300A /* mac_snd.cpp */,
+				DF20408D1380CA400056300A /* mac_snd.h */,
+				DF20408E1380CA400056300A /* mp3.cpp */,
+				DF20408F1380CA400056300A /* mp3.h */,
+				DF2040901380CA400056300A /* raw.cpp */,
+				DF2040911380CA400056300A /* raw.h */,
+				DF2040921380CA400056300A /* vag.cpp */,
+				DF2040931380CA400056300A /* vag.h */,
+				DF2040941380CA400056300A /* voc.cpp */,
+				DF2040951380CA400056300A /* voc.h */,
+				DF2040961380CA400056300A /* vorbis.cpp */,
+				DF2040971380CA400056300A /* vorbis.h */,
+				DF2040981380CA400056300A /* wave.cpp */,
+				DF2040991380CA400056300A /* wave.h */,
+			);
+			name = decoders;
+			sourceTree = "<group>";
+		};
+		DF2040BB1380CA5C0056300A /* mods */ = {
+			isa = PBXGroup;
+			children = (
+				DF2040BC1380CA810056300A /* infogrames.cpp */,
+				DF2040BD1380CA810056300A /* infogrames.h */,
+				DF2040BE1380CA810056300A /* maxtrax.cpp */,
+				DF2040BF1380CA810056300A /* maxtrax.h */,
+				DF2040C01380CA810056300A /* module.cpp */,
+				DF2040C11380CA810056300A /* module.h */,
+				DF2040C21380CA810056300A /* paula.cpp */,
+				DF2040C31380CA810056300A /* paula.h */,
+				DF2040C41380CA810056300A /* protracker.cpp */,
+				DF2040C51380CA810056300A /* protracker.h */,
+				DF2040C61380CA810056300A /* rjp1.cpp */,
+				DF2040C71380CA810056300A /* rjp1.h */,
+				DF2040C81380CA810056300A /* soundfx.cpp */,
+				DF2040C91380CA810056300A /* soundfx.h */,
+				DF2040CA1380CA810056300A /* tfmx.cpp */,
+				DF2040CB1380CA810056300A /* tfmx.h */,
+			);
+			name = mods;
+			sourceTree = "<group>";
+		};
+		DF2040E41380CA8C0056300A /* softsynth */ = {
+			isa = PBXGroup;
+			children = (
+				DF46B8591381F43100D08723 /* opl */,
+				DF46B6F61381E1D100D08723 /* fmtowns_pc98 */,
+				DF2040E51380CAA40056300A /* adlib.cpp */,
+				DF2040E61380CAA40056300A /* appleiigs.cpp */,
+				DF2040E71380CAA40056300A /* cms.cpp */,
+				DF2040E81380CAA40056300A /* cms.h */,
+				DF2040E91380CAA40056300A /* eas.cpp */,
+				DF2040EA1380CAA40056300A /* emumidi.h */,
+				DF2040EB1380CAA40056300A /* fluidsynth.cpp */,
+				DF2040EC1380CAA40056300A /* mt32.cpp */,
+				DF2040ED1380CAA40056300A /* pcspk.cpp */,
+				DF2040EE1380CAA40056300A /* pcspk.h */,
+				DF2040EF1380CAA40056300A /* sid.cpp */,
+				DF2040F01380CAA40056300A /* sid.h */,
+				DF2040F11380CAA40056300A /* wave6581.cpp */,
+				DF2040F21380CAA40056300A /* ym2612.cpp */,
+				DF2040F31380CAA40056300A /* ym2612.h */,
+			);
+			name = softsynth;
 			sourceTree = "<group>";
 		};
 		DF2FFBF50F4860A60006E566 /* posix */ = {
@@ -5399,6 +5846,8 @@
 		DF2FFD040F4870E50006E566 /* tucker */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B7D41381E7C600D08723 /* console.cpp */,
+				DF46B7D51381E7C600D08723 /* console.h */,
 				DF2FFD050F4870E50006E566 /* detection.cpp */,
 				DF2FFD060F4870E50006E566 /* graphics.cpp */,
 				DF2FFD070F4870E50006E566 /* graphics.h */,
@@ -5413,35 +5862,6 @@
 			path = tucker;
 			sourceTree = "<group>";
 		};
-		DF45B0EB116627D9009B85CC /* decoders */ = {
-			isa = PBXGroup;
-			children = (
-				DF45B0F7116627DA009B85CC /* adpcm.cpp */,
-				DF45B0F8116627DA009B85CC /* adpcm.h */,
-				DF45B0FA116627DA009B85CC /* aiff.cpp */,
-				DF45B0FB116627DA009B85CC /* aiff.h */,
-				DF45B0FD116627DA009B85CC /* flac.cpp */,
-				DF45B0FE116627DA009B85CC /* flac.h */,
-				DF45B100116627DA009B85CC /* iff_sound.cpp */,
-				DF45B101116627DA009B85CC /* iff_sound.h */,
-				DF7F289E11FF24B000159131 /* mac_snd.cpp */,
-				DF7F289F11FF24B000159131 /* mac_snd.h */,
-				DF45B103116627DA009B85CC /* mp3.cpp */,
-				DF45B104116627DA009B85CC /* mp3.h */,
-				DF45B106116627DA009B85CC /* raw.cpp */,
-				DF45B107116627DA009B85CC /* raw.h */,
-				DF45B109116627DA009B85CC /* vag.cpp */,
-				DF45B10A116627DA009B85CC /* vag.h */,
-				DF45B10C116627DA009B85CC /* voc.cpp */,
-				DF45B10D116627DA009B85CC /* voc.h */,
-				DF45B10F116627DA009B85CC /* vorbis.cpp */,
-				DF45B110116627DA009B85CC /* vorbis.h */,
-				DF45B112116627DA009B85CC /* wave.cpp */,
-				DF45B113116627DA009B85CC /* wave.h */,
-			);
-			path = decoders;
-			sourceTree = "<group>";
-		};
 		DF45B175116628A5009B85CC /* graphics */ = {
 			isa = PBXGroup;
 			children = (
@@ -5541,15 +5961,129 @@
 		DF45B1C5116628A5009B85CC /* video */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B7611381E4D400D08723 /* robot_decoder.cpp */,
+				DF46B7621381E4D400D08723 /* robot_decoder.h */,
 				DF45B1C6116628A5009B85CC /* seq_decoder.cpp */,
 				DF45B1C7116628A5009B85CC /* seq_decoder.h */,
 			);
 			path = video;
 			sourceTree = "<group>";
 		};
+		DF46B6F61381E1D100D08723 /* fmtowns_pc98 */ = {
+			isa = PBXGroup;
+			children = (
+				DF46B6F71381E1FF00D08723 /* towns_audio.cpp */,
+				DF46B6F81381E1FF00D08723 /* towns_audio.h */,
+				DF46B6F91381E1FF00D08723 /* towns_euphony.cpp */,
+				DF46B6FA1381E1FF00D08723 /* towns_euphony.h */,
+				DF46B6FB1381E1FF00D08723 /* towns_pc98_driver.cpp */,
+				DF46B6FC1381E1FF00D08723 /* towns_pc98_driver.h */,
+				DF46B6FD1381E1FF00D08723 /* towns_pc98_fmsynth.cpp */,
+				DF46B6FE1381E1FF00D08723 /* towns_pc98_fmsynth.h */,
+			);
+			name = fmtowns_pc98;
+			sourceTree = "<group>";
+		};
+		DF46B7411381E3F200D08723 /* log */ = {
+			isa = PBXGroup;
+			children = (
+				DF46B7421381E40500D08723 /* log.cpp */,
+				DF46B7431381E40500D08723 /* log.h */,
+			);
+			name = log;
+			sourceTree = "<group>";
+		};
+		DF46B7A21381E5CC00D08723 /* sdl */ = {
+			isa = PBXGroup;
+			children = (
+				DF46B7A31381E5D900D08723 /* sdl-timer.cpp */,
+				DF46B7A41381E5D900D08723 /* sdl-timer.h */,
+			);
+			name = sdl;
+			sourceTree = "<group>";
+		};
+		DF46B7B01381E64E00D08723 /* mutex */ = {
+			isa = PBXGroup;
+			children = (
+				DF46B7B11381E66000D08723 /* sdl */,
+			);
+			name = mutex;
+			sourceTree = "<group>";
+		};
+		DF46B7B11381E66000D08723 /* sdl */ = {
+			isa = PBXGroup;
+			children = (
+				DF46B7B21381E67800D08723 /* sdl-mutex.cpp */,
+				DF46B7B31381E67800D08723 /* sdl-mutex.h */,
+			);
+			name = sdl;
+			sourceTree = "<group>";
+		};
+		DF46B7CC1381E74D00D08723 /* sdl */ = {
+			isa = PBXGroup;
+			children = (
+				DF46B7CD1381E76300D08723 /* sdl-events.cpp */,
+				DF46B7CE1381E76300D08723 /* sdl-events.h */,
+			);
+			name = sdl;
+			path = ..;
+			sourceTree = "<group>";
+		};
+		DF46B8591381F43100D08723 /* opl */ = {
+			isa = PBXGroup;
+			children = (
+				DF46B85A1381F44E00D08723 /* dbopl.cpp */,
+				DF46B85B1381F44E00D08723 /* dbopl.h */,
+				DF46B85C1381F44E00D08723 /* dosbox.cpp */,
+				DF46B85D1381F44E00D08723 /* dosbox.h */,
+				DF46B85E1381F44E00D08723 /* mame.cpp */,
+				DF46B85F1381F44E00D08723 /* mame.h */,
+			);
+			name = opl;
+			sourceTree = "<group>";
+		};
+		DF46B86D1381F47B00D08723 /* audiocd */ = {
+			isa = PBXGroup;
+			children = (
+				DF46B8801381F4FF00D08723 /* audiocd.h */,
+				DF46B8781381F4C500D08723 /* default */,
+				DF46B86E1381F48D00D08723 /* sdl */,
+			);
+			name = audiocd;
+			sourceTree = "<group>";
+		};
+		DF46B86E1381F48D00D08723 /* sdl */ = {
+			isa = PBXGroup;
+			children = (
+				DF46B86F1381F4A200D08723 /* sdl-audiocd.cpp */,
+				DF46B8701381F4A200D08723 /* sdl-audiocd.h */,
+			);
+			name = sdl;
+			sourceTree = "<group>";
+		};
+		DF46B8781381F4C500D08723 /* default */ = {
+			isa = PBXGroup;
+			children = (
+				DF46B87B1381F4F200D08723 /* default-audiocd.cpp */,
+				DF46B87C1381F4F200D08723 /* default-audiocd.h */,
+			);
+			name = default;
+			sourceTree = "<group>";
+		};
+		DF46B8861381F5C600D08723 /* sdl */ = {
+			isa = PBXGroup;
+			children = (
+				DF46B8871381F5D800D08723 /* sdl-provider.cpp */,
+				DF46B8881381F5D800D08723 /* sdl-provider.h */,
+			);
+			name = sdl;
+			sourceTree = "<group>";
+		};
 		DF6118780FE3A9AA0042AD3F /* save */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B8431381F35500D08723 /* saveload_inca2.cpp */,
+				DF46B83B1381F13500D08723 /* saveload_v7.cpp */,
 				DFCDC70311662B0200A7D2A0 /* saveload_fascin.cpp */,
 				DF7585F0100CB70600CC3324 /* saveload_playtoons.cpp */,
 				DF6118790FE3A9AA0042AD3F /* saveconverter.cpp */,
@@ -5557,7 +6091,6 @@
 				DF61187B0FE3A9AA0042AD3F /* saveconverter_v2.cpp */,
 				DF61187C0FE3A9AA0042AD3F /* saveconverter_v3.cpp */,
 				DF61187D0FE3A9AA0042AD3F /* saveconverter_v4.cpp */,
-				DF61187E0FE3A9AA0042AD3F /* saveconverter_v6.cpp */,
 				DF61187F0FE3A9AA0042AD3F /* savefile.cpp */,
 				DF6118800FE3A9AA0042AD3F /* savefile.h */,
 				DF6118810FE3A9AA0042AD3F /* savehandler.cpp */,
@@ -5575,6 +6108,7 @@
 		DF841FF50E7BA6A600F5680E /* engines */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B8851381F56400D08723 /* util.h */,
 				DF2FFC4C0F4863560006E566 /* advancedDetector.cpp */,
 				DF2FFC4D0F4863560006E566 /* advancedDetector.h */,
 				DF841FF60E7BA6A600F5680E /* agi */,
@@ -5757,6 +6291,9 @@
 		DF8420640E7BA6A600F5680E /* cine */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B75B1381E4A400D08723 /* console.cpp */,
+				DF46B75C1381E4A400D08723 /* console.h */,
+				DF46B75D1381E4A400D08723 /* detection_tables.h */,
 				DF8420650E7BA6A600F5680E /* anim.cpp */,
 				DF8420660E7BA6A600F5680E /* anim.h */,
 				DF8420670E7BA6A600F5680E /* bg.cpp */,
@@ -5892,6 +6429,17 @@
 		DF8421170E7BA6A700F5680E /* gob */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B8471381F38700D08723 /* inter_v7.cpp */,
+				DF46B70F1381E27000D08723 /* console.cpp */,
+				DF46B7101381E27000D08723 /* console.h */,
+				DF46B7111381E27000D08723 /* databases.cpp */,
+				DF46B7121381E27000D08723 /* databases.h */,
+				DF46B7131381E27000D08723 /* dbase.cpp */,
+				DF46B7141381E27000D08723 /* dbase.h */,
+				DF46B7151381E27000D08723 /* iniconfig.cpp */,
+				DF46B7161381E27000D08723 /* iniconfig.h */,
+				DF46B7171381E27000D08723 /* init_v7.cpp */,
+				DF46B7181381E27000D08723 /* inter_inca2.cpp */,
 				DF84211B0E7BA6A700F5680E /* dataio.cpp */,
 				DF84211C0E7BA6A700F5680E /* dataio.h */,
 				DF09CC060FAC4E1900A5AFD7 /* demos */,
@@ -5918,7 +6466,6 @@
 				DF8421300E7BA6A700F5680E /* goblin_v2.cpp */,
 				DF8421310E7BA6A700F5680E /* goblin_v3.cpp */,
 				DF8421320E7BA6A700F5680E /* goblin_v4.cpp */,
-				DF6118590FE3A9020042AD3F /* helper.h */,
 				DF7585C5100CB66E00CC3324 /* hotspots.cpp */,
 				DF7585C6100CB66E00CC3324 /* hotspots.h */,
 				DF8421330E7BA6A700F5680E /* init.cpp */,
@@ -6265,6 +6812,8 @@
 		DF8422C90E7BA6A900F5680E /* made */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B8501381F3B400D08723 /* console.cpp */,
+				DF46B8511381F3B400D08723 /* console.h */,
 				DF8422CA0E7BA6A900F5680E /* database.cpp */,
 				DF8422CB0E7BA6A900F5680E /* database.h */,
 				DF8422CC0E7BA6A900F5680E /* detection.cpp */,
@@ -6463,6 +7012,10 @@
 		DF84237B0E7BA6AA00F5680E /* scumm */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B7501381E46700D08723 /* actor_he.h */,
+				DF46B7511381E46700D08723 /* player_v2base.cpp */,
+				DF46B7521381E46700D08723 /* player_v2base.h */,
+				DF46B7531381E46700D08723 /* player_v2cms.h */,
 				DF84237C0E7BA6AA00F5680E /* actor.cpp */,
 				DF84237D0E7BA6AA00F5680E /* actor.h */,
 				DF84237E0E7BA6AA00F5680E /* akos.cpp */,
@@ -6738,6 +7291,8 @@
 		DF84244E0E7BA6AB00F5680E /* sword1 */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B7C61381E72500D08723 /* console.cpp */,
+				DF46B7C71381E72500D08723 /* console.h */,
 				DF84244F0E7BA6AB00F5680E /* animation.cpp */,
 				DF8424500E7BA6AB00F5680E /* animation.h */,
 				DF8424510E7BA6AB00F5680E /* collision.h */,
@@ -6783,6 +7338,7 @@
 		DF8424770E7BA6AB00F5680E /* sword2 */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B7A81381E5F100D08723 /* header.cpp */,
 				DF8424780E7BA6AB00F5680E /* animation.cpp */,
 				DF8424790E7BA6AB00F5680E /* animation.h */,
 				DF84247A0E7BA6AB00F5680E /* anims.cpp */,
@@ -6839,6 +7395,9 @@
 		DF8424AA0E7BA6AB00F5680E /* tinsel */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B8901381F62B00D08723 /* adpcm.cpp */,
+				DF46B8911381F62B00D08723 /* adpcm.h */,
+				DF46B6F21381E18900D08723 /* coroutine.cpp */,
 				DF8424AB0E7BA6AB00F5680E /* actors.cpp */,
 				DF8424AC0E7BA6AB00F5680E /* actors.h */,
 				DF8424AD0E7BA6AB00F5680E /* anim.cpp */,
@@ -6933,6 +7492,8 @@
 		DF8424FC0E7BA6AB00F5680E /* touche */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B84B1381F39E00D08723 /* console.cpp */,
+				DF46B84C1381F39E00D08723 /* console.h */,
 				DF8424FD0E7BA6AB00F5680E /* detection.cpp */,
 				DF8424FE0E7BA6AB00F5680E /* graphics.cpp */,
 				DF8424FF0E7BA6AB00F5680E /* graphics.h */,
@@ -6949,48 +7510,6 @@
 			path = touche;
 			sourceTree = "<group>";
 		};
-		DF895C0C124C24C00077F6E8 /* fmtowns_pc98 */ = {
-			isa = PBXGroup;
-			children = (
-				DF895C0D124C24C00077F6E8 /* towns_audio.cpp */,
-				DF895C0E124C24C00077F6E8 /* towns_audio.h */,
-				DF895C0F124C24C00077F6E8 /* towns_euphony.cpp */,
-				DF895C10124C24C00077F6E8 /* towns_euphony.h */,
-				DF895C11124C24C00077F6E8 /* towns_pc98_driver.cpp */,
-				DF895C12124C24C00077F6E8 /* towns_pc98_driver.h */,
-				DF895C13124C24C00077F6E8 /* towns_pc98_fmsynth.cpp */,
-				DF895C14124C24C00077F6E8 /* towns_pc98_fmsynth.h */,
-			);
-			path = fmtowns_pc98;
-			sourceTree = "<group>";
-		};
-		DF90EABF10B023F300C8F93F /* codecs */ = {
-			isa = PBXGroup;
-			children = (
-				DFB0579611B7549C0015AE65 /* cinepak.cpp */,
-				DFB0579711B7549C0015AE65 /* cinepak.h */,
-				DF90EAC010B023F400C8F93F /* codec.h */,
-				DF895CAB124E58980077F6E8 /* indeo3.cpp */,
-				DF895CAC124E58980077F6E8 /* indeo3.h */,
-				DF895CAD124E58980077F6E8 /* mjpeg.cpp */,
-				DF895CAE124E58980077F6E8 /* mjpeg.h */,
-				DFCDC6FC11662AD700A7D2A0 /* msrle.cpp */,
-				DFCDC6FD11662AD700A7D2A0 /* msrle.h */,
-				DF90EAC110B023F400C8F93F /* msvideo1.cpp */,
-				DF90EAC210B023F400C8F93F /* msvideo1.h */,
-				DF895CAF124E58980077F6E8 /* qdm2.cpp */,
-				DF895CB0124E58980077F6E8 /* qdm2.h */,
-				DF895CB1124E58980077F6E8 /* qdm2data.h */,
-				DF895CB2124E58980077F6E8 /* qtrle.cpp */,
-				DF895CB3124E58980077F6E8 /* qtrle.h */,
-				DF895CB4124E58980077F6E8 /* rpza.cpp */,
-				DF895CB5124E58980077F6E8 /* rpza.h */,
-				DF895CB6124E58980077F6E8 /* smc.cpp */,
-				DF895CB7124E58980077F6E8 /* smc.h */,
-			);
-			path = codecs;
-			sourceTree = "<group>";
-		};
 		DF9B9277118E475D0069C19D /* games */ = {
 			isa = PBXGroup;
 			children = (
@@ -7036,6 +7555,9 @@
 		DFC8301B0F48AF18005EF03C /* engine */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B7BB1381E6C000D08723 /* object.cpp */,
+				DF46B7BC1381E6C000D08723 /* object.h */,
+				DF46B7661381E4E400D08723 /* vm_types.cpp */,
 				DFCDC6D5116629CE00A7D2A0 /* features.cpp */,
 				DFCDC6D6116629CE00A7D2A0 /* features.h */,
 				DFC8301E0F48AF18005EF03C /* gc.cpp */,
@@ -7132,6 +7654,11 @@
 		DFE470D50D81F4E700B6D1FB /* backends */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B86D1381F47B00D08723 /* audiocd */,
+				DF46B7B01381E64E00D08723 /* mutex */,
+				DF46B7471381E40F00D08723 /* modular-backend.cpp */,
+				DF46B7481381E40F00D08723 /* modular-backend.h */,
+				DF46B7411381E3F200D08723 /* log */,
 				DF2FFC5B0F4866E70006E566 /* base-backend.cpp */,
 				DF2FFC5C0F4866E70006E566 /* base-backend.h */,
 				DFE470D60D81F4E700B6D1FB /* events */,
@@ -7149,6 +7676,7 @@
 		DFE470D60D81F4E700B6D1FB /* events */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B7CC1381E74D00D08723 /* sdl */,
 				DFE470D70D81F4E700B6D1FB /* default */,
 			);
 			path = events;
@@ -7178,6 +7706,7 @@
 		DFE470F50D81F4E700B6D1FB /* posix */ = {
 			isa = PBXGroup;
 			children = (
+				DFADEBB613820E0C00C46364 /* posix-fs.cpp */,
 				DF842A4C0E7BBBEB00F5680E /* posix-fs.h */,
 				DFE470F60D81F4E700B6D1FB /* posix-fs-factory.cpp */,
 				DFE470F70D81F4E700B6D1FB /* posix-fs-factory.h */,
@@ -7228,6 +7757,7 @@
 		DFE4737B0D81F4E800B6D1FB /* plugins */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B8861381F5C600D08723 /* sdl */,
 				DFE4737F0D81F4E800B6D1FB /* dynamic-plugin.h */,
 				DFE473800D81F4E800B6D1FB /* posix */,
 			);
@@ -7265,6 +7795,7 @@
 		DFE473910D81F4E800B6D1FB /* timer */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B7A21381E5CC00D08723 /* sdl */,
 				DFE473920D81F4E800B6D1FB /* default */,
 			);
 			path = timer;
@@ -7282,6 +7813,19 @@
 		DFE473950D81F4E800B6D1FB /* common */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B76E1381E54200D08723 /* bufferedstream.h */,
+				DF46B76F1381E54200D08723 /* dcl.cpp */,
+				DF46B7701381E54200D08723 /* dcl.h */,
+				DF46B7711381E54200D08723 /* forbidden.h */,
+				DF46B7721381E54200D08723 /* iff_container.cpp */,
+				DF46B7731381E54200D08723 /* substream.h */,
+				DF46B7741381E54200D08723 /* translation.h */,
+				DF46B7751381E54200D08723 /* winexe_ne.cpp */,
+				DF46B7761381E54200D08723 /* winexe_ne.h */,
+				DF46B7771381E54200D08723 /* winexe_pe.cpp */,
+				DF46B7781381E54200D08723 /* winexe_pe.h */,
+				DF46B7791381E54200D08723 /* winexe.cpp */,
+				DF46B77A1381E54200D08723 /* winexe.h */,
 				DFE473980D81F4E800B6D1FB /* algorithm.h */,
 				DF842A400E7BBBB400F5680E /* archive.cpp */,
 				DF842A410E7BBBB400F5680E /* archive.h */,
@@ -7368,6 +7912,13 @@
 		DFE477520D81F4E900B6D1FB /* graphics */ = {
 			isa = PBXGroup;
 			children = (
+				DFADEBB113820DF500C46364 /* maccursor.cpp */,
+				DFADEBB213820DF500C46364 /* maccursor.h */,
+				DF46B78E1381E58000D08723 /* palette.h */,
+				DF46B78F1381E58000D08723 /* png.cpp */,
+				DF46B7901381E58000D08723 /* png.h */,
+				DF46B7911381E58000D08723 /* wincursor.cpp */,
+				DF46B7921381E58000D08723 /* wincursor.h */,
 				DFE477530D81F4E900B6D1FB /* colormasks.h */,
 				DF6BF4C010529DA50069811F /* conversion.cpp */,
 				DF6BF4C110529DA50069811F /* conversion.h */,
@@ -7404,7 +7955,6 @@
 				DF7E8C080ED5FCAF001CB19F /* VectorRenderer.h */,
 				DF7E8C090ED5FCAF001CB19F /* VectorRendererSpec.cpp */,
 				DF7E8C0A0ED5FCAF001CB19F /* VectorRendererSpec.h */,
-				DF2FFB940F485D950006E566 /* video */,
 			);
 			name = graphics;
 			path = ../../graphics;
@@ -7413,6 +7963,8 @@
 		DFE4775C0D81F4E900B6D1FB /* fonts */ = {
 			isa = PBXGroup;
 			children = (
+				DF46B79D1381E5B500D08723 /* winfont.cpp */,
+				DF46B79E1381E5B500D08723 /* winfont.h */,
 				DFE4775D0D81F4E900B6D1FB /* consolefont.cpp */,
 				DFE4775E0D81F4E900B6D1FB /* newfont.cpp */,
 				DFE4775F0D81F4E900B6D1FB /* newfont_big.cpp */,
@@ -7424,6 +7976,8 @@
 		DFE477880D81F4E900B6D1FB /* gui */ = {
 			isa = PBXGroup;
 			children = (
+				DF2040211380C8A60056300A /* widgets */,
+				DF203F461380C06E0056300A /* gui-manager.cpp */,
 				DFE477890D81F4E900B6D1FB /* about.cpp */,
 				DFE4778A0D81F4E900B6D1FB /* about.h */,
 				DFE4778B0D81F4E900B6D1FB /* Actions.cpp */,
@@ -7440,20 +7994,13 @@
 				DFE477950D81F4E900B6D1FB /* debugger.h */,
 				DFE477960D81F4E900B6D1FB /* dialog.cpp */,
 				DFE477970D81F4E900B6D1FB /* dialog.h */,
-				DFE477980D81F4E900B6D1FB /* editable.cpp */,
-				DFE477990D81F4E900B6D1FB /* editable.h */,
-				DFE4779A0D81F4E900B6D1FB /* EditTextWidget.cpp */,
-				DFE4779B0D81F4E900B6D1FB /* EditTextWidget.h */,
 				DF9B9246118E46730069C19D /* error.cpp */,
 				DF9B9247118E46730069C19D /* error.h */,
-				DF2FFBD50F485E360006E566 /* gui-manager.hcpp */,
 				DF2FFBD60F485E360006E566 /* gui-manager.h */,
 				DFE4779E0D81F4E900B6D1FB /* Key.cpp */,
 				DFE4779F0D81F4E900B6D1FB /* Key.h */,
 				DFE477A20D81F4E900B6D1FB /* launcher.cpp */,
 				DFE477A30D81F4E900B6D1FB /* launcher.h */,
-				DFE477A40D81F4E900B6D1FB /* ListWidget.cpp */,
-				DFE477A50D81F4E900B6D1FB /* ListWidget.h */,
 				DFE477A60D81F4E900B6D1FB /* massadd.cpp */,
 				DFE477A70D81F4E900B6D1FB /* massadd.h */,
 				DFE477A80D81F4E900B6D1FB /* message.cpp */,
@@ -7462,14 +8009,8 @@
 				DFE477AE0D81F4E900B6D1FB /* object.h */,
 				DFE477AF0D81F4E900B6D1FB /* options.cpp */,
 				DFE477B00D81F4E900B6D1FB /* options.h */,
-				DFE477B10D81F4E900B6D1FB /* PopUpWidget.cpp */,
-				DFE477B20D81F4E900B6D1FB /* PopUpWidget.h */,
 				DF7E8BF00ED5FC77001CB19F /* saveload.cpp */,
 				DF7E8BF10ED5FC77001CB19F /* saveload.h */,
-				DFE477B30D81F4E900B6D1FB /* ScrollBarWidget.cpp */,
-				DFE477B40D81F4E900B6D1FB /* ScrollBarWidget.h */,
-				DFE477B50D81F4E900B6D1FB /* TabWidget.cpp */,
-				DFE477B60D81F4E900B6D1FB /* TabWidget.h */,
 				DFE477BA0D81F4E900B6D1FB /* themebrowser.cpp */,
 				DFE477BB0D81F4E900B6D1FB /* themebrowser.h */,
 				DF7E8BF40ED5FC77001CB19F /* ThemeEngine.cpp */,
@@ -7499,98 +8040,6 @@
 			path = themes;
 			sourceTree = "<group>";
 		};
-		DFE477C60D81F4E900B6D1FB /* sound */ = {
-			isa = PBXGroup;
-			children = (
-				DFE477CB0D81F4E900B6D1FB /* audiocd.cpp */,
-				DFE477CC0D81F4E900B6D1FB /* audiocd.h */,
-				DFE477CD0D81F4E900B6D1FB /* audiostream.cpp */,
-				DFE477CE0D81F4E900B6D1FB /* audiostream.h */,
-				DF45B0EB116627D9009B85CC /* decoders */,
-				DFE477D10D81F4E900B6D1FB /* fmopl.cpp */,
-				DFE477D20D81F4E900B6D1FB /* fmopl.h */,
-				DFE477D50D81F4E900B6D1FB /* mididrv.cpp */,
-				DFE477D60D81F4E900B6D1FB /* mididrv.h */,
-				DFE477D70D81F4E900B6D1FB /* midiparser.cpp */,
-				DFE477D80D81F4E900B6D1FB /* midiparser.h */,
-				DFE477D90D81F4E900B6D1FB /* midiparser_smf.cpp */,
-				DFE477DA0D81F4E900B6D1FB /* midiparser_xmidi.cpp */,
-				DFE477DB0D81F4E900B6D1FB /* mixer.cpp */,
-				DFE477DC0D81F4E900B6D1FB /* mixer.h */,
-				DFE477DD0D81F4E900B6D1FB /* mods */,
-				DFE477ED0D81F4E900B6D1FB /* mpu401.cpp */,
-				DFE477EE0D81F4E900B6D1FB /* mpu401.h */,
-				DF842A6F0E7BBDB200F5680E /* musicplugin.cpp */,
-				DF842A700E7BBDB200F5680E /* musicplugin.h */,
-				DFE477EF0D81F4E900B6D1FB /* null.cpp */,
-				DFE477F00D81F4E900B6D1FB /* rate.cpp */,
-				DFE477F10D81F4E900B6D1FB /* rate.h */,
-				DFE477F60D81F4E900B6D1FB /* softsynth */,
-				DF89C2B80F62D91000D756B6 /* timestamp.cpp */,
-				DF89C2B90F62D91000D756B6 /* timestamp.h */,
-			);
-			name = sound;
-			path = ../../sound;
-			sourceTree = SOURCE_ROOT;
-		};
-		DFE477DD0D81F4E900B6D1FB /* mods */ = {
-			isa = PBXGroup;
-			children = (
-				DFE477DE0D81F4E900B6D1FB /* infogrames.cpp */,
-				DFE477DF0D81F4E900B6D1FB /* infogrames.h */,
-				DF6BF50210529F540069811F /* maxtrax.cpp */,
-				DF6BF50310529F540069811F /* maxtrax.h */,
-				DFE477E00D81F4E900B6D1FB /* module.cpp */,
-				DFE477E10D81F4E900B6D1FB /* module.h */,
-				DFE477E20D81F4E900B6D1FB /* paula.cpp */,
-				DFE477E30D81F4E900B6D1FB /* paula.h */,
-				DFE477E40D81F4E900B6D1FB /* protracker.cpp */,
-				DFE477E50D81F4E900B6D1FB /* protracker.h */,
-				DFE477E60D81F4E900B6D1FB /* rjp1.cpp */,
-				DFE477E70D81F4E900B6D1FB /* rjp1.h */,
-				DFE477E80D81F4E900B6D1FB /* soundfx.cpp */,
-				DFE477E90D81F4E900B6D1FB /* soundfx.h */,
-				DF6BF50410529F540069811F /* tfmx.cpp */,
-				DF6BF50510529F540069811F /* tfmx.h */,
-			);
-			path = mods;
-			sourceTree = "<group>";
-		};
-		DFE477F60D81F4E900B6D1FB /* softsynth */ = {
-			isa = PBXGroup;
-			children = (
-				DFE477F70D81F4E900B6D1FB /* adlib.cpp */,
-				DF895C08124C24B50077F6E8 /* appleiigs.cpp */,
-				DF0E303F1252C6090082D593 /* cms.cpp */,
-				DF0E30401252C6090082D593 /* cms.h */,
-				DFE477F80D81F4E900B6D1FB /* emumidi.h */,
-				DFE477F90D81F4E900B6D1FB /* fluidsynth.cpp */,
-				DF895C0C124C24C00077F6E8 /* fmtowns_pc98 */,
-				DFF958A80FB222F300A3EC78 /* opl */,
-				DFE478210D81F4E900B6D1FB /* pcspk.cpp */,
-				DFE478220D81F4E900B6D1FB /* pcspk.h */,
-				DF2EC51010E64E3100765801 /* sid.cpp */,
-				DF2EC51110E64E3100765801 /* sid.h */,
-				DF2EC51710E64EE600765801 /* wave6581.cpp */,
-				DFE478230D81F4E900B6D1FB /* ym2612.cpp */,
-				DFE478240D81F4E900B6D1FB /* ym2612.h */,
-			);
-			path = softsynth;
-			sourceTree = "<group>";
-		};
-		DFF958A80FB222F300A3EC78 /* opl */ = {
-			isa = PBXGroup;
-			children = (
-				DFEC5D3D1166C6B400C90552 /* dbopl.cpp */,
-				DFEC5D3E1166C6B400C90552 /* dbopl.h */,
-				DFF958A90FB222F300A3EC78 /* dosbox.cpp */,
-				DFF958AA0FB222F300A3EC78 /* dosbox.h */,
-				DF6118CF0FE3AB560042AD3F /* mame.cpp */,
-				DF6118D00FE3AB560042AD3F /* mame.h */,
-			);
-			path = opl;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -7788,41 +8237,14 @@
 				DFE47C200D81F4E900B6D1FB /* console.cpp in Sources */,
 				DFE47C210D81F4E900B6D1FB /* debugger.cpp in Sources */,
 				DFE47C220D81F4E900B6D1FB /* dialog.cpp in Sources */,
-				DFE47C230D81F4E900B6D1FB /* editable.cpp in Sources */,
-				DFE47C240D81F4E900B6D1FB /* EditTextWidget.cpp in Sources */,
 				DFE47C260D81F4E900B6D1FB /* Key.cpp in Sources */,
 				DFE47C280D81F4E900B6D1FB /* launcher.cpp in Sources */,
-				DFE47C290D81F4E900B6D1FB /* ListWidget.cpp in Sources */,
 				DFE47C2A0D81F4E900B6D1FB /* massadd.cpp in Sources */,
 				DFE47C2B0D81F4E900B6D1FB /* message.cpp in Sources */,
 				DFE47C2E0D81F4E900B6D1FB /* object.cpp in Sources */,
 				DFE47C2F0D81F4E900B6D1FB /* options.cpp in Sources */,
-				DFE47C300D81F4E900B6D1FB /* PopUpWidget.cpp in Sources */,
-				DFE47C310D81F4E900B6D1FB /* ScrollBarWidget.cpp in Sources */,
-				DFE47C320D81F4E900B6D1FB /* TabWidget.cpp in Sources */,
 				DFE47C350D81F4E900B6D1FB /* themebrowser.cpp in Sources */,
 				DFE47C3B0D81F4E900B6D1FB /* widget.cpp in Sources */,
-				DFE47C3E0D81F4E900B6D1FB /* audiocd.cpp in Sources */,
-				DFE47C3F0D81F4E900B6D1FB /* audiostream.cpp in Sources */,
-				DFE47C410D81F4E900B6D1FB /* fmopl.cpp in Sources */,
-				DFE47C430D81F4E900B6D1FB /* mididrv.cpp in Sources */,
-				DFE47C440D81F4E900B6D1FB /* midiparser.cpp in Sources */,
-				DFE47C450D81F4E900B6D1FB /* midiparser_smf.cpp in Sources */,
-				DFE47C460D81F4E900B6D1FB /* midiparser_xmidi.cpp in Sources */,
-				DFE47C470D81F4E900B6D1FB /* mixer.cpp in Sources */,
-				DFE47C480D81F4E900B6D1FB /* infogrames.cpp in Sources */,
-				DFE47C490D81F4E900B6D1FB /* module.cpp in Sources */,
-				DFE47C4A0D81F4E900B6D1FB /* paula.cpp in Sources */,
-				DFE47C4B0D81F4E900B6D1FB /* protracker.cpp in Sources */,
-				DFE47C4C0D81F4E900B6D1FB /* rjp1.cpp in Sources */,
-				DFE47C4D0D81F4E900B6D1FB /* soundfx.cpp in Sources */,
-				DFE47C500D81F4E900B6D1FB /* mpu401.cpp in Sources */,
-				DFE47C510D81F4E900B6D1FB /* null.cpp in Sources */,
-				DFE47C520D81F4E900B6D1FB /* rate.cpp in Sources */,
-				DFE47C570D81F4E900B6D1FB /* adlib.cpp in Sources */,
-				DFE47C580D81F4E900B6D1FB /* fluidsynth.cpp in Sources */,
-				DFE47C740D81F4E900B6D1FB /* pcspk.cpp in Sources */,
-				DFE47C750D81F4E900B6D1FB /* ym2612.cpp in Sources */,
 				DFD511480DF3383500854012 /* memorypool.cpp in Sources */,
 				DFD517E20DF33CAC00854012 /* seq.cpp in Sources */,
 				DFD5183D0DF3411800854012 /* scaler.cpp in Sources */,
@@ -8453,7 +8875,6 @@
 				DF842A470E7BBBB400F5680E /* archive.cpp in Sources */,
 				DF842A490E7BBBB400F5680E /* unarj.cpp in Sources */,
 				DF842A6D0E7BBD5700F5680E /* stdiostream.cpp in Sources */,
-				DF842A710E7BBDB200F5680E /* musicplugin.cpp in Sources */,
 				DF7E8BFD0ED5FC77001CB19F /* saveload.cpp in Sources */,
 				DF7E8BFF0ED5FC77001CB19F /* ThemeEngine.cpp in Sources */,
 				DF7E8C000ED5FC77001CB19F /* ThemeEval.cpp in Sources */,
@@ -8470,7 +8891,6 @@
 				DFAAB0020F011392003E9390 /* thumbnail_intern.cpp in Sources */,
 				DF2FFB930F485D890006E566 /* dither.cpp in Sources */,
 				DF2FFBD30F485DFB0006E566 /* debug.cpp in Sources */,
-				DF2FFBD90F485E360006E566 /* gui-manager.hcpp in Sources */,
 				DF2FFBFC0F4860A60006E566 /* posix-saves.cpp in Sources */,
 				DF2FFC290F4862520006E566 /* bmv.cpp in Sources */,
 				DF2FFC2A0F4862520006E566 /* dialogs.cpp in Sources */,
@@ -8542,7 +8962,6 @@
 				DF573CBE0F5A85E100961A72 /* timer_lol.cpp in Sources */,
 				DF89C2880F62D55C00D756B6 /* sprites_lol.cpp in Sources */,
 				DF89C2A40F62D79E00D756B6 /* script.cpp in Sources */,
-				DF89C2BB0F62D91000D756B6 /* timestamp.cpp in Sources */,
 				DF093E5F0F63CAD4002D821E /* pn.cpp in Sources */,
 				DF093E600F63CAD4002D821E /* script_pn.cpp in Sources */,
 				DF093E610F63CAD4002D821E /* vga_pn.cpp in Sources */,
@@ -8557,20 +8976,15 @@
 				DF09CC1B0FAC4E1900A5AFD7 /* inter_fascin.cpp in Sources */,
 				DF09CC2A0FAC4EAB00A5AFD7 /* script_v3.cpp in Sources */,
 				DF09CC2B0FAC4EAB00A5AFD7 /* script_v4.cpp in Sources */,
-				DFF958B20FB222F300A3EC78 /* dosbox.cpp in Sources */,
 				DF61183E0FE3A8080042AD3F /* kmisc.cpp in Sources */,
 				DF61183F0FE3A8080042AD3F /* segment.cpp in Sources */,
 				DF61184C0FE3A8250042AD3F /* decompressor.cpp in Sources */,
 				DF61184D0FE3A8250042AD3F /* resource.cpp in Sources */,
 				DF6118560FE3A8990042AD3F /* disk.cpp in Sources */,
-				DF61186D0FE3A9410042AD3F /* dxa_decoder.cpp in Sources */,
-				DF61186E0FE3A9410042AD3F /* flic_decoder.cpp in Sources */,
-				DF61186F0FE3A9410042AD3F /* smk_decoder.cpp in Sources */,
 				DF6118950FE3A9AA0042AD3F /* saveconverter.cpp in Sources */,
 				DF6118960FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */,
 				DF6118970FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */,
 				DF6118980FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */,
-				DF6118990FE3A9AA0042AD3F /* saveconverter_v6.cpp in Sources */,
 				DF61189A0FE3A9AA0042AD3F /* savefile.cpp in Sources */,
 				DF61189B0FE3A9AA0042AD3F /* savehandler.cpp in Sources */,
 				DF61189C0FE3A9AA0042AD3F /* saveload.cpp in Sources */,
@@ -8584,7 +8998,6 @@
 				DF6118BE0FE3AA280042AD3F /* sound_pcspk.cpp in Sources */,
 				DF6118BF0FE3AA280042AD3F /* text_lol.cpp in Sources */,
 				DF6118C80FE3AABD0042AD3F /* player_v2cms.cpp in Sources */,
-				DF6118D30FE3AB560042AD3F /* mame.cpp in Sources */,
 				DF7585DA100CB66E00CC3324 /* expression.cpp in Sources */,
 				DF7585DB100CB66E00CC3324 /* hotspots.cpp in Sources */,
 				DF7585DC100CB66E00CC3324 /* init_v6.cpp in Sources */,
@@ -8609,31 +9022,15 @@
 				DF6BF4F410529EE40069811F /* player_v4a.cpp in Sources */,
 				DF6BF4FE10529F140069811F /* EventDispatcher.cpp in Sources */,
 				DF6BF4FF10529F140069811F /* EventRecorder.cpp in Sources */,
-				DF6BF50810529F540069811F /* maxtrax.cpp in Sources */,
-				DF6BF50910529F540069811F /* tfmx.cpp in Sources */,
 				DF90E9C310AEDA9B00C8F93F /* selector.cpp in Sources */,
 				DF90EAA610B0234300C8F93F /* draw_playtoons.cpp in Sources */,
 				DF90EAAF10B0236F00C8F93F /* staticres.cpp in Sources */,
-				DF90EABA10B023D100C8F93F /* avi_decoder.cpp in Sources */,
-				DF90EAC510B023F400C8F93F /* msvideo1.cpp in Sources */,
 				DF2EC3F910E64C0C00765801 /* dialogs.cpp in Sources */,
 				DF2EC3FF10E64C4300765801 /* animator_tim.cpp in Sources */,
 				DF2EC40610E64C8000765801 /* event.cpp in Sources */,
 				DF2EC50310E64D7C00765801 /* player_pce.cpp in Sources */,
 				DF2EC50410E64D7C00765801 /* player_sid.cpp in Sources */,
 				DF2EC50C10E64DB300765801 /* textconsole.cpp in Sources */,
-				DF2EC51310E64E3100765801 /* sid.cpp in Sources */,
-				DF2EC51910E64EE600765801 /* wave6581.cpp in Sources */,
-				DF45B11F116627DA009B85CC /* adpcm.cpp in Sources */,
-				DF45B121116627DA009B85CC /* aiff.cpp in Sources */,
-				DF45B123116627DA009B85CC /* flac.cpp in Sources */,
-				DF45B125116627DA009B85CC /* iff_sound.cpp in Sources */,
-				DF45B127116627DA009B85CC /* mp3.cpp in Sources */,
-				DF45B129116627DA009B85CC /* raw.cpp in Sources */,
-				DF45B12B116627DA009B85CC /* vag.cpp in Sources */,
-				DF45B12D116627DA009B85CC /* voc.cpp in Sources */,
-				DF45B12F116627DA009B85CC /* vorbis.cpp in Sources */,
-				DF45B131116627DA009B85CC /* wave.cpp in Sources */,
 				DF45B1CA116628A5009B85CC /* animate.cpp in Sources */,
 				DF45B1CB116628A5009B85CC /* cache.cpp in Sources */,
 				DF45B1CC116628A5009B85CC /* compare.cpp in Sources */,
@@ -8667,25 +9064,19 @@
 				DFCDC6D9116629CE00A7D2A0 /* features.cpp in Sources */,
 				DFCDC6DA116629CE00A7D2A0 /* kparse.cpp in Sources */,
 				DFCDC6F711662AAB00A7D2A0 /* resource.cpp in Sources */,
-				DFCDC6FE11662AD700A7D2A0 /* msrle.cpp in Sources */,
 				DFCDC70411662B0200A7D2A0 /* saveload_fascin.cpp in Sources */,
 				DFCDC70B11662B6B00A7D2A0 /* macresman.cpp in Sources */,
 				DFEC5D121166C5CF00C90552 /* random.cpp in Sources */,
 				DFEC5D131166C5CF00C90552 /* tokenizer.cpp in Sources */,
 				DFEC5D371166C67300C90552 /* savestate.cpp in Sources */,
-				DFEC5D401166C6B400C90552 /* dbopl.cpp in Sources */,
 				DF9B9249118E46730069C19D /* error.cpp in Sources */,
 				DF9B9254118E46A00069C19D /* fontsjis.cpp in Sources */,
 				DF9B9263118E46FE0069C19D /* error.cpp in Sources */,
-				DFB0576B11B753AF0015AE65 /* mpeg_player.cpp in Sources */,
-				DFB0576C11B753AF0015AE65 /* qt_decoder.cpp in Sources */,
-				DFB0576D11B753AF0015AE65 /* video_decoder.cpp in Sources */,
 				DFB0577711B753DA0015AE65 /* rational.cpp in Sources */,
 				DFB0578211B7541F0015AE65 /* resource_audio.cpp in Sources */,
 				DFB0578311B7541F0015AE65 /* util.cpp in Sources */,
 				DFB0578B11B754570015AE65 /* maciconbar.cpp in Sources */,
 				DFB0579211B7547D0015AE65 /* pict.cpp in Sources */,
-				DFB0579911B7549C0015AE65 /* cinepak.cpp in Sources */,
 				DF7F286211FF23D500159131 /* amigamac.cpp in Sources */,
 				DF7F286911FF23EF00159131 /* kvideo.cpp in Sources */,
 				DF7F286A11FF23EF00159131 /* workarounds.cpp in Sources */,
@@ -8696,25 +9087,11 @@
 				DF7F288311FF243B00159131 /* sound_sarien.cpp in Sources */,
 				DF7F288C11FF244F00159131 /* Tooltip.cpp in Sources */,
 				DF7F289511FF247300159131 /* translation.cpp in Sources */,
-				DF7F28A111FF24B000159131 /* mac_snd.cpp in Sources */,
 				DF7F28A611FF24C400159131 /* console.cpp in Sources */,
-				DF895BFE124C24350077F6E8 /* coktel_decoder.cpp in Sources */,
 				DF895C03124C24680077F6E8 /* player_towns.cpp in Sources */,
-				DF895C09124C24B60077F6E8 /* appleiigs.cpp in Sources */,
-				DF895C15124C24C10077F6E8 /* towns_audio.cpp in Sources */,
-				DF895C16124C24C10077F6E8 /* towns_euphony.cpp in Sources */,
-				DF895C17124C24C10077F6E8 /* towns_pc98_driver.cpp in Sources */,
-				DF895C18124C24C10077F6E8 /* towns_pc98_fmsynth.cpp in Sources */,
 				DF895C25124C25150077F6E8 /* init_fascin.cpp in Sources */,
 				DF895C2A124C25350077F6E8 /* script_patches.cpp in Sources */,
-				DF895CB8124E58980077F6E8 /* indeo3.cpp in Sources */,
-				DF895CB9124E58980077F6E8 /* mjpeg.cpp in Sources */,
-				DF895CBA124E58980077F6E8 /* qdm2.cpp in Sources */,
-				DF895CBB124E58980077F6E8 /* qtrle.cpp in Sources */,
-				DF895CBC124E58980077F6E8 /* rpza.cpp in Sources */,
-				DF895CBD124E58990077F6E8 /* smc.cpp in Sources */,
 				DF0E303B1252C5BD0082D593 /* cms.cpp in Sources */,
-				DF0E30421252C6090082D593 /* cms.cpp in Sources */,
 				8CB5A9CB1253FD6900CB6BC7 /* m4_scene.cpp in Sources */,
 				8CB5A9CC1253FD6900CB6BC7 /* mads_logic.cpp in Sources */,
 				8CB5A9CD1253FD6900CB6BC7 /* mads_player.cpp in Sources */,
@@ -8722,7 +9099,6 @@
 				8CB5A9CF1253FD6900CB6BC7 /* mads_views.cpp in Sources */,
 				8CD1ED53126202AB00FA198C /* detection.cpp in Sources */,
 				8CD1ED54126202AB00FA198C /* display.cpp in Sources */,
-				8CD1ED55126202AB00FA198C /* engine.cpp in Sources */,
 				8CD1ED56126202AB00FA198C /* file.cpp in Sources */,
 				8CD1ED57126202AB00FA198C /* hugo.cpp in Sources */,
 				8CD1ED58126202AB00FA198C /* intro.cpp in Sources */,
@@ -8771,6 +9147,134 @@
 				8CD80D13126272A0001C6C87 /* surface.cpp in Sources */,
 				8CD80D14126272A0001C6C87 /* surface_list.cpp in Sources */,
 				8CD80D15126272A0001C6C87 /* teenagent.cpp in Sources */,
+				DF203F481380C06E0056300A /* gui-manager.cpp in Sources */,
+				DF203F6B1380C2750056300A /* avi_decoder.cpp in Sources */,
+				DF203F6C1380C2750056300A /* coktel_decoder.cpp in Sources */,
+				DF203F6D1380C2750056300A /* dxa_decoder.cpp in Sources */,
+				DF203F6E1380C2750056300A /* flic_decoder.cpp in Sources */,
+				DF203F701380C2750056300A /* qt_decoder.cpp in Sources */,
+				DF203F711380C2750056300A /* smk_decoder.cpp in Sources */,
+				DF203F721380C2750056300A /* video_decoder.cpp in Sources */,
+				DF203FA01380C2920056300A /* cdtoons.cpp in Sources */,
+				DF203FA11380C2920056300A /* cinepak.cpp in Sources */,
+				DF203FA21380C2920056300A /* indeo3.cpp in Sources */,
+				DF203FA31380C2920056300A /* mjpeg.cpp in Sources */,
+				DF203FA41380C2920056300A /* msrle.cpp in Sources */,
+				DF203FA51380C2920056300A /* msvideo1.cpp in Sources */,
+				DF203FA61380C2920056300A /* qdm2.cpp in Sources */,
+				DF203FA71380C2920056300A /* qtrle.cpp in Sources */,
+				DF203FA81380C2920056300A /* rpza.cpp in Sources */,
+				DF203FA91380C2920056300A /* smc.cpp in Sources */,
+				DF203FAA1380C2920056300A /* truemotion1.cpp in Sources */,
+				DF203FE61380C3BC0056300A /* console.cpp in Sources */,
+				DF203FE71380C3BC0056300A /* dialogs.cpp in Sources */,
+				DF203FE81380C3BC0056300A /* file_v1d.cpp in Sources */,
+				DF203FE91380C3BC0056300A /* file_v1w.cpp in Sources */,
+				DF203FEA1380C3BC0056300A /* file_v2d.cpp in Sources */,
+				DF203FEB1380C3BC0056300A /* file_v2w.cpp in Sources */,
+				DF203FEC1380C3BC0056300A /* file_v3d.cpp in Sources */,
+				DF203FED1380C3BC0056300A /* object_v1d.cpp in Sources */,
+				DF203FEE1380C3BC0056300A /* object_v1w.cpp in Sources */,
+				DF203FEF1380C3BC0056300A /* object_v2d.cpp in Sources */,
+				DF203FF01380C3BC0056300A /* object_v3d.cpp in Sources */,
+				DF203FF11380C3BC0056300A /* object.cpp in Sources */,
+				DF203FF21380C3BC0056300A /* parser_v1d.cpp in Sources */,
+				DF203FF31380C3BC0056300A /* parser_v1w.cpp in Sources */,
+				DF203FF41380C3BC0056300A /* parser_v2d.cpp in Sources */,
+				DF203FF51380C3BC0056300A /* parser_v3d.cpp in Sources */,
+				DF203FF61380C3BC0056300A /* text.cpp in Sources */,
+				DF2040341380C8B70056300A /* editable.cpp in Sources */,
+				DF2040351380C8B70056300A /* edittext.cpp in Sources */,
+				DF2040361380C8B70056300A /* list.cpp in Sources */,
+				DF2040371380C8B70056300A /* popup.cpp in Sources */,
+				DF2040381380C8B70056300A /* scrollbar.cpp in Sources */,
+				DF2040391380C8B70056300A /* tab.cpp in Sources */,
+				DF20406A1380CA230056300A /* audiostream.cpp in Sources */,
+				DF20406B1380CA230056300A /* fmopl.cpp in Sources */,
+				DF20406C1380CA230056300A /* mididrv.cpp in Sources */,
+				DF20406D1380CA230056300A /* midiparser_smf.cpp in Sources */,
+				DF20406E1380CA230056300A /* midiparser_xmidi.cpp in Sources */,
+				DF20406F1380CA230056300A /* midiparser.cpp in Sources */,
+				DF2040701380CA230056300A /* midiplayer.cpp in Sources */,
+				DF2040711380CA230056300A /* mixer.cpp in Sources */,
+				DF2040721380CA230056300A /* mpu401.cpp in Sources */,
+				DF2040731380CA230056300A /* musicplugin.cpp in Sources */,
+				DF2040741380CA230056300A /* rate.cpp in Sources */,
+				DF2040751380CA230056300A /* timestamp.cpp in Sources */,
+				DF2040A51380CA400056300A /* adpcm.cpp in Sources */,
+				DF2040A61380CA400056300A /* aiff.cpp in Sources */,
+				DF2040A71380CA400056300A /* flac.cpp in Sources */,
+				DF2040A81380CA400056300A /* iff_sound.cpp in Sources */,
+				DF2040A91380CA400056300A /* mac_snd.cpp in Sources */,
+				DF2040AA1380CA400056300A /* mp3.cpp in Sources */,
+				DF2040AB1380CA400056300A /* raw.cpp in Sources */,
+				DF2040AC1380CA400056300A /* vag.cpp in Sources */,
+				DF2040AD1380CA400056300A /* voc.cpp in Sources */,
+				DF2040AE1380CA400056300A /* vorbis.cpp in Sources */,
+				DF2040AF1380CA400056300A /* wave.cpp in Sources */,
+				DF2040D41380CA810056300A /* infogrames.cpp in Sources */,
+				DF2040D51380CA810056300A /* maxtrax.cpp in Sources */,
+				DF2040D61380CA810056300A /* module.cpp in Sources */,
+				DF2040D71380CA810056300A /* paula.cpp in Sources */,
+				DF2040D81380CA810056300A /* protracker.cpp in Sources */,
+				DF2040D91380CA810056300A /* rjp1.cpp in Sources */,
+				DF2040DA1380CA810056300A /* soundfx.cpp in Sources */,
+				DF2040DB1380CA810056300A /* tfmx.cpp in Sources */,
+				DF2040FE1380CAA40056300A /* adlib.cpp in Sources */,
+				DF2040FF1380CAA40056300A /* appleiigs.cpp in Sources */,
+				DF2041001380CAA40056300A /* cms.cpp in Sources */,
+				DF2041011380CAA40056300A /* eas.cpp in Sources */,
+				DF2041021380CAA40056300A /* fluidsynth.cpp in Sources */,
+				DF2041031380CAA40056300A /* mt32.cpp in Sources */,
+				DF2041041380CAA40056300A /* pcspk.cpp in Sources */,
+				DF2041051380CAA40056300A /* sid.cpp in Sources */,
+				DF2041061380CAA40056300A /* wave6581.cpp in Sources */,
+				DF2041071380CAA40056300A /* ym2612.cpp in Sources */,
+				DF46B6F41381E18900D08723 /* coroutine.cpp in Sources */,
+				DF46B7031381E1FF00D08723 /* towns_audio.cpp in Sources */,
+				DF46B7041381E1FF00D08723 /* towns_euphony.cpp in Sources */,
+				DF46B7051381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */,
+				DF46B7061381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */,
+				DF46B71F1381E27000D08723 /* console.cpp in Sources */,
+				DF46B7201381E27000D08723 /* databases.cpp in Sources */,
+				DF46B7211381E27000D08723 /* dbase.cpp in Sources */,
+				DF46B7221381E27000D08723 /* iniconfig.cpp in Sources */,
+				DF46B7231381E27000D08723 /* init_v7.cpp in Sources */,
+				DF46B7241381E27000D08723 /* inter_inca2.cpp in Sources */,
+				DF46B7451381E40500D08723 /* log.cpp in Sources */,
+				DF46B74A1381E40F00D08723 /* modular-backend.cpp in Sources */,
+				DF46B7551381E46700D08723 /* player_v2base.cpp in Sources */,
+				DF46B75F1381E4A400D08723 /* console.cpp in Sources */,
+				DF46B7641381E4D400D08723 /* robot_decoder.cpp in Sources */,
+				DF46B7681381E4E400D08723 /* vm_types.cpp in Sources */,
+				DF46B7801381E54200D08723 /* dcl.cpp in Sources */,
+				DF46B7811381E54200D08723 /* iff_container.cpp in Sources */,
+				DF46B7821381E54200D08723 /* winexe_ne.cpp in Sources */,
+				DF46B7831381E54200D08723 /* winexe_pe.cpp in Sources */,
+				DF46B7841381E54200D08723 /* winexe.cpp in Sources */,
+				DF46B7951381E58000D08723 /* png.cpp in Sources */,
+				DF46B7961381E58000D08723 /* wincursor.cpp in Sources */,
+				DF46B7A01381E5B500D08723 /* winfont.cpp in Sources */,
+				DF46B7AA1381E5F100D08723 /* header.cpp in Sources */,
+				DF46B7B51381E67800D08723 /* sdl-mutex.cpp in Sources */,
+				DF46B7BE1381E6C000D08723 /* object.cpp in Sources */,
+				DF46B7C91381E72500D08723 /* console.cpp in Sources */,
+				DF46B7D71381E7C600D08723 /* console.cpp in Sources */,
+				DF46B83D1381F13500D08723 /* saveload_v7.cpp in Sources */,
+				DF46B8451381F35500D08723 /* saveload_inca2.cpp in Sources */,
+				DF46B8491381F38700D08723 /* inter_v7.cpp in Sources */,
+				DF46B84E1381F39E00D08723 /* console.cpp in Sources */,
+				DF46B8531381F3B400D08723 /* console.cpp in Sources */,
+				DF46B8631381F44E00D08723 /* dbopl.cpp in Sources */,
+				DF46B8641381F44E00D08723 /* dosbox.cpp in Sources */,
+				DF46B8651381F44E00D08723 /* mame.cpp in Sources */,
+				DF46B8721381F4A200D08723 /* sdl-audiocd.cpp in Sources */,
+				DF46B87E1381F4F200D08723 /* default-audiocd.cpp in Sources */,
+				DF46B88A1381F5D800D08723 /* sdl-provider.cpp in Sources */,
+				DF46B8931381F62B00D08723 /* adpcm.cpp in Sources */,
+				DF46B89C1381F6C400D08723 /* null.cpp in Sources */,
+				DFADEBB413820DF500C46364 /* maccursor.cpp in Sources */,
+				DFADEBB813820E0C00C46364 /* posix-fs.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -8817,41 +9321,14 @@
 				DF093EA80F63CB26002D821E /* console.cpp in Sources */,
 				DF093EA90F63CB26002D821E /* debugger.cpp in Sources */,
 				DF093EAA0F63CB26002D821E /* dialog.cpp in Sources */,
-				DF093EAB0F63CB26002D821E /* editable.cpp in Sources */,
-				DF093EAC0F63CB26002D821E /* EditTextWidget.cpp in Sources */,
 				DF093EAD0F63CB26002D821E /* Key.cpp in Sources */,
 				DF093EAE0F63CB26002D821E /* launcher.cpp in Sources */,
-				DF093EAF0F63CB26002D821E /* ListWidget.cpp in Sources */,
 				DF093EB00F63CB26002D821E /* massadd.cpp in Sources */,
 				DF093EB10F63CB26002D821E /* message.cpp in Sources */,
 				DF093EB20F63CB26002D821E /* object.cpp in Sources */,
 				DF093EB30F63CB26002D821E /* options.cpp in Sources */,
-				DF093EB40F63CB26002D821E /* PopUpWidget.cpp in Sources */,
-				DF093EB50F63CB26002D821E /* ScrollBarWidget.cpp in Sources */,
-				DF093EB60F63CB26002D821E /* TabWidget.cpp in Sources */,
 				DF093EB70F63CB26002D821E /* themebrowser.cpp in Sources */,
 				DF093EB80F63CB26002D821E /* widget.cpp in Sources */,
-				DF093EBB0F63CB26002D821E /* audiocd.cpp in Sources */,
-				DF093EBC0F63CB26002D821E /* audiostream.cpp in Sources */,
-				DF093EBE0F63CB26002D821E /* fmopl.cpp in Sources */,
-				DF093EC00F63CB26002D821E /* mididrv.cpp in Sources */,
-				DF093EC10F63CB26002D821E /* midiparser.cpp in Sources */,
-				DF093EC20F63CB26002D821E /* midiparser_smf.cpp in Sources */,
-				DF093EC30F63CB26002D821E /* midiparser_xmidi.cpp in Sources */,
-				DF093EC40F63CB26002D821E /* mixer.cpp in Sources */,
-				DF093EC50F63CB26002D821E /* infogrames.cpp in Sources */,
-				DF093EC60F63CB26002D821E /* module.cpp in Sources */,
-				DF093EC70F63CB26002D821E /* paula.cpp in Sources */,
-				DF093EC80F63CB26002D821E /* protracker.cpp in Sources */,
-				DF093EC90F63CB26002D821E /* rjp1.cpp in Sources */,
-				DF093ECA0F63CB26002D821E /* soundfx.cpp in Sources */,
-				DF093ECC0F63CB26002D821E /* mpu401.cpp in Sources */,
-				DF093ECD0F63CB26002D821E /* null.cpp in Sources */,
-				DF093ECE0F63CB26002D821E /* rate.cpp in Sources */,
-				DF093ECF0F63CB26002D821E /* adlib.cpp in Sources */,
-				DF093ED00F63CB26002D821E /* fluidsynth.cpp in Sources */,
-				DF093ED10F63CB26002D821E /* pcspk.cpp in Sources */,
-				DF093ED20F63CB26002D821E /* ym2612.cpp in Sources */,
 				DF093ED60F63CB26002D821E /* memorypool.cpp in Sources */,
 				DF093ED70F63CB26002D821E /* seq.cpp in Sources */,
 				DF093ED80F63CB26002D821E /* scaler.cpp in Sources */,
@@ -9479,7 +9956,6 @@
 				DF09417A0F63CB26002D821E /* archive.cpp in Sources */,
 				DF09417B0F63CB26002D821E /* unarj.cpp in Sources */,
 				DF09417C0F63CB26002D821E /* stdiostream.cpp in Sources */,
-				DF09417D0F63CB26002D821E /* musicplugin.cpp in Sources */,
 				DF09417E0F63CB26002D821E /* saveload.cpp in Sources */,
 				DF09417F0F63CB26002D821E /* ThemeEngine.cpp in Sources */,
 				DF0941800F63CB26002D821E /* ThemeEval.cpp in Sources */,
@@ -9496,7 +9972,6 @@
 				DF09418B0F63CB26002D821E /* thumbnail_intern.cpp in Sources */,
 				DF09418C0F63CB26002D821E /* dither.cpp in Sources */,
 				DF0941920F63CB26002D821E /* debug.cpp in Sources */,
-				DF0941930F63CB26002D821E /* gui-manager.hcpp in Sources */,
 				DF0941940F63CB26002D821E /* posix-saves.cpp in Sources */,
 				DF0941950F63CB26002D821E /* bmv.cpp in Sources */,
 				DF0941960F63CB26002D821E /* dialogs.cpp in Sources */,
@@ -9568,12 +10043,9 @@
 				DF09420D0F63CB26002D821E /* timer_lol.cpp in Sources */,
 				DF0942100F63CB26002D821E /* sprites_lol.cpp in Sources */,
 				DF0942110F63CB26002D821E /* script.cpp in Sources */,
-				DF0942140F63CB26002D821E /* timestamp.cpp in Sources */,
 				DF0942150F63CB26002D821E /* pn.cpp in Sources */,
 				DF0942160F63CB26002D821E /* script_pn.cpp in Sources */,
 				DF0942170F63CB26002D821E /* vga_pn.cpp in Sources */,
-				DF0942430F63CB9A002D821E /* events.cpp in Sources */,
-				DF0942450F63CB9A002D821E /* graphics.cpp in Sources */,
 				DF0942470F63CB9A002D821E /* main.cpp in Sources */,
 				DF09424A0F63CB9A002D821E /* sdl.cpp in Sources */,
 				DF0944330F63FBB3002D821E /* coreaudio.cpp in Sources */,
@@ -9589,20 +10061,15 @@
 				DF09CC150FAC4E1900A5AFD7 /* inter_fascin.cpp in Sources */,
 				DF09CC280FAC4EAB00A5AFD7 /* script_v3.cpp in Sources */,
 				DF09CC290FAC4EAB00A5AFD7 /* script_v4.cpp in Sources */,
-				DFF958AF0FB222F300A3EC78 /* dosbox.cpp in Sources */,
 				DF61183C0FE3A8080042AD3F /* kmisc.cpp in Sources */,
 				DF61183D0FE3A8080042AD3F /* segment.cpp in Sources */,
 				DF6118490FE3A8250042AD3F /* decompressor.cpp in Sources */,
 				DF61184A0FE3A8250042AD3F /* resource.cpp in Sources */,
 				DF6118550FE3A8990042AD3F /* disk.cpp in Sources */,
-				DF6118680FE3A9410042AD3F /* dxa_decoder.cpp in Sources */,
-				DF6118690FE3A9410042AD3F /* flic_decoder.cpp in Sources */,
-				DF61186A0FE3A9410042AD3F /* smk_decoder.cpp in Sources */,
 				DF6118890FE3A9AA0042AD3F /* saveconverter.cpp in Sources */,
 				DF61188A0FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */,
 				DF61188B0FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */,
 				DF61188C0FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */,
-				DF61188D0FE3A9AA0042AD3F /* saveconverter_v6.cpp in Sources */,
 				DF61188E0FE3A9AA0042AD3F /* savefile.cpp in Sources */,
 				DF61188F0FE3A9AA0042AD3F /* savehandler.cpp in Sources */,
 				DF6118900FE3A9AA0042AD3F /* saveload.cpp in Sources */,
@@ -9617,7 +10084,6 @@
 				DF6118BB0FE3AA280042AD3F /* text_lol.cpp in Sources */,
 				DF6118C70FE3AABD0042AD3F /* player_v2cms.cpp in Sources */,
 				DF6118CC0FE3AAFD0042AD3F /* hardwarekeys.cpp in Sources */,
-				DF6118D10FE3AB560042AD3F /* mame.cpp in Sources */,
 				DF7585CE100CB66E00CC3324 /* expression.cpp in Sources */,
 				DF7585CF100CB66E00CC3324 /* hotspots.cpp in Sources */,
 				DF7585D0100CB66E00CC3324 /* init_v6.cpp in Sources */,
@@ -9638,13 +10104,9 @@
 				DF6BF4F510529EE40069811F /* player_v4a.cpp in Sources */,
 				DF6BF50010529F140069811F /* EventDispatcher.cpp in Sources */,
 				DF6BF50110529F140069811F /* EventRecorder.cpp in Sources */,
-				DF6BF50A10529F540069811F /* maxtrax.cpp in Sources */,
-				DF6BF50B10529F540069811F /* tfmx.cpp in Sources */,
 				DF90E9BF10AEDA9B00C8F93F /* selector.cpp in Sources */,
 				DF90EAA410B0234300C8F93F /* draw_playtoons.cpp in Sources */,
 				DF90EAAD10B0236F00C8F93F /* staticres.cpp in Sources */,
-				DF90EAB810B023D100C8F93F /* avi_decoder.cpp in Sources */,
-				DF90EAC310B023F400C8F93F /* msvideo1.cpp in Sources */,
 				DF2EC3E510E6490800765801 /* browser_osx.mm in Sources */,
 				DF2EC3F810E64C0C00765801 /* dialogs.cpp in Sources */,
 				DF2EC3FE10E64C4300765801 /* animator_tim.cpp in Sources */,
@@ -9652,18 +10114,6 @@
 				DF2EC50110E64D7C00765801 /* player_pce.cpp in Sources */,
 				DF2EC50210E64D7C00765801 /* player_sid.cpp in Sources */,
 				DF2EC50B10E64DB300765801 /* textconsole.cpp in Sources */,
-				DF2EC51210E64E3100765801 /* sid.cpp in Sources */,
-				DF2EC51810E64EE600765801 /* wave6581.cpp in Sources */,
-				DF45B13D116627DA009B85CC /* adpcm.cpp in Sources */,
-				DF45B13F116627DA009B85CC /* aiff.cpp in Sources */,
-				DF45B141116627DA009B85CC /* flac.cpp in Sources */,
-				DF45B143116627DA009B85CC /* iff_sound.cpp in Sources */,
-				DF45B145116627DA009B85CC /* mp3.cpp in Sources */,
-				DF45B147116627DA009B85CC /* raw.cpp in Sources */,
-				DF45B149116627DA009B85CC /* vag.cpp in Sources */,
-				DF45B14B116627DA009B85CC /* voc.cpp in Sources */,
-				DF45B14D116627DA009B85CC /* vorbis.cpp in Sources */,
-				DF45B14F116627DA009B85CC /* wave.cpp in Sources */,
 				DF45B1F4116628A5009B85CC /* animate.cpp in Sources */,
 				DF45B1F5116628A5009B85CC /* cache.cpp in Sources */,
 				DF45B1F6116628A5009B85CC /* compare.cpp in Sources */,
@@ -9697,25 +10147,19 @@
 				DFCDC6DB116629CE00A7D2A0 /* features.cpp in Sources */,
 				DFCDC6DC116629CE00A7D2A0 /* kparse.cpp in Sources */,
 				DFCDC6F811662AAB00A7D2A0 /* resource.cpp in Sources */,
-				DFCDC6FF11662AD700A7D2A0 /* msrle.cpp in Sources */,
 				DFCDC70511662B0200A7D2A0 /* saveload_fascin.cpp in Sources */,
 				DFCDC70C11662B6B00A7D2A0 /* macresman.cpp in Sources */,
 				DFEC5D141166C5CF00C90552 /* random.cpp in Sources */,
 				DFEC5D151166C5CF00C90552 /* tokenizer.cpp in Sources */,
 				DFEC5D381166C67300C90552 /* savestate.cpp in Sources */,
-				DFEC5D411166C6B400C90552 /* dbopl.cpp in Sources */,
 				DF9B924A118E46730069C19D /* error.cpp in Sources */,
 				DF9B9256118E46A00069C19D /* fontsjis.cpp in Sources */,
 				DF9B9264118E46FE0069C19D /* error.cpp in Sources */,
-				DFB0576E11B753AF0015AE65 /* mpeg_player.cpp in Sources */,
-				DFB0576F11B753AF0015AE65 /* qt_decoder.cpp in Sources */,
-				DFB0577011B753AF0015AE65 /* video_decoder.cpp in Sources */,
 				DFB0577811B753DA0015AE65 /* rational.cpp in Sources */,
 				DFB0578411B7541F0015AE65 /* resource_audio.cpp in Sources */,
 				DFB0578511B7541F0015AE65 /* util.cpp in Sources */,
 				DFB0578C11B754570015AE65 /* maciconbar.cpp in Sources */,
 				DFB0579311B7547D0015AE65 /* pict.cpp in Sources */,
-				DFB0579A11B7549C0015AE65 /* cinepak.cpp in Sources */,
 				DF7F286311FF23D500159131 /* amigamac.cpp in Sources */,
 				DF7F286B11FF23EF00159131 /* kvideo.cpp in Sources */,
 				DF7F286C11FF23EF00159131 /* workarounds.cpp in Sources */,
@@ -9726,25 +10170,11 @@
 				DF7F288811FF243B00159131 /* sound_sarien.cpp in Sources */,
 				DF7F288D11FF244F00159131 /* Tooltip.cpp in Sources */,
 				DF7F289711FF247300159131 /* translation.cpp in Sources */,
-				DF7F28A211FF24B000159131 /* mac_snd.cpp in Sources */,
 				DF7F28A711FF24C400159131 /* console.cpp in Sources */,
-				DF895BFF124C24350077F6E8 /* coktel_decoder.cpp in Sources */,
 				DF895C04124C24680077F6E8 /* player_towns.cpp in Sources */,
-				DF895C0A124C24B60077F6E8 /* appleiigs.cpp in Sources */,
-				DF895C19124C24C10077F6E8 /* towns_audio.cpp in Sources */,
-				DF895C1A124C24C10077F6E8 /* towns_euphony.cpp in Sources */,
-				DF895C1B124C24C10077F6E8 /* towns_pc98_driver.cpp in Sources */,
-				DF895C1C124C24C10077F6E8 /* towns_pc98_fmsynth.cpp in Sources */,
 				DF895C26124C25150077F6E8 /* init_fascin.cpp in Sources */,
 				DF895C2B124C25350077F6E8 /* script_patches.cpp in Sources */,
-				DF895CBE124E58990077F6E8 /* indeo3.cpp in Sources */,
-				DF895CBF124E58990077F6E8 /* mjpeg.cpp in Sources */,
-				DF895CC0124E58990077F6E8 /* qdm2.cpp in Sources */,
-				DF895CC1124E58990077F6E8 /* qtrle.cpp in Sources */,
-				DF895CC2124E58990077F6E8 /* rpza.cpp in Sources */,
-				DF895CC3124E58990077F6E8 /* smc.cpp in Sources */,
 				DF0E303C1252C5BD0082D593 /* cms.cpp in Sources */,
-				DF0E30431252C6090082D593 /* cms.cpp in Sources */,
 				8CB5A9C61253FD6900CB6BC7 /* m4_scene.cpp in Sources */,
 				8CB5A9C71253FD6900CB6BC7 /* mads_logic.cpp in Sources */,
 				8CB5A9C81253FD6900CB6BC7 /* mads_player.cpp in Sources */,
@@ -9752,7 +10182,6 @@
 				8CB5A9CA1253FD6900CB6BC7 /* mads_views.cpp in Sources */,
 				8CD1ED2F126202AB00FA198C /* detection.cpp in Sources */,
 				8CD1ED30126202AB00FA198C /* display.cpp in Sources */,
-				8CD1ED31126202AB00FA198C /* engine.cpp in Sources */,
 				8CD1ED32126202AB00FA198C /* file.cpp in Sources */,
 				8CD1ED33126202AB00FA198C /* hugo.cpp in Sources */,
 				8CD1ED34126202AB00FA198C /* intro.cpp in Sources */,
@@ -9801,6 +10230,136 @@
 				8CD80D01126272A0001C6C87 /* surface.cpp in Sources */,
 				8CD80D02126272A0001C6C87 /* surface_list.cpp in Sources */,
 				8CD80D03126272A0001C6C87 /* teenagent.cpp in Sources */,
+				DF203F471380C06E0056300A /* gui-manager.cpp in Sources */,
+				DF203F631380C2750056300A /* avi_decoder.cpp in Sources */,
+				DF203F641380C2750056300A /* coktel_decoder.cpp in Sources */,
+				DF203F651380C2750056300A /* dxa_decoder.cpp in Sources */,
+				DF203F661380C2750056300A /* flic_decoder.cpp in Sources */,
+				DF203F681380C2750056300A /* qt_decoder.cpp in Sources */,
+				DF203F691380C2750056300A /* smk_decoder.cpp in Sources */,
+				DF203F6A1380C2750056300A /* video_decoder.cpp in Sources */,
+				DF203F951380C2920056300A /* cdtoons.cpp in Sources */,
+				DF203F961380C2920056300A /* cinepak.cpp in Sources */,
+				DF203F971380C2920056300A /* indeo3.cpp in Sources */,
+				DF203F981380C2920056300A /* mjpeg.cpp in Sources */,
+				DF203F991380C2920056300A /* msrle.cpp in Sources */,
+				DF203F9A1380C2920056300A /* msvideo1.cpp in Sources */,
+				DF203F9B1380C2920056300A /* qdm2.cpp in Sources */,
+				DF203F9C1380C2920056300A /* qtrle.cpp in Sources */,
+				DF203F9D1380C2920056300A /* rpza.cpp in Sources */,
+				DF203F9E1380C2920056300A /* smc.cpp in Sources */,
+				DF203F9F1380C2920056300A /* truemotion1.cpp in Sources */,
+				DF203FD51380C3BC0056300A /* console.cpp in Sources */,
+				DF203FD61380C3BC0056300A /* dialogs.cpp in Sources */,
+				DF203FD71380C3BC0056300A /* file_v1d.cpp in Sources */,
+				DF203FD81380C3BC0056300A /* file_v1w.cpp in Sources */,
+				DF203FD91380C3BC0056300A /* file_v2d.cpp in Sources */,
+				DF203FDA1380C3BC0056300A /* file_v2w.cpp in Sources */,
+				DF203FDB1380C3BC0056300A /* file_v3d.cpp in Sources */,
+				DF203FDC1380C3BC0056300A /* object_v1d.cpp in Sources */,
+				DF203FDD1380C3BC0056300A /* object_v1w.cpp in Sources */,
+				DF203FDE1380C3BC0056300A /* object_v2d.cpp in Sources */,
+				DF203FDF1380C3BC0056300A /* object_v3d.cpp in Sources */,
+				DF203FE01380C3BC0056300A /* object.cpp in Sources */,
+				DF203FE11380C3BC0056300A /* parser_v1d.cpp in Sources */,
+				DF203FE21380C3BC0056300A /* parser_v1w.cpp in Sources */,
+				DF203FE31380C3BC0056300A /* parser_v2d.cpp in Sources */,
+				DF203FE41380C3BC0056300A /* parser_v3d.cpp in Sources */,
+				DF203FE51380C3BC0056300A /* text.cpp in Sources */,
+				DF20402E1380C8B70056300A /* editable.cpp in Sources */,
+				DF20402F1380C8B70056300A /* edittext.cpp in Sources */,
+				DF2040301380C8B70056300A /* list.cpp in Sources */,
+				DF2040311380C8B70056300A /* popup.cpp in Sources */,
+				DF2040321380C8B70056300A /* scrollbar.cpp in Sources */,
+				DF2040331380C8B70056300A /* tab.cpp in Sources */,
+				DF20405E1380CA230056300A /* audiostream.cpp in Sources */,
+				DF20405F1380CA230056300A /* fmopl.cpp in Sources */,
+				DF2040601380CA230056300A /* mididrv.cpp in Sources */,
+				DF2040611380CA230056300A /* midiparser_smf.cpp in Sources */,
+				DF2040621380CA230056300A /* midiparser_xmidi.cpp in Sources */,
+				DF2040631380CA230056300A /* midiparser.cpp in Sources */,
+				DF2040641380CA230056300A /* midiplayer.cpp in Sources */,
+				DF2040651380CA230056300A /* mixer.cpp in Sources */,
+				DF2040661380CA230056300A /* mpu401.cpp in Sources */,
+				DF2040671380CA230056300A /* musicplugin.cpp in Sources */,
+				DF2040681380CA230056300A /* rate.cpp in Sources */,
+				DF2040691380CA230056300A /* timestamp.cpp in Sources */,
+				DF20409A1380CA400056300A /* adpcm.cpp in Sources */,
+				DF20409B1380CA400056300A /* aiff.cpp in Sources */,
+				DF20409C1380CA400056300A /* flac.cpp in Sources */,
+				DF20409D1380CA400056300A /* iff_sound.cpp in Sources */,
+				DF20409E1380CA400056300A /* mac_snd.cpp in Sources */,
+				DF20409F1380CA400056300A /* mp3.cpp in Sources */,
+				DF2040A01380CA400056300A /* raw.cpp in Sources */,
+				DF2040A11380CA400056300A /* vag.cpp in Sources */,
+				DF2040A21380CA400056300A /* voc.cpp in Sources */,
+				DF2040A31380CA400056300A /* vorbis.cpp in Sources */,
+				DF2040A41380CA400056300A /* wave.cpp in Sources */,
+				DF2040CC1380CA810056300A /* infogrames.cpp in Sources */,
+				DF2040CD1380CA810056300A /* maxtrax.cpp in Sources */,
+				DF2040CE1380CA810056300A /* module.cpp in Sources */,
+				DF2040CF1380CA810056300A /* paula.cpp in Sources */,
+				DF2040D01380CA810056300A /* protracker.cpp in Sources */,
+				DF2040D11380CA810056300A /* rjp1.cpp in Sources */,
+				DF2040D21380CA810056300A /* soundfx.cpp in Sources */,
+				DF2040D31380CA810056300A /* tfmx.cpp in Sources */,
+				DF2040F41380CAA40056300A /* adlib.cpp in Sources */,
+				DF2040F51380CAA40056300A /* appleiigs.cpp in Sources */,
+				DF2040F61380CAA40056300A /* cms.cpp in Sources */,
+				DF2040F71380CAA40056300A /* eas.cpp in Sources */,
+				DF2040F81380CAA40056300A /* fluidsynth.cpp in Sources */,
+				DF2040F91380CAA40056300A /* mt32.cpp in Sources */,
+				DF2040FA1380CAA40056300A /* pcspk.cpp in Sources */,
+				DF2040FB1380CAA40056300A /* sid.cpp in Sources */,
+				DF2040FC1380CAA40056300A /* wave6581.cpp in Sources */,
+				DF2040FD1380CAA40056300A /* ym2612.cpp in Sources */,
+				DF46B6F31381E18900D08723 /* coroutine.cpp in Sources */,
+				DF46B6FF1381E1FF00D08723 /* towns_audio.cpp in Sources */,
+				DF46B7001381E1FF00D08723 /* towns_euphony.cpp in Sources */,
+				DF46B7011381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */,
+				DF46B7021381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */,
+				DF46B7191381E27000D08723 /* console.cpp in Sources */,
+				DF46B71A1381E27000D08723 /* databases.cpp in Sources */,
+				DF46B71B1381E27000D08723 /* dbase.cpp in Sources */,
+				DF46B71C1381E27000D08723 /* iniconfig.cpp in Sources */,
+				DF46B71D1381E27000D08723 /* init_v7.cpp in Sources */,
+				DF46B71E1381E27000D08723 /* inter_inca2.cpp in Sources */,
+				DF46B7441381E40500D08723 /* log.cpp in Sources */,
+				DF46B7491381E40F00D08723 /* modular-backend.cpp in Sources */,
+				DF46B7541381E46700D08723 /* player_v2base.cpp in Sources */,
+				DF46B75E1381E4A400D08723 /* console.cpp in Sources */,
+				DF46B7631381E4D400D08723 /* robot_decoder.cpp in Sources */,
+				DF46B7671381E4E400D08723 /* vm_types.cpp in Sources */,
+				DF46B77B1381E54200D08723 /* dcl.cpp in Sources */,
+				DF46B77C1381E54200D08723 /* iff_container.cpp in Sources */,
+				DF46B77D1381E54200D08723 /* winexe_ne.cpp in Sources */,
+				DF46B77E1381E54200D08723 /* winexe_pe.cpp in Sources */,
+				DF46B77F1381E54200D08723 /* winexe.cpp in Sources */,
+				DF46B7931381E58000D08723 /* png.cpp in Sources */,
+				DF46B7941381E58000D08723 /* wincursor.cpp in Sources */,
+				DF46B79F1381E5B500D08723 /* winfont.cpp in Sources */,
+				DF46B7A51381E5D900D08723 /* sdl-timer.cpp in Sources */,
+				DF46B7A91381E5F100D08723 /* header.cpp in Sources */,
+				DF46B7B41381E67800D08723 /* sdl-mutex.cpp in Sources */,
+				DF46B7BD1381E6C000D08723 /* object.cpp in Sources */,
+				DF46B7C81381E72500D08723 /* console.cpp in Sources */,
+				DF46B7CF1381E76300D08723 /* sdl-events.cpp in Sources */,
+				DF46B7D61381E7C600D08723 /* console.cpp in Sources */,
+				DF46B83C1381F13500D08723 /* saveload_v7.cpp in Sources */,
+				DF46B8441381F35500D08723 /* saveload_inca2.cpp in Sources */,
+				DF46B8481381F38700D08723 /* inter_v7.cpp in Sources */,
+				DF46B84D1381F39E00D08723 /* console.cpp in Sources */,
+				DF46B8521381F3B400D08723 /* console.cpp in Sources */,
+				DF46B8601381F44E00D08723 /* dbopl.cpp in Sources */,
+				DF46B8611381F44E00D08723 /* dosbox.cpp in Sources */,
+				DF46B8621381F44E00D08723 /* mame.cpp in Sources */,
+				DF46B8711381F4A200D08723 /* sdl-audiocd.cpp in Sources */,
+				DF46B87D1381F4F200D08723 /* default-audiocd.cpp in Sources */,
+				DF46B8891381F5D800D08723 /* sdl-provider.cpp in Sources */,
+				DF46B8921381F62B00D08723 /* adpcm.cpp in Sources */,
+				DF46B89B1381F6C400D08723 /* null.cpp in Sources */,
+				DFADEBB313820DF500C46364 /* maccursor.cpp in Sources */,
+				DFADEBB713820E0C00C46364 /* posix-fs.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -9849,41 +10408,14 @@
 				DFF9593E0FB22D5700A3EC78 /* console.cpp in Sources */,
 				DFF9593F0FB22D5700A3EC78 /* debugger.cpp in Sources */,
 				DFF959400FB22D5700A3EC78 /* dialog.cpp in Sources */,
-				DFF959410FB22D5700A3EC78 /* editable.cpp in Sources */,
-				DFF959420FB22D5700A3EC78 /* EditTextWidget.cpp in Sources */,
 				DFF959430FB22D5700A3EC78 /* Key.cpp in Sources */,
 				DFF959440FB22D5700A3EC78 /* launcher.cpp in Sources */,
-				DFF959450FB22D5700A3EC78 /* ListWidget.cpp in Sources */,
 				DFF959460FB22D5700A3EC78 /* massadd.cpp in Sources */,
 				DFF959470FB22D5700A3EC78 /* message.cpp in Sources */,
 				DFF959480FB22D5700A3EC78 /* object.cpp in Sources */,
 				DFF959490FB22D5700A3EC78 /* options.cpp in Sources */,
-				DFF9594A0FB22D5700A3EC78 /* PopUpWidget.cpp in Sources */,
-				DFF9594B0FB22D5700A3EC78 /* ScrollBarWidget.cpp in Sources */,
-				DFF9594C0FB22D5700A3EC78 /* TabWidget.cpp in Sources */,
 				DFF9594D0FB22D5700A3EC78 /* themebrowser.cpp in Sources */,
 				DFF9594E0FB22D5700A3EC78 /* widget.cpp in Sources */,
-				DFF959510FB22D5700A3EC78 /* audiocd.cpp in Sources */,
-				DFF959520FB22D5700A3EC78 /* audiostream.cpp in Sources */,
-				DFF959540FB22D5700A3EC78 /* fmopl.cpp in Sources */,
-				DFF959560FB22D5700A3EC78 /* mididrv.cpp in Sources */,
-				DFF959570FB22D5700A3EC78 /* midiparser.cpp in Sources */,
-				DFF959580FB22D5700A3EC78 /* midiparser_smf.cpp in Sources */,
-				DFF959590FB22D5700A3EC78 /* midiparser_xmidi.cpp in Sources */,
-				DFF9595A0FB22D5700A3EC78 /* mixer.cpp in Sources */,
-				DFF9595B0FB22D5700A3EC78 /* infogrames.cpp in Sources */,
-				DFF9595C0FB22D5700A3EC78 /* module.cpp in Sources */,
-				DFF9595D0FB22D5700A3EC78 /* paula.cpp in Sources */,
-				DFF9595E0FB22D5700A3EC78 /* protracker.cpp in Sources */,
-				DFF9595F0FB22D5700A3EC78 /* rjp1.cpp in Sources */,
-				DFF959600FB22D5700A3EC78 /* soundfx.cpp in Sources */,
-				DFF959620FB22D5700A3EC78 /* mpu401.cpp in Sources */,
-				DFF959630FB22D5700A3EC78 /* null.cpp in Sources */,
-				DFF959640FB22D5700A3EC78 /* rate.cpp in Sources */,
-				DFF959650FB22D5700A3EC78 /* adlib.cpp in Sources */,
-				DFF959660FB22D5700A3EC78 /* fluidsynth.cpp in Sources */,
-				DFF959670FB22D5700A3EC78 /* pcspk.cpp in Sources */,
-				DFF959680FB22D5700A3EC78 /* ym2612.cpp in Sources */,
 				DFF9596C0FB22D5700A3EC78 /* memorypool.cpp in Sources */,
 				DFF9596D0FB22D5700A3EC78 /* seq.cpp in Sources */,
 				DFF9596E0FB22D5700A3EC78 /* scaler.cpp in Sources */,
@@ -10514,7 +11046,6 @@
 				DFF95C0F0FB22D5700A3EC78 /* archive.cpp in Sources */,
 				DFF95C100FB22D5700A3EC78 /* unarj.cpp in Sources */,
 				DFF95C110FB22D5700A3EC78 /* stdiostream.cpp in Sources */,
-				DFF95C120FB22D5700A3EC78 /* musicplugin.cpp in Sources */,
 				DFF95C130FB22D5700A3EC78 /* saveload.cpp in Sources */,
 				DFF95C140FB22D5700A3EC78 /* ThemeEngine.cpp in Sources */,
 				DFF95C150FB22D5700A3EC78 /* ThemeEval.cpp in Sources */,
@@ -10531,7 +11062,6 @@
 				DFF95C200FB22D5700A3EC78 /* thumbnail_intern.cpp in Sources */,
 				DFF95C210FB22D5700A3EC78 /* dither.cpp in Sources */,
 				DFF95C270FB22D5700A3EC78 /* debug.cpp in Sources */,
-				DFF95C280FB22D5700A3EC78 /* gui-manager.hcpp in Sources */,
 				DFF95C290FB22D5700A3EC78 /* posix-saves.cpp in Sources */,
 				DFF95C2A0FB22D5700A3EC78 /* bmv.cpp in Sources */,
 				DFF95C2B0FB22D5700A3EC78 /* dialogs.cpp in Sources */,
@@ -10603,7 +11133,6 @@
 				DFF95C920FB22D5700A3EC78 /* timer_lol.cpp in Sources */,
 				DFF95C940FB22D5700A3EC78 /* sprites_lol.cpp in Sources */,
 				DFF95C950FB22D5700A3EC78 /* script.cpp in Sources */,
-				DFF95C980FB22D5700A3EC78 /* timestamp.cpp in Sources */,
 				DFF95C990FB22D5700A3EC78 /* pn.cpp in Sources */,
 				DFF95C9A0FB22D5700A3EC78 /* script_pn.cpp in Sources */,
 				DFF95C9B0FB22D5700A3EC78 /* vga_pn.cpp in Sources */,
@@ -10618,20 +11147,15 @@
 				DFF95CB30FB22D5700A3EC78 /* inter_fascin.cpp in Sources */,
 				DFF95CB40FB22D5700A3EC78 /* script_v3.cpp in Sources */,
 				DFF95CB50FB22D5700A3EC78 /* script_v4.cpp in Sources */,
-				DFF95CB70FB22D5700A3EC78 /* dosbox.cpp in Sources */,
 				DF6118400FE3A8080042AD3F /* kmisc.cpp in Sources */,
 				DF6118410FE3A8080042AD3F /* segment.cpp in Sources */,
 				DF61184F0FE3A8250042AD3F /* decompressor.cpp in Sources */,
 				DF6118500FE3A8250042AD3F /* resource.cpp in Sources */,
 				DF6118570FE3A8990042AD3F /* disk.cpp in Sources */,
-				DF6118720FE3A9410042AD3F /* dxa_decoder.cpp in Sources */,
-				DF6118730FE3A9410042AD3F /* flic_decoder.cpp in Sources */,
-				DF6118740FE3A9410042AD3F /* smk_decoder.cpp in Sources */,
 				DF6118A10FE3A9AA0042AD3F /* saveconverter.cpp in Sources */,
 				DF6118A20FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */,
 				DF6118A30FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */,
 				DF6118A40FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */,
-				DF6118A50FE3A9AA0042AD3F /* saveconverter_v6.cpp in Sources */,
 				DF6118A60FE3A9AA0042AD3F /* savefile.cpp in Sources */,
 				DF6118A70FE3A9AA0042AD3F /* savehandler.cpp in Sources */,
 				DF6118A80FE3A9AA0042AD3F /* saveload.cpp in Sources */,
@@ -10645,7 +11169,6 @@
 				DF6118C20FE3AA280042AD3F /* sound_pcspk.cpp in Sources */,
 				DF6118C30FE3AA280042AD3F /* text_lol.cpp in Sources */,
 				DF6118C90FE3AABD0042AD3F /* player_v2cms.cpp in Sources */,
-				DF6118D20FE3AB560042AD3F /* mame.cpp in Sources */,
 				DF7585D4100CB66E00CC3324 /* expression.cpp in Sources */,
 				DF7585D5100CB66E00CC3324 /* hotspots.cpp in Sources */,
 				DF7585D6100CB66E00CC3324 /* init_v6.cpp in Sources */,
@@ -10670,31 +11193,15 @@
 				DF6BF4F310529EE40069811F /* player_v4a.cpp in Sources */,
 				DF6BF4FC10529F140069811F /* EventDispatcher.cpp in Sources */,
 				DF6BF4FD10529F140069811F /* EventRecorder.cpp in Sources */,
-				DF6BF50610529F540069811F /* maxtrax.cpp in Sources */,
-				DF6BF50710529F540069811F /* tfmx.cpp in Sources */,
 				DF90E9C110AEDA9B00C8F93F /* selector.cpp in Sources */,
 				DF90EAA510B0234300C8F93F /* draw_playtoons.cpp in Sources */,
 				DF90EAAE10B0236F00C8F93F /* staticres.cpp in Sources */,
-				DF90EAB910B023D100C8F93F /* avi_decoder.cpp in Sources */,
-				DF90EAC410B023F400C8F93F /* msvideo1.cpp in Sources */,
 				DF2EC3FA10E64C0C00765801 /* dialogs.cpp in Sources */,
 				DF2EC40010E64C4300765801 /* animator_tim.cpp in Sources */,
 				DF2EC40710E64C8000765801 /* event.cpp in Sources */,
 				DF2EC50510E64D7C00765801 /* player_pce.cpp in Sources */,
 				DF2EC50610E64D7C00765801 /* player_sid.cpp in Sources */,
 				DF2EC50D10E64DB300765801 /* textconsole.cpp in Sources */,
-				DF2EC51410E64E3100765801 /* sid.cpp in Sources */,
-				DF2EC51A10E64EE600765801 /* wave6581.cpp in Sources */,
-				DF45B15B116627DA009B85CC /* adpcm.cpp in Sources */,
-				DF45B15D116627DA009B85CC /* aiff.cpp in Sources */,
-				DF45B15F116627DA009B85CC /* flac.cpp in Sources */,
-				DF45B161116627DA009B85CC /* iff_sound.cpp in Sources */,
-				DF45B163116627DA009B85CC /* mp3.cpp in Sources */,
-				DF45B165116627DA009B85CC /* raw.cpp in Sources */,
-				DF45B167116627DA009B85CC /* vag.cpp in Sources */,
-				DF45B169116627DA009B85CC /* voc.cpp in Sources */,
-				DF45B16B116627DA009B85CC /* vorbis.cpp in Sources */,
-				DF45B16D116627DA009B85CC /* wave.cpp in Sources */,
 				DF45B21E116628A5009B85CC /* animate.cpp in Sources */,
 				DF45B21F116628A5009B85CC /* cache.cpp in Sources */,
 				DF45B220116628A5009B85CC /* compare.cpp in Sources */,
@@ -10728,25 +11235,19 @@
 				DFCDC6DD116629CE00A7D2A0 /* features.cpp in Sources */,
 				DFCDC6DE116629CE00A7D2A0 /* kparse.cpp in Sources */,
 				DFCDC6F911662AAB00A7D2A0 /* resource.cpp in Sources */,
-				DFCDC70011662AD700A7D2A0 /* msrle.cpp in Sources */,
 				DFCDC70611662B0200A7D2A0 /* saveload_fascin.cpp in Sources */,
 				DFCDC70D11662B6B00A7D2A0 /* macresman.cpp in Sources */,
 				DFEC5D101166C5CF00C90552 /* random.cpp in Sources */,
 				DFEC5D111166C5CF00C90552 /* tokenizer.cpp in Sources */,
 				DFEC5D361166C67300C90552 /* savestate.cpp in Sources */,
-				DFEC5D3F1166C6B400C90552 /* dbopl.cpp in Sources */,
 				DF9B9248118E46730069C19D /* error.cpp in Sources */,
 				DF9B9252118E46A00069C19D /* fontsjis.cpp in Sources */,
 				DF9B9262118E46FE0069C19D /* error.cpp in Sources */,
-				DFB0576811B753AF0015AE65 /* mpeg_player.cpp in Sources */,
-				DFB0576911B753AF0015AE65 /* qt_decoder.cpp in Sources */,
-				DFB0576A11B753AF0015AE65 /* video_decoder.cpp in Sources */,
 				DFB0577611B753DA0015AE65 /* rational.cpp in Sources */,
 				DFB0578011B7541F0015AE65 /* resource_audio.cpp in Sources */,
 				DFB0578111B7541F0015AE65 /* util.cpp in Sources */,
 				DFB0578A11B754570015AE65 /* maciconbar.cpp in Sources */,
 				DFB0579111B7547D0015AE65 /* pict.cpp in Sources */,
-				DFB0579811B7549C0015AE65 /* cinepak.cpp in Sources */,
 				DF7F286111FF23D500159131 /* amigamac.cpp in Sources */,
 				DF7F286711FF23EF00159131 /* kvideo.cpp in Sources */,
 				DF7F286811FF23EF00159131 /* workarounds.cpp in Sources */,
@@ -10757,25 +11258,11 @@
 				DF7F287E11FF243B00159131 /* sound_sarien.cpp in Sources */,
 				DF7F288B11FF244F00159131 /* Tooltip.cpp in Sources */,
 				DF7F289311FF247300159131 /* translation.cpp in Sources */,
-				DF7F28A011FF24B000159131 /* mac_snd.cpp in Sources */,
 				DF7F28A511FF24C400159131 /* console.cpp in Sources */,
-				DF895C00124C24350077F6E8 /* coktel_decoder.cpp in Sources */,
 				DF895C05124C24680077F6E8 /* player_towns.cpp in Sources */,
-				DF895C0B124C24B60077F6E8 /* appleiigs.cpp in Sources */,
-				DF895C1D124C24C10077F6E8 /* towns_audio.cpp in Sources */,
-				DF895C1E124C24C10077F6E8 /* towns_euphony.cpp in Sources */,
-				DF895C1F124C24C10077F6E8 /* towns_pc98_driver.cpp in Sources */,
-				DF895C20124C24C10077F6E8 /* towns_pc98_fmsynth.cpp in Sources */,
 				DF895C27124C25150077F6E8 /* init_fascin.cpp in Sources */,
 				DF895C2C124C25350077F6E8 /* script_patches.cpp in Sources */,
-				DF895CC4124E58990077F6E8 /* indeo3.cpp in Sources */,
-				DF895CC5124E58990077F6E8 /* mjpeg.cpp in Sources */,
-				DF895CC6124E58990077F6E8 /* qdm2.cpp in Sources */,
-				DF895CC7124E58990077F6E8 /* qtrle.cpp in Sources */,
-				DF895CC8124E58990077F6E8 /* rpza.cpp in Sources */,
-				DF895CC9124E58990077F6E8 /* smc.cpp in Sources */,
 				DF0E303A1252C5BD0082D593 /* cms.cpp in Sources */,
-				DF0E30411252C6090082D593 /* cms.cpp in Sources */,
 				8CB5A9C11253FD6900CB6BC7 /* m4_scene.cpp in Sources */,
 				8CB5A9C21253FD6900CB6BC7 /* mads_logic.cpp in Sources */,
 				8CB5A9C31253FD6900CB6BC7 /* mads_player.cpp in Sources */,
@@ -10783,7 +11270,6 @@
 				8CB5A9C51253FD6900CB6BC7 /* mads_views.cpp in Sources */,
 				8CD1ED0B126202AB00FA198C /* detection.cpp in Sources */,
 				8CD1ED0C126202AB00FA198C /* display.cpp in Sources */,
-				8CD1ED0D126202AB00FA198C /* engine.cpp in Sources */,
 				8CD1ED0E126202AB00FA198C /* file.cpp in Sources */,
 				8CD1ED0F126202AB00FA198C /* hugo.cpp in Sources */,
 				8CD1ED10126202AB00FA198C /* intro.cpp in Sources */,
@@ -10832,6 +11318,134 @@
 				8CD80CEF126272A0001C6C87 /* surface.cpp in Sources */,
 				8CD80CF0126272A0001C6C87 /* surface_list.cpp in Sources */,
 				8CD80CF1126272A0001C6C87 /* teenagent.cpp in Sources */,
+				DF203F491380C06E0056300A /* gui-manager.cpp in Sources */,
+				DF203F731380C2750056300A /* avi_decoder.cpp in Sources */,
+				DF203F741380C2750056300A /* coktel_decoder.cpp in Sources */,
+				DF203F751380C2750056300A /* dxa_decoder.cpp in Sources */,
+				DF203F761380C2750056300A /* flic_decoder.cpp in Sources */,
+				DF203F781380C2750056300A /* qt_decoder.cpp in Sources */,
+				DF203F791380C2750056300A /* smk_decoder.cpp in Sources */,
+				DF203F7A1380C2750056300A /* video_decoder.cpp in Sources */,
+				DF203FAB1380C2920056300A /* cdtoons.cpp in Sources */,
+				DF203FAC1380C2920056300A /* cinepak.cpp in Sources */,
+				DF203FAD1380C2920056300A /* indeo3.cpp in Sources */,
+				DF203FAE1380C2920056300A /* mjpeg.cpp in Sources */,
+				DF203FAF1380C2920056300A /* msrle.cpp in Sources */,
+				DF203FB01380C2920056300A /* msvideo1.cpp in Sources */,
+				DF203FB11380C2920056300A /* qdm2.cpp in Sources */,
+				DF203FB21380C2920056300A /* qtrle.cpp in Sources */,
+				DF203FB31380C2920056300A /* rpza.cpp in Sources */,
+				DF203FB41380C2920056300A /* smc.cpp in Sources */,
+				DF203FB51380C2920056300A /* truemotion1.cpp in Sources */,
+				DF203FF71380C3BC0056300A /* console.cpp in Sources */,
+				DF203FF81380C3BC0056300A /* dialogs.cpp in Sources */,
+				DF203FF91380C3BC0056300A /* file_v1d.cpp in Sources */,
+				DF203FFA1380C3BC0056300A /* file_v1w.cpp in Sources */,
+				DF203FFB1380C3BC0056300A /* file_v2d.cpp in Sources */,
+				DF203FFC1380C3BC0056300A /* file_v2w.cpp in Sources */,
+				DF203FFD1380C3BC0056300A /* file_v3d.cpp in Sources */,
+				DF203FFE1380C3BC0056300A /* object_v1d.cpp in Sources */,
+				DF203FFF1380C3BC0056300A /* object_v1w.cpp in Sources */,
+				DF2040001380C3BC0056300A /* object_v2d.cpp in Sources */,
+				DF2040011380C3BC0056300A /* object_v3d.cpp in Sources */,
+				DF2040021380C3BC0056300A /* object.cpp in Sources */,
+				DF2040031380C3BC0056300A /* parser_v1d.cpp in Sources */,
+				DF2040041380C3BC0056300A /* parser_v1w.cpp in Sources */,
+				DF2040051380C3BC0056300A /* parser_v2d.cpp in Sources */,
+				DF2040061380C3BC0056300A /* parser_v3d.cpp in Sources */,
+				DF2040071380C3BC0056300A /* text.cpp in Sources */,
+				DF20403A1380C8B70056300A /* editable.cpp in Sources */,
+				DF20403B1380C8B70056300A /* edittext.cpp in Sources */,
+				DF20403C1380C8B70056300A /* list.cpp in Sources */,
+				DF20403D1380C8B70056300A /* popup.cpp in Sources */,
+				DF20403E1380C8B70056300A /* scrollbar.cpp in Sources */,
+				DF20403F1380C8B70056300A /* tab.cpp in Sources */,
+				DF2040761380CA230056300A /* audiostream.cpp in Sources */,
+				DF2040771380CA230056300A /* fmopl.cpp in Sources */,
+				DF2040781380CA230056300A /* mididrv.cpp in Sources */,
+				DF2040791380CA230056300A /* midiparser_smf.cpp in Sources */,
+				DF20407A1380CA230056300A /* midiparser_xmidi.cpp in Sources */,
+				DF20407B1380CA230056300A /* midiparser.cpp in Sources */,
+				DF20407C1380CA230056300A /* midiplayer.cpp in Sources */,
+				DF20407D1380CA230056300A /* mixer.cpp in Sources */,
+				DF20407E1380CA230056300A /* mpu401.cpp in Sources */,
+				DF20407F1380CA230056300A /* musicplugin.cpp in Sources */,
+				DF2040801380CA230056300A /* rate.cpp in Sources */,
+				DF2040811380CA230056300A /* timestamp.cpp in Sources */,
+				DF2040B01380CA400056300A /* adpcm.cpp in Sources */,
+				DF2040B11380CA400056300A /* aiff.cpp in Sources */,
+				DF2040B21380CA400056300A /* flac.cpp in Sources */,
+				DF2040B31380CA400056300A /* iff_sound.cpp in Sources */,
+				DF2040B41380CA400056300A /* mac_snd.cpp in Sources */,
+				DF2040B51380CA400056300A /* mp3.cpp in Sources */,
+				DF2040B61380CA400056300A /* raw.cpp in Sources */,
+				DF2040B71380CA400056300A /* vag.cpp in Sources */,
+				DF2040B81380CA400056300A /* voc.cpp in Sources */,
+				DF2040B91380CA400056300A /* vorbis.cpp in Sources */,
+				DF2040BA1380CA400056300A /* wave.cpp in Sources */,
+				DF2040DC1380CA810056300A /* infogrames.cpp in Sources */,
+				DF2040DD1380CA810056300A /* maxtrax.cpp in Sources */,
+				DF2040DE1380CA810056300A /* module.cpp in Sources */,
+				DF2040DF1380CA810056300A /* paula.cpp in Sources */,
+				DF2040E01380CA810056300A /* protracker.cpp in Sources */,
+				DF2040E11380CA810056300A /* rjp1.cpp in Sources */,
+				DF2040E21380CA810056300A /* soundfx.cpp in Sources */,
+				DF2040E31380CA810056300A /* tfmx.cpp in Sources */,
+				DF2041081380CAA40056300A /* adlib.cpp in Sources */,
+				DF2041091380CAA40056300A /* appleiigs.cpp in Sources */,
+				DF20410A1380CAA40056300A /* cms.cpp in Sources */,
+				DF20410B1380CAA40056300A /* eas.cpp in Sources */,
+				DF20410C1380CAA40056300A /* fluidsynth.cpp in Sources */,
+				DF20410D1380CAA40056300A /* mt32.cpp in Sources */,
+				DF20410E1380CAA40056300A /* pcspk.cpp in Sources */,
+				DF20410F1380CAA40056300A /* sid.cpp in Sources */,
+				DF2041101380CAA40056300A /* wave6581.cpp in Sources */,
+				DF2041111380CAA40056300A /* ym2612.cpp in Sources */,
+				DF46B6F51381E18900D08723 /* coroutine.cpp in Sources */,
+				DF46B7071381E1FF00D08723 /* towns_audio.cpp in Sources */,
+				DF46B7081381E1FF00D08723 /* towns_euphony.cpp in Sources */,
+				DF46B7091381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */,
+				DF46B70A1381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */,
+				DF46B7251381E27000D08723 /* console.cpp in Sources */,
+				DF46B7261381E27000D08723 /* databases.cpp in Sources */,
+				DF46B7271381E27000D08723 /* dbase.cpp in Sources */,
+				DF46B7281381E27000D08723 /* iniconfig.cpp in Sources */,
+				DF46B7291381E27000D08723 /* init_v7.cpp in Sources */,
+				DF46B72A1381E27000D08723 /* inter_inca2.cpp in Sources */,
+				DF46B7461381E40500D08723 /* log.cpp in Sources */,
+				DF46B74B1381E40F00D08723 /* modular-backend.cpp in Sources */,
+				DF46B7561381E46700D08723 /* player_v2base.cpp in Sources */,
+				DF46B7601381E4A400D08723 /* console.cpp in Sources */,
+				DF46B7651381E4D400D08723 /* robot_decoder.cpp in Sources */,
+				DF46B7691381E4E400D08723 /* vm_types.cpp in Sources */,
+				DF46B7851381E54200D08723 /* dcl.cpp in Sources */,
+				DF46B7861381E54200D08723 /* iff_container.cpp in Sources */,
+				DF46B7871381E54200D08723 /* winexe_ne.cpp in Sources */,
+				DF46B7881381E54200D08723 /* winexe_pe.cpp in Sources */,
+				DF46B7891381E54200D08723 /* winexe.cpp in Sources */,
+				DF46B7971381E58000D08723 /* png.cpp in Sources */,
+				DF46B7981381E58000D08723 /* wincursor.cpp in Sources */,
+				DF46B7A11381E5B500D08723 /* winfont.cpp in Sources */,
+				DF46B7AB1381E5F100D08723 /* header.cpp in Sources */,
+				DF46B7B61381E67800D08723 /* sdl-mutex.cpp in Sources */,
+				DF46B7BF1381E6C000D08723 /* object.cpp in Sources */,
+				DF46B7CA1381E72500D08723 /* console.cpp in Sources */,
+				DF46B7D81381E7C600D08723 /* console.cpp in Sources */,
+				DF46B83E1381F13500D08723 /* saveload_v7.cpp in Sources */,
+				DF46B8461381F35500D08723 /* saveload_inca2.cpp in Sources */,
+				DF46B84A1381F38700D08723 /* inter_v7.cpp in Sources */,
+				DF46B84F1381F39E00D08723 /* console.cpp in Sources */,
+				DF46B8541381F3B400D08723 /* console.cpp in Sources */,
+				DF46B8661381F44E00D08723 /* dbopl.cpp in Sources */,
+				DF46B8671381F44E00D08723 /* dosbox.cpp in Sources */,
+				DF46B8681381F44E00D08723 /* mame.cpp in Sources */,
+				DF46B8731381F4A200D08723 /* sdl-audiocd.cpp in Sources */,
+				DF46B87F1381F4F200D08723 /* default-audiocd.cpp in Sources */,
+				DF46B88B1381F5D800D08723 /* sdl-provider.cpp in Sources */,
+				DF46B8941381F62B00D08723 /* adpcm.cpp in Sources */,
+				DF46B89D1381F6C400D08723 /* null.cpp in Sources */,
+				DFADEBB513820DF500C46364 /* maccursor.cpp in Sources */,
+				DFADEBB913820E0C00C46364 /* posix-fs.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -10857,6 +11471,43 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					IPHONE_OFFICIAL,
+					IPHONE,
+					UNIX,
+					ENABLE_SCUMM,
+					ENABLE_SCUMM_7_8,
+					ENABLE_HE,
+					ENABLE_AGI,
+					ENABLE_AGOS,
+					ENABLE_CINE,
+					ENABLE_CRUISE,
+					ENABLE_DRASCULA,
+					ENABLE_GOB,
+					ENABLE_GROOVIE,
+					ENABLE_IGOR,
+					ENABLE_KYRA,
+					ENABLE_LURE,
+					ENABLE_MADE,
+					ENABLE_PARALLACTION,
+					ENABLE_QUEEN,
+					ENABLE_SAGA,
+					ENABLE_IHNM,
+					ENABLE_SCI,
+					ENABLE_SKY,
+					ENABLE_SWORD1,
+					ENABLE_SWORD2,
+					ENABLE_TEENAGENT,
+					ENABLE_TINSEL,
+					ENABLE_TOUCHE,
+					ENABLE_TUCKER,
+					USE_FLAC,
+					USE_MAD,
+					USE_TREMOR,
+					USE_VORBIS,
+					USE_ZLIB,
+					USE_TREMOR,
+				);
 				GCC_THUMB_SUPPORT = NO;
 				GCC_UNROLL_LOOPS = YES;
 				HEADER_SEARCH_PATHS = (
@@ -10865,6 +11516,7 @@
 					include/,
 				);
 				INFOPLIST_FILE = Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/lib\"",
@@ -10872,10 +11524,11 @@
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
 				PRODUCT_NAME = ScummVM;
-				PROVISIONING_PROFILE = "EF590570-5FAC-4346-9071-D609DE2B28D8";
+				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos4.0;
+				SDKROOT = iphoneos4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				VALID_ARCHS = "armv6 armv7";
 			};
 			name = Debug;
 		};
@@ -10897,49 +11550,10 @@
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
-				GCC_THUMB_SUPPORT = NO;
-				GCC_UNROLL_LOOPS = YES;
-				HEADER_SEARCH_PATHS = (
-					../../engines/,
-					../../,
-					include/,
-				);
-				INFOPLIST_FILE = Info.plist;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/lib\"",
-				);
-				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				PRODUCT_NAME = ScummVM;
-				PROVISIONING_PROFILE = "EF590570-5FAC-4346-9071-D609DE2B28D8";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos3.2;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Release;
-		};
-		C01FCF4F08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_ENABLE_CPP_RTTI = NO;
-				GCC_INPUT_FILETYPE = automatic;
-				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					CONFIG_H,
 					IPHONE_OFFICIAL,
 					IPHONE,
 					UNIX,
-					SCUMM_LITTLE_ENDIAN,
-					SCUMM_NEED_ALIGNMENT,
 					ENABLE_SCUMM,
 					ENABLE_SCUMM_7_8,
 					ENABLE_HE,
@@ -10971,8 +11585,48 @@
 					USE_TREMOR,
 					USE_VORBIS,
 					USE_ZLIB,
+					USE_TREMOR,
 				);
 				GCC_THUMB_SUPPORT = NO;
+				GCC_UNROLL_LOOPS = YES;
+				HEADER_SEARCH_PATHS = (
+					../../engines/,
+					../../,
+					include/,
+				);
+				INFOPLIST_FILE = Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/lib\"",
+				);
+				ONLY_ACTIVE_ARCH = YES;
+				PREBINDING = NO;
+				PRODUCT_NAME = ScummVM;
+				PROVISIONING_PROFILE = "";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
+				SDKROOT = iphoneos4.2;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALID_ARCHS = "armv6 armv7";
+				WRAPPER_EXTENSION = app;
+			};
+			name = Release;
+		};
+		C01FCF4F08A954540054247B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				CODE_SIGN_IDENTITY = "Don't Code Sign";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign";
+				FRAMEWORK_SEARCH_PATHS = "";
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_ENABLE_CPP_EXCEPTIONS = NO;
+				GCC_ENABLE_CPP_RTTI = NO;
+				GCC_INPUT_FILETYPE = automatic;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = "";
+				GCC_THUMB_SUPPORT = NO;
 				GCC_USE_GCC3_PFE_SUPPORT = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
@@ -10980,16 +11634,15 @@
 					../../engines/,
 					../../,
 				);
+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
 				LIBRARY_SEARCH_PATHS = "";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "-lz";
 				PREBINDING = NO;
-				PROVISIONING_PROFILE = "";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos4.0;
+				SDKROOT = "";
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7";
+				VALID_ARCHS = "i386 ppc ppc64 x86_64 armv6 armv7";
 			};
 			name = Debug;
 		};
@@ -10997,91 +11650,39 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				CODE_SIGN_IDENTITY = "Don't Code Sign";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign";
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
 				GCC_ENABLE_CPP_RTTI = NO;
 				GCC_ENABLE_EXCEPTIONS = NO;
 				GCC_INPUT_FILETYPE = automatic;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					CONFIG_H,
-					IPHONE_OFFICIAL,
-					IPHONE,
-					UNIX,
-					SCUMM_LITTLE_ENDIAN,
-					SCUMM_NEED_ALIGNMENT,
-					ENABLE_SCUMM,
-					ENABLE_SCUMM_7_8,
-					ENABLE_HE,
-					ENABLE_AGI,
-					ENABLE_AGOS,
-					ENABLE_CINE,
-					ENABLE_CRUISE,
-					ENABLE_DRASCULA,
-					ENABLE_GOB,
-					ENABLE_GROOVIE,
-					ENABLE_IGOR,
-					ENABLE_KYRA,
-					ENABLE_LURE,
-					ENABLE_MADE,
-					ENABLE_PARALLACTION,
-					ENABLE_QUEEN,
-					ENABLE_SAGA,
-					ENABLE_IHNM,
-					ENABLE_SCI,
-					ENABLE_SKY,
-					ENABLE_SWORD1,
-					ENABLE_SWORD2,
-					ENABLE_TEENAGENT,
-					ENABLE_TINSEL,
-					ENABLE_TOUCHE,
-					ENABLE_TUCKER,
-					USE_FLAC,
-					USE_MAD,
-					USE_TREMOR,
-					USE_VORBIS,
-					USE_ZLIB,
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = "";
 				GCC_THUMB_SUPPORT = NO;
 				GCC_USE_GCC3_PFE_SUPPORT = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				HEADER_SEARCH_PATHS = (
-					/opt/local/include/SDL,
-					/opt/local/include,
-					/sw/include/SDL,
-					/sw/include,
 					../../engines/,
 					../../,
 				);
+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
 				LIBRARY_SEARCH_PATHS = "";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-lSDLmain",
-					"-logg",
-					"-lvorbisfile",
-					"-lvorbis",
-					"-lmad",
-					"-lFLAC",
-					"-lSDL",
-					"-lz",
-				);
+				OTHER_LDFLAGS = "";
 				PREBINDING = NO;
-				PROVISIONING_PROFILE = "";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphonesimulator3.2;
+				SDKROOT = "";
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7";
+				VALID_ARCHS = "i386 ppc ppc64 x86_64 armv6 armv7";
 			};
 			name = Release;
 		};
 		DF0942280F63CB26002D821E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COMPRESS_PNG_FILES = NO;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -11092,12 +11693,9 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					CONFIG_H,
 					MACOSX,
 					SDL_BACKEND,
 					UNIX,
-					SCUMM_LITTLE_ENDIAN,
-					SCUMM_NEED_ALIGNMENT,
 					ENABLE_SCUMM,
 					ENABLE_SCUMM_7_8,
 					ENABLE_HE,
@@ -11127,7 +11725,6 @@
 					USE_FLAC,
 					USE_MAD,
 					USE_MPEG2,
-					USE_TREMOR,
 					USE_VORBIS,
 					USE_ZLIB,
 				);
@@ -11137,7 +11734,6 @@
 					/opt/local/include,
 					/sw/include/SDL,
 					/sw/include,
-					include/,
 					../../engines/,
 					../../,
 				);
@@ -11147,7 +11743,8 @@
 					/opt/local/lib,
 					"$(inherited)",
 				);
-				ONLY_ACTIVE_ARCH = NO;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-lSDLmain",
@@ -11161,15 +11758,15 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = ScummVM;
-				SDKROOT = macosx10.6;
-				VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64";
+				SDKROOT = macosx10.5;
+				VALID_ARCHS = "i386 ppc ppc64 x86_64";
 			};
 			name = Debug;
 		};
 		DF0942290F63CB26002D821E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COMPRESS_PNG_FILES = NO;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -11178,12 +11775,9 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					CONFIG_H,
 					MACOSX,
 					SDL_BACKEND,
 					UNIX,
-					SCUMM_LITTLE_ENDIAN,
-					SCUMM_NEED_ALIGNMENT,
 					ENABLE_SCUMM,
 					ENABLE_SCUMM_7_8,
 					ENABLE_HE,
@@ -11213,7 +11807,6 @@
 					USE_FLAC,
 					USE_MAD,
 					USE_MPEG2,
-					USE_TREMOR,
 					USE_VORBIS,
 					USE_ZLIB,
 				);
@@ -11232,7 +11825,8 @@
 					/opt/local/lib,
 					"$(inherited)",
 				);
-				ONLY_ACTIVE_ARCH = NO;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-lSDLmain",
@@ -11246,8 +11840,8 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = ScummVM;
-				SDKROOT = macosx10.6;
-				VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64";
+				SDKROOT = macosx10.5;
+				VALID_ARCHS = "i386 ppc ppc64 x86_64";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
@@ -11255,6 +11849,7 @@
 		DFF95CC80FB22D5700A3EC78 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COMPRESS_PNG_FILES = NO;
@@ -11283,6 +11878,7 @@
 					/opt/local/lib,
 					"$(inherited)",
 				);
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-lSDLmain",
 					"-logg",
@@ -11297,13 +11893,15 @@
 				PRODUCT_NAME = ScummVM;
 				PROVISIONING_PROFILE = "EF590570-5FAC-4346-9071-D609DE2B28D8";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphonesimulator3.2;
+				SDKROOT = iphoneos;
+				VALID_ARCHS = "i386 x86_64";
 			};
 			name = Debug;
 		};
 		DFF95CC90FB22D5700A3EC78 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COMPRESS_PNG_FILES = NO;
@@ -11331,6 +11929,7 @@
 					/opt/local/lib,
 					"$(inherited)",
 				);
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-lSDLmain",
 					"-logg",
@@ -11345,7 +11944,8 @@
 				PRODUCT_NAME = ScummVM;
 				PROVISIONING_PROFILE = "EF590570-5FAC-4346-9071-D609DE2B28D8";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphonesimulator3.2;
+				SDKROOT = iphoneos;
+				VALID_ARCHS = "i386 x86_64";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
diff --git a/dists/nsis/graphics/left.bmp b/dists/nsis/graphics/left.bmp
new file mode 100644
index 0000000000..8b31d7d09a
--- /dev/null
+++ b/dists/nsis/graphics/left.bmp
diff --git a/dists/nsis/graphics/scummvm-install.ico b/dists/nsis/graphics/scummvm-install.ico
new file mode 100644
index 0000000000..b8b118c7bd
--- /dev/null
+++ b/dists/nsis/graphics/scummvm-install.ico
diff --git a/dists/nsis/scummvm.nsi b/dists/nsis/scummvm.nsi
new file mode 100644
index 0000000000..50ccadaf74
--- /dev/null
+++ b/dists/nsis/scummvm.nsi
@@ -0,0 +1,356 @@
+# ScummVM - Graphic Adventure Engine
+#
+# ScummVM is the legal property of its developers, whose names
+# are too numerous to list here. Please refer to the COPYRIGHT
+# file distributed with this source distribution.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+#!define _DEBUG
+#!define _INCLUDE_DATA_FILES
+
+Name ScummVM
+
+# Included files
+!include MUI2.nsh
+
+#########################################################################################
+# Command line options
+#########################################################################################
+
+#!define top_srcdir   ""
+#!define build_dir    ""
+#!define text_dir     ""
+#!define ARCH         ""    ;(optional, defaults to win32)
+
+# Check parameters
+!ifndef top_srcdir
+	!error "Top source folder has not been passed to command line!"
+!endif
+
+!ifndef build_dir
+	!error "Build folder has not been passed to command line (this folder should contain the executable and linked DLLs)!"
+!endif
+
+!ifndef text_dir
+	!error "Text folder has not been passed to command line (this folder should contain all the text files used by the installer)!"
+!endif
+
+!ifndef ARCH
+	!warning "ARCH has not been defined, defaulting to 'win32'"
+	!define ARCH         "win32"
+!endif
+
+#########################################################################################
+# Folders
+#########################################################################################
+!define engine_data  "${top_srcdir}\dists\engine-data"
+!define theme_data   "${top_srcdir}\gui\themes"
+
+#########################################################################################
+# General Symbol Definitions
+#########################################################################################
+!define REGKEY      "Software\$(^Name)\$(^Name)"
+!define VERSION     "1.4.0git"
+!define COMPANY     "ScummVM Team"
+!define URL         "http://scummvm.org/"
+!define DESCRIPTION "ScummVM Installer. Look! A three headed monkey (TM)!"
+!define COPYRIGHT   "Copyright © 2001-2011 The ScummVM Team"
+
+#########################################################################################
+# Installer configuration
+#########################################################################################
+OutFile          ${build_dir}\scummvm-${VERSION}-${ARCH}.exe
+InstallDir       $PROGRAMFILES\ScummVM                            ; Default installation folder
+InstallDirRegKey HKCU "Software\ScummVM\ScummVM" "InstallPath"    ; Get installation folder from registry if available
+                                                                  ; The application name needs to be refered directly instead of through ${REGKEY}
+                                                                  ; because lang strings aren't initialized at the point InstallDirRegKey is called
+
+CRCCheck on
+XPStyle  on
+#TargetMinimalOS 5.0    ; Minimal version of windows for installer: Windows 2000 or more recent
+                        ; (will build unicode installer with NSIS 2.50+)
+
+VIProductVersion 1.4.0.0
+VIAddVersionKey  ProductName      $(^Name)
+VIAddVersionKey  ProductVersion  "${VERSION}"
+VIAddVersionKey  CompanyName     "${COMPANY}"
+VIAddVersionKey  CompanyWebsite  "${URL}"
+VIAddVersionKey  FileVersion     "${VERSION}"
+VIAddVersionKey  FileDescription "${DESCRIPTION}"
+VIAddVersionKey  LegalCopyright  "${COPYRIGHT}"
+
+BrandingText "$(^Name) ${VERSION}"   ; Change branding text on the installer to show our name and version instead of NSIS's
+
+# Show Details when installing/uninstalling files
+ShowInstDetails   show
+ShowUninstDetails show
+
+!ifdef _DEBUG
+	SetCompress off                      ; for debugging the installer, lzma takes forever
+	RequestExecutionLevel user
+!else
+	SetCompressor /FINAL /SOLID lzma
+	SetCompressorDictSize 64
+	RequestExecutionLevel admin          ; for installation into program files folders
+!endif
+
+#########################################################################################
+# MUI Symbol Definitions
+#########################################################################################
+!define MUI_WELCOMEFINISHPAGE_BITMAP "graphics\left.bmp"
+!define MUI_ICON                     "graphics\scummvm-install.ico"
+!define MUI_UNICON                   "graphics\scummvm-install.ico"
+
+#Start menu
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT      HKCU
+!define MUI_STARTMENUPAGE_REGISTRY_KEY       ${REGKEY}
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER      $(^Name)
+
+# Finish page
+!define MUI_FINISHPAGE_RUN        "$INSTDIR\scummvm.exe"
+!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
+!define MUI_FINISHPAGE_RUN_NOTCHECKED
+!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+
+!define MUI_LICENSEPAGE_RADIOBUTTONS
+
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_UNFINISHPAGE_NOAUTOCLOSE
+
+#########################################################################################
+# Installer pages
+#########################################################################################
+# Variables
+Var StartMenuGroup
+
+;Remember the installer language
+!define MUI_LANGDLL_REGISTRY_ROOT      HKCU
+!define MUI_LANGDLL_REGISTRY_KEY       ${REGKEY}
+!define MUI_LANGDLL_REGISTRY_VALUENAME "InstallerLanguage"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE ${top_srcdir}\COPYING
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+# Installer languages
+!insertmacro MUI_LANGUAGE "English"    ;first language is the default language
+
+!ifndef _DEBUG    ; Skip other languages when building debug builds
+;!insertmacro MUI_LANGUAGE "Afrikaans"
+;!insertmacro MUI_LANGUAGE "Albanian"
+;!insertmacro MUI_LANGUAGE "Arabic"
+;!insertmacro MUI_LANGUAGE "Belarusian"
+;!insertmacro MUI_LANGUAGE "Bosnian"
+;!insertmacro MUI_LANGUAGE "Breton"
+;!insertmacro MUI_LANGUAGE "Bulgarian"
+!insertmacro MUI_LANGUAGE "Catalan"
+;!insertmacro MUI_LANGUAGE "Croatian"
+!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "Danish"
+;!insertmacro MUI_LANGUAGE "Dutch"
+;!insertmacro MUI_LANGUAGE "Esperanto"
+;!insertmacro MUI_LANGUAGE "Estonian"
+;!insertmacro MUI_LANGUAGE "Farsi"
+;!insertmacro MUI_LANGUAGE "Finnish"
+!insertmacro MUI_LANGUAGE "French"
+;!insertmacro MUI_LANGUAGE "Galician"
+!insertmacro MUI_LANGUAGE "German"
+;!insertmacro MUI_LANGUAGE "Greek"
+;!insertmacro MUI_LANGUAGE "Hebrew"
+!insertmacro MUI_LANGUAGE "Hungarian"
+;!insertmacro MUI_LANGUAGE "Icelandic"
+;!insertmacro MUI_LANGUAGE "Indonesian"
+;!insertmacro MUI_LANGUAGE "Irish"
+!insertmacro MUI_LANGUAGE "Italian"
+;!insertmacro MUI_LANGUAGE "Japanese"
+;!insertmacro MUI_LANGUAGE "Korean"
+;!insertmacro MUI_LANGUAGE "Kurdish"
+;!insertmacro MUI_LANGUAGE "Latvian"
+;!insertmacro MUI_LANGUAGE "Lithuanian"
+;!insertmacro MUI_LANGUAGE "Luxembourgish"
+;!insertmacro MUI_LANGUAGE "Macedonian"
+;!insertmacro MUI_LANGUAGE "Malay"
+;!insertmacro MUI_LANGUAGE "Mongolian"
+!insertmacro MUI_LANGUAGE "Norwegian"
+!insertmacro MUI_LANGUAGE "NorwegianNynorsk"
+!insertmacro MUI_LANGUAGE "Polish"
+;!insertmacro MUI_LANGUAGE "Portuguese"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+;!insertmacro MUI_LANGUAGE "Romanian"
+!insertmacro MUI_LANGUAGE "Russian"
+;!insertmacro MUI_LANGUAGE "Serbian"
+;!insertmacro MUI_LANGUAGE "SerbianLatin"
+;!insertmacro MUI_LANGUAGE "SimpChinese"
+;!insertmacro MUI_LANGUAGE "Slovak"
+;!insertmacro MUI_LANGUAGE "Slovenian"
+!insertmacro MUI_LANGUAGE "Spanish"
+;!insertmacro MUI_LANGUAGE "SpanishInternational"
+!insertmacro MUI_LANGUAGE "Swedish"
+;!insertmacro MUI_LANGUAGE "Thai"
+;!insertmacro MUI_LANGUAGE "TradChinese"
+;!insertmacro MUI_LANGUAGE "Turkish"
+!insertmacro MUI_LANGUAGE "Ukrainian"
+;!insertmacro MUI_LANGUAGE "Uzbek"
+!endif
+
+;Reserve Files (will make sure the file will be stored first in the data block
+;               making the installer start faster when compressing in solid mode)
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+#########################################################################################
+# Installer sections
+#########################################################################################
+Section "ScummVM" SecMain
+	SetOutPath $INSTDIR
+	SetOverwrite on
+
+	# Text files
+	File /oname=AUTHORS.txt      "${text_dir}\AUTHORS"
+	File /oname=COPYING.LGPL.txt "${text_dir}\COPYING.LGPL"
+	File /oname=COPYING.txt      "${text_dir}\COPYING"
+	File /oname=COPYRIGHT.txt    "${text_dir}\COPYRIGHT"
+	File /oname=NEWS.txt         "${text_dir}\NEWS"
+	File /oname=README.txt       "${text_dir}\README"
+	File /oname=README-SDL.txt   "${build_dir}\README-SDL"
+
+!ifdef _INCLUDE_DATA_FILES
+	# Engine data
+	File "${engine_data}\drascula.dat"
+	File "${engine_data}\hugo.dat"
+	File "${engine_data}\kyra.dat"
+	File "${engine_data}\lure.dat"
+	File "${engine_data}\m4.dat"
+	File "${engine_data}\queen.tbl"
+	File "${engine_data}\sky.cpt"
+	File "${engine_data}\teenagent.dat"
+	File "${engine_data}\toon.dat"
+
+	File "${top_srcdir}\dists\pred.dic"
+
+	# Themes
+	File "${theme_data}\scummclassic.zip"
+	File "${theme_data}\scummmodern.zip"
+	File "${theme_data}\translations.dat"
+!endif
+
+	# Main exe and dlls
+	File "${build_dir}\scummvm.exe"
+	File "${build_dir}\SDL.dll"
+
+	WriteRegStr HKCU "${REGKEY}" InstallPath "$INSTDIR"    ; Store installation folder
+SectionEnd
+
+# Write Start menu entries and uninstaller
+Section -post SecMainPost
+	SetOutPath $INSTDIR
+	WriteUninstaller $INSTDIR\uninstall.exe
+	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+	SetShellVarContext all     ; Create shortcuts in the all-users folder
+	CreateDirectory "$SMPROGRAMS\$StartMenuGroup"
+	CreateShortCut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"           $INSTDIR\$(^Name).exe "" "$INSTDIR\$(^Name).exe" 0    ; Create shortcut with icon
+	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Readme.lnk"             $INSTDIR\README.txt
+	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe
+	!insertmacro MUI_STARTMENU_WRITE_END
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" InstallLocation $INSTDIR
+	WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1
+	WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
+SectionEnd
+
+# Installer functions
+Function .onInit
+	!insertmacro MUI_LANGDLL_DISPLAY
+
+!ifdef _DEBUG && NSIS_CONFIG_LOG
+	LogSet on    ; Will write a log file to the install folder (when using the special NSIS logging build)
+!endif
+FunctionEnd
+
+#########################################################################################
+# Uninstaller sections
+#########################################################################################
+Section -un.Main SecUninstall
+	Delete /REBOOTOK $INSTDIR\AUTHORS.txt
+	Delete /REBOOTOK $INSTDIR\COPYING.txt
+	Delete /REBOOTOK $INSTDIR\COPYING.LGPL.txt
+	Delete /REBOOTOK $INSTDIR\COPYRIGHT.txt
+	Delete /REBOOTOK $INSTDIR\NEWS.txt
+	Delete /REBOOTOK $INSTDIR\README.txt
+	Delete /REBOOTOK $INSTDIR\README-SDL.txt
+
+!ifdef _INCLUDE_DATA_FILES
+	Delete /REBOOTOK $INSTDIR\drascula.dat
+	Delete /REBOOTOK $INSTDIR\hugo.dat
+	Delete /REBOOTOK $INSTDIR\kyra.dat
+	Delete /REBOOTOK $INSTDIR\lure.dat
+	Delete /REBOOTOK $INSTDIR\m4.dat
+	Delete /REBOOTOK $INSTDIR\queen.tbl
+	Delete /REBOOTOK $INSTDIR\sky.cpt
+	Delete /REBOOTOK $INSTDIR\teenagent.dat
+	Delete /REBOOTOK $INSTDIR\toon.dat
+
+	Delete /REBOOTOK $INSTDIR\pred.dic
+
+	Delete /REBOOTOK $INSTDIR\scummclassic.zip
+	Delete /REBOOTOK $INSTDIR\scummmodern.zip
+	Delete /REBOOTOK $INSTDIR\translations.dat
+!endif
+
+	Delete /REBOOTOK $INSTDIR\scummvm.exe
+	Delete /REBOOTOK $INSTDIR\SDL.dll
+SectionEnd
+
+Section -un.post SecUninstallPost
+	# Remove start menu entries
+	SetShellVarContext all
+	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"
+	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Readme.lnk"
+	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk"
+	RmDir  /REBOOTOK  $SMPROGRAMS\$StartMenuGroup
+
+	Delete /REBOOTOK $INSTDIR\uninstall.exe
+
+	DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
+	DeleteRegValue HKCU "${REGKEY}" StartMenuGroup
+	DeleteRegValue HKCU "${REGKEY}" InstallPath
+	DeleteRegValue HKCU "${REGKEY}" InstallerLanguage
+	DeleteRegKey /IfEmpty HKCU "${REGKEY}"
+
+	RmDir $INSTDIR    ; will only remove if empty (pass /r flag for recursive behavior)
+	Push $R0
+	StrCpy $R0 $StartMenuGroup 1
+	StrCmp $R0 ">" no_smgroup
+no_smgroup:
+	Pop $R0
+SectionEnd
+
+# Uninstaller functions
+Function un.onInit
+	!insertmacro MUI_UNGETLANGUAGE
+	ReadRegStr   $INSTDIR HKCU "${REGKEY}" InstallPath
+	!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup
+FunctionEnd
diff --git a/dists/nsis/scummvm.nsi.in b/dists/nsis/scummvm.nsi.in
new file mode 100644
index 0000000000..c94e5943f7
--- /dev/null
+++ b/dists/nsis/scummvm.nsi.in
@@ -0,0 +1,356 @@
+# ScummVM - Graphic Adventure Engine
+#
+# ScummVM is the legal property of its developers, whose names
+# are too numerous to list here. Please refer to the COPYRIGHT
+# file distributed with this source distribution.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+#!define _DEBUG
+#!define _INCLUDE_DATA_FILES
+
+Name ScummVM
+
+# Included files
+!include MUI2.nsh
+
+#########################################################################################
+# Command line options
+#########################################################################################
+
+#!define top_srcdir   ""
+#!define build_dir    ""
+#!define text_dir     ""
+#!define ARCH         ""    ;(optional, defaults to win32)
+
+# Check parameters
+!ifndef top_srcdir
+	!error "Top source folder has not been passed to command line!"
+!endif
+
+!ifndef build_dir
+	!error "Build folder has not been passed to command line (this folder should contain the executable and linked DLLs)!"
+!endif
+
+!ifndef text_dir
+	!error "Text folder has not been passed to command line (this folder should contain all the text files used by the installer)!"
+!endif
+
+!ifndef ARCH
+	!warning "ARCH has not been defined, defaulting to 'win32'"
+	!define ARCH         "win32"
+!endif
+
+#########################################################################################
+# Folders
+#########################################################################################
+!define engine_data  "${top_srcdir}\dists\engine-data"
+!define theme_data   "${top_srcdir}\gui\themes"
+
+#########################################################################################
+# General Symbol Definitions
+#########################################################################################
+!define REGKEY      "Software\$(^Name)\$(^Name)"
+!define VERSION     "@VERSION@"
+!define COMPANY     "ScummVM Team"
+!define URL         "http://scummvm.org/"
+!define DESCRIPTION "ScummVM Installer. Look! A three headed monkey (TM)!"
+!define COPYRIGHT   "Copyright © 2001-2011 The ScummVM Team"
+
+#########################################################################################
+# Installer configuration
+#########################################################################################
+OutFile          ${build_dir}\scummvm-${VERSION}-${ARCH}.exe
+InstallDir       $PROGRAMFILES\ScummVM                            ; Default installation folder
+InstallDirRegKey HKCU "Software\ScummVM\ScummVM" "InstallPath"    ; Get installation folder from registry if available
+                                                                  ; The application name needs to be refered directly instead of through ${REGKEY}
+                                                                  ; because lang strings aren't initialized at the point InstallDirRegKey is called
+
+CRCCheck on
+XPStyle  on
+#TargetMinimalOS 5.0    ; Minimal version of windows for installer: Windows 2000 or more recent
+                        ; (will build unicode installer with NSIS 2.50+)
+
+VIProductVersion @VER_MAJOR@.@VER_MINOR@.@VER_PATCH@.0
+VIAddVersionKey  ProductName      $(^Name)
+VIAddVersionKey  ProductVersion  "${VERSION}"
+VIAddVersionKey  CompanyName     "${COMPANY}"
+VIAddVersionKey  CompanyWebsite  "${URL}"
+VIAddVersionKey  FileVersion     "${VERSION}"
+VIAddVersionKey  FileDescription "${DESCRIPTION}"
+VIAddVersionKey  LegalCopyright  "${COPYRIGHT}"
+
+BrandingText "$(^Name) ${VERSION}"   ; Change branding text on the installer to show our name and version instead of NSIS's
+
+# Show Details when installing/uninstalling files
+ShowInstDetails   show
+ShowUninstDetails show
+
+!ifdef _DEBUG
+	SetCompress off                      ; for debugging the installer, lzma takes forever
+	RequestExecutionLevel user
+!else
+	SetCompressor /FINAL /SOLID lzma
+	SetCompressorDictSize 64
+	RequestExecutionLevel admin          ; for installation into program files folders
+!endif
+
+#########################################################################################
+# MUI Symbol Definitions
+#########################################################################################
+!define MUI_WELCOMEFINISHPAGE_BITMAP "graphics\left.bmp"
+!define MUI_ICON                     "graphics\scummvm-install.ico"
+!define MUI_UNICON                   "graphics\scummvm-install.ico"
+
+#Start menu
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT      HKCU
+!define MUI_STARTMENUPAGE_REGISTRY_KEY       ${REGKEY}
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER      $(^Name)
+
+# Finish page
+!define MUI_FINISHPAGE_RUN        "$INSTDIR\scummvm.exe"
+!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
+!define MUI_FINISHPAGE_RUN_NOTCHECKED
+!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+
+!define MUI_LICENSEPAGE_RADIOBUTTONS
+
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_UNFINISHPAGE_NOAUTOCLOSE
+
+#########################################################################################
+# Installer pages
+#########################################################################################
+# Variables
+Var StartMenuGroup
+
+;Remember the installer language
+!define MUI_LANGDLL_REGISTRY_ROOT      HKCU
+!define MUI_LANGDLL_REGISTRY_KEY       ${REGKEY}
+!define MUI_LANGDLL_REGISTRY_VALUENAME "InstallerLanguage"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE ${top_srcdir}\COPYING
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+# Installer languages
+!insertmacro MUI_LANGUAGE "English"    ;first language is the default language
+
+!ifndef _DEBUG    ; Skip other languages when building debug builds
+;!insertmacro MUI_LANGUAGE "Afrikaans"
+;!insertmacro MUI_LANGUAGE "Albanian"
+;!insertmacro MUI_LANGUAGE "Arabic"
+;!insertmacro MUI_LANGUAGE "Belarusian"
+;!insertmacro MUI_LANGUAGE "Bosnian"
+;!insertmacro MUI_LANGUAGE "Breton"
+;!insertmacro MUI_LANGUAGE "Bulgarian"
+!insertmacro MUI_LANGUAGE "Catalan"
+;!insertmacro MUI_LANGUAGE "Croatian"
+!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "Danish"
+;!insertmacro MUI_LANGUAGE "Dutch"
+;!insertmacro MUI_LANGUAGE "Esperanto"
+;!insertmacro MUI_LANGUAGE "Estonian"
+;!insertmacro MUI_LANGUAGE "Farsi"
+;!insertmacro MUI_LANGUAGE "Finnish"
+!insertmacro MUI_LANGUAGE "French"
+;!insertmacro MUI_LANGUAGE "Galician"
+!insertmacro MUI_LANGUAGE "German"
+;!insertmacro MUI_LANGUAGE "Greek"
+;!insertmacro MUI_LANGUAGE "Hebrew"
+!insertmacro MUI_LANGUAGE "Hungarian"
+;!insertmacro MUI_LANGUAGE "Icelandic"
+;!insertmacro MUI_LANGUAGE "Indonesian"
+;!insertmacro MUI_LANGUAGE "Irish"
+!insertmacro MUI_LANGUAGE "Italian"
+;!insertmacro MUI_LANGUAGE "Japanese"
+;!insertmacro MUI_LANGUAGE "Korean"
+;!insertmacro MUI_LANGUAGE "Kurdish"
+;!insertmacro MUI_LANGUAGE "Latvian"
+;!insertmacro MUI_LANGUAGE "Lithuanian"
+;!insertmacro MUI_LANGUAGE "Luxembourgish"
+;!insertmacro MUI_LANGUAGE "Macedonian"
+;!insertmacro MUI_LANGUAGE "Malay"
+;!insertmacro MUI_LANGUAGE "Mongolian"
+!insertmacro MUI_LANGUAGE "Norwegian"
+!insertmacro MUI_LANGUAGE "NorwegianNynorsk"
+!insertmacro MUI_LANGUAGE "Polish"
+;!insertmacro MUI_LANGUAGE "Portuguese"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+;!insertmacro MUI_LANGUAGE "Romanian"
+!insertmacro MUI_LANGUAGE "Russian"
+;!insertmacro MUI_LANGUAGE "Serbian"
+;!insertmacro MUI_LANGUAGE "SerbianLatin"
+;!insertmacro MUI_LANGUAGE "SimpChinese"
+;!insertmacro MUI_LANGUAGE "Slovak"
+;!insertmacro MUI_LANGUAGE "Slovenian"
+!insertmacro MUI_LANGUAGE "Spanish"
+;!insertmacro MUI_LANGUAGE "SpanishInternational"
+!insertmacro MUI_LANGUAGE "Swedish"
+;!insertmacro MUI_LANGUAGE "Thai"
+;!insertmacro MUI_LANGUAGE "TradChinese"
+;!insertmacro MUI_LANGUAGE "Turkish"
+!insertmacro MUI_LANGUAGE "Ukrainian"
+;!insertmacro MUI_LANGUAGE "Uzbek"
+!endif
+
+;Reserve Files (will make sure the file will be stored first in the data block
+;               making the installer start faster when compressing in solid mode)
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+#########################################################################################
+# Installer sections
+#########################################################################################
+Section "ScummVM" SecMain
+	SetOutPath $INSTDIR
+	SetOverwrite on
+
+	# Text files
+	File /oname=AUTHORS.txt      "${text_dir}\AUTHORS"
+	File /oname=COPYING.LGPL.txt "${text_dir}\COPYING.LGPL"
+	File /oname=COPYING.txt      "${text_dir}\COPYING"
+	File /oname=COPYRIGHT.txt    "${text_dir}\COPYRIGHT"
+	File /oname=NEWS.txt         "${text_dir}\NEWS"
+	File /oname=README.txt       "${text_dir}\README"
+	File /oname=README-SDL.txt   "${build_dir}\README-SDL"
+
+!ifdef _INCLUDE_DATA_FILES
+	# Engine data
+	File "${engine_data}\drascula.dat"
+	File "${engine_data}\hugo.dat"
+	File "${engine_data}\kyra.dat"
+	File "${engine_data}\lure.dat"
+	File "${engine_data}\m4.dat"
+	File "${engine_data}\queen.tbl"
+	File "${engine_data}\sky.cpt"
+	File "${engine_data}\teenagent.dat"
+	File "${engine_data}\toon.dat"
+
+	File "${top_srcdir}\dists\pred.dic"
+
+	# Themes
+	File "${theme_data}\scummclassic.zip"
+	File "${theme_data}\scummmodern.zip"
+	File "${theme_data}\translations.dat"
+!endif
+
+	# Main exe and dlls
+	File "${build_dir}\scummvm.exe"
+	File "${build_dir}\SDL.dll"
+
+	WriteRegStr HKCU "${REGKEY}" InstallPath "$INSTDIR"    ; Store installation folder
+SectionEnd
+
+# Write Start menu entries and uninstaller
+Section -post SecMainPost
+	SetOutPath $INSTDIR
+	WriteUninstaller $INSTDIR\uninstall.exe
+	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+	SetShellVarContext all     ; Create shortcuts in the all-users folder
+	CreateDirectory "$SMPROGRAMS\$StartMenuGroup"
+	CreateShortCut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"           $INSTDIR\$(^Name).exe "" "$INSTDIR\$(^Name).exe" 0    ; Create shortcut with icon
+	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Readme.lnk"             $INSTDIR\README.txt
+	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe
+	!insertmacro MUI_STARTMENU_WRITE_END
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" InstallLocation $INSTDIR
+	WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1
+	WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
+SectionEnd
+
+# Installer functions
+Function .onInit
+	!insertmacro MUI_LANGDLL_DISPLAY
+
+!ifdef _DEBUG && NSIS_CONFIG_LOG
+	LogSet on    ; Will write a log file to the install folder (when using the special NSIS logging build)
+!endif
+FunctionEnd
+
+#########################################################################################
+# Uninstaller sections
+#########################################################################################
+Section -un.Main SecUninstall
+	Delete /REBOOTOK $INSTDIR\AUTHORS.txt
+	Delete /REBOOTOK $INSTDIR\COPYING.txt
+	Delete /REBOOTOK $INSTDIR\COPYING.LGPL.txt
+	Delete /REBOOTOK $INSTDIR\COPYRIGHT.txt
+	Delete /REBOOTOK $INSTDIR\NEWS.txt
+	Delete /REBOOTOK $INSTDIR\README.txt
+	Delete /REBOOTOK $INSTDIR\README-SDL.txt
+
+!ifdef _INCLUDE_DATA_FILES
+	Delete /REBOOTOK $INSTDIR\drascula.dat
+	Delete /REBOOTOK $INSTDIR\hugo.dat
+	Delete /REBOOTOK $INSTDIR\kyra.dat
+	Delete /REBOOTOK $INSTDIR\lure.dat
+	Delete /REBOOTOK $INSTDIR\m4.dat
+	Delete /REBOOTOK $INSTDIR\queen.tbl
+	Delete /REBOOTOK $INSTDIR\sky.cpt
+	Delete /REBOOTOK $INSTDIR\teenagent.dat
+	Delete /REBOOTOK $INSTDIR\toon.dat
+
+	Delete /REBOOTOK $INSTDIR\pred.dic
+
+	Delete /REBOOTOK $INSTDIR\scummclassic.zip
+	Delete /REBOOTOK $INSTDIR\scummmodern.zip
+	Delete /REBOOTOK $INSTDIR\translations.dat
+!endif
+
+	Delete /REBOOTOK $INSTDIR\scummvm.exe
+	Delete /REBOOTOK $INSTDIR\SDL.dll
+SectionEnd
+
+Section -un.post SecUninstallPost
+	# Remove start menu entries
+	SetShellVarContext all
+	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"
+	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Readme.lnk"
+	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk"
+	RmDir  /REBOOTOK  $SMPROGRAMS\$StartMenuGroup
+
+	Delete /REBOOTOK $INSTDIR\uninstall.exe
+
+	DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
+	DeleteRegValue HKCU "${REGKEY}" StartMenuGroup
+	DeleteRegValue HKCU "${REGKEY}" InstallPath
+	DeleteRegValue HKCU "${REGKEY}" InstallerLanguage
+	DeleteRegKey /IfEmpty HKCU "${REGKEY}"
+
+	RmDir $INSTDIR    ; will only remove if empty (pass /r flag for recursive behavior)
+	Push $R0
+	StrCpy $R0 $StartMenuGroup 1
+	StrCmp $R0 ">" no_smgroup
+no_smgroup:
+	Pop $R0
+SectionEnd
+
+# Uninstaller functions
+Function un.onInit
+	!insertmacro MUI_UNGETLANGUAGE
+	ReadRegStr   $INSTDIR HKCU "${REGKEY}" InstallPath
+	!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup
+FunctionEnd
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 15dd04c0d9..109437305c 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -1,9 +1,47 @@
 #include "winresrc.h"
 
-#if defined (__MINGW32__) || defined(__CYGWIN32__) || defined(HAS_INCLUDE_SET)
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define FILE 256
+
 IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
-#else
-IDI_ICON               ICON    DISCARDABLE     "../../icons/scummvm.ico"
+
+scummmodern.zip        FILE    "gui/themes/scummmodern.zip"
+#ifdef USE_TRANSLATION
+translations.dat       FILE    "gui/themes/translations.dat"
+#endif
+
+#if ENABLE_DRASCULA  == STATIC_PLUGIN
+drascula.dat           FILE    "dists/engine-data/drascula.dat"
+#endif
+#if ENABLE_HUGO      == STATIC_PLUGIN
+hugo.dat               FILE    "dists/engine-data/hugo.dat"
+#endif
+#if ENABLE_KYRA      == STATIC_PLUGIN
+kyra.dat               FILE    "dists/engine-data/kyra.dat"
+#endif
+#if ENABLE_LURE      == STATIC_PLUGIN
+lure.dat               FILE    "dists/engine-data/lure.dat"
+#endif
+#if ENABLE_M4        == STATIC_PLUGIN
+m4.dat                 FILE    "dists/engine-data/m4.dat"
+#endif
+#if ENABLE_QUEEN     == STATIC_PLUGIN
+queen.tbl              FILE    "dists/engine-data/queen.tbl"
+#endif
+#if ENABLE_SKY       == STATIC_PLUGIN
+sky.cpt                FILE    "dists/engine-data/sky.cpt"
+#endif
+#if ENABLE_TEENAGENT == STATIC_PLUGIN
+teenagent.dat          FILE    "dists/engine-data/teenagent.dat"
+#endif
+#if ENABLE_TOON      == STATIC_PLUGIN
+toon.dat               FILE    "dists/engine-data/toon.dat"
+#endif
+#if ENABLE_AGI       == STATIC_PLUGIN
+pred.dic               FILE    "dists/pred.dic"
 #endif
 
 VS_VERSION_INFO VERSIONINFO
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index a0fcf82dbb..c043ce1644 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -1,9 +1,47 @@
 #include "winresrc.h"
 
-#if defined (__MINGW32__) || defined(__CYGWIN32__) || defined(HAS_INCLUDE_SET)
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define FILE 256
+
 IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
-#else
-IDI_ICON               ICON    DISCARDABLE     "../../icons/scummvm.ico"
+
+scummmodern.zip        FILE    "gui/themes/scummmodern.zip"
+#ifdef USE_TRANSLATION
+translations.dat       FILE    "gui/themes/translations.dat"
+#endif
+
+#if ENABLE_DRASCULA  == STATIC_PLUGIN
+drascula.dat           FILE    "dists/engine-data/drascula.dat"
+#endif
+#if ENABLE_HUGO      == STATIC_PLUGIN
+hugo.dat               FILE    "dists/engine-data/hugo.dat"
+#endif
+#if ENABLE_KYRA      == STATIC_PLUGIN
+kyra.dat               FILE    "dists/engine-data/kyra.dat"
+#endif
+#if ENABLE_LURE      == STATIC_PLUGIN
+lure.dat               FILE    "dists/engine-data/lure.dat"
+#endif
+#if ENABLE_M4        == STATIC_PLUGIN
+m4.dat                 FILE    "dists/engine-data/m4.dat"
+#endif
+#if ENABLE_QUEEN     == STATIC_PLUGIN
+queen.tbl              FILE    "dists/engine-data/queen.tbl"
+#endif
+#if ENABLE_SKY       == STATIC_PLUGIN
+sky.cpt                FILE    "dists/engine-data/sky.cpt"
+#endif
+#if ENABLE_TEENAGENT == STATIC_PLUGIN
+teenagent.dat          FILE    "dists/engine-data/teenagent.dat"
+#endif
+#if ENABLE_TOON      == STATIC_PLUGIN
+toon.dat               FILE    "dists/engine-data/toon.dat"
+#endif
+#if ENABLE_AGI       == STATIC_PLUGIN
+pred.dic               FILE    "dists/pred.dic"
 #endif
 
 VS_VERSION_INFO VERSIONINFO