[Scummvm-cvs-logs] scummvm master -> 6e157fd2d4ee1cc5de5b4950ca499ba28f1f153e

fingolfin max at quendi.de
Wed May 25 13:44:21 CEST 2011


This automated email contains information about 17 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1b248cd936 BUILD: Reorder parts of configure
7585303c06 BUILD: Do not manually set endianess
ecb8618cb7 BUILD: Unify build & configure rules for SDL based backends
e013a51604 BUILD: Enable ARM asm only based on _host_cpu
63a69b4f1e BUILD: Overhaul how we determine the need for aligned mem access
9b14c50b77 BUILD: Unify how debug/release mode defaults are determined
d935c53cdf BUILD: Rearrange some PSP stuff
6639eacb3a BUILD: Move some Android 'hack' back to near end of configure
39076ef972 BUILD: Rename UNIX #define to POSIX
38ff07589c BUILD: Unify how _posix is computed
8387b68c57 BUILD: Add only one -D to DEFINES per line; add FIXMEs to -D in CXXFLAGS
717a7accf5 BUILD: Always enable indeo3 codec
4b7f6dfa3c BUILD: Rename USE_TEXT_CONSOLE -> USE_TEXT_CONSOLE_FOR_DEBUGGER
d2e778bf0b BUILD: Replace _need_memalign runtime test by hardcoded list
c439e08590 BUILD: Declare RELEASE_BUILD in DEFINES, not CXXFLAGS
652bf358c2 BUILD: Update comments
6e157fd2d4 BUILD: Do not define LUA_USE_POSIX


Commit: 1b248cd9362e7201b209eb0bc2a099c4b7cbca27
    https://github.com/scummvm/scummvm/commit/1b248cd9362e7201b209eb0bc2a099c4b7cbca27
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:21:00-07:00

Commit Message:
BUILD: Reorder parts of configure

Changed paths:
    configure



diff --git a/configure b/configure
index c4243e1..e839038 100755
--- a/configure
+++ b/configure
@@ -1432,15 +1432,56 @@ fi
 echo $_global_constructors
 
 #
+# Do CXXFLAGS now that we know the compiler version
+#
+if test "$have_gcc" = yes ; then
+	if test "$_cxx_major" -ge "3" ; then
+		case $_host_os in
+		# newlib-based system include files suppress non-C89 function
+		# declarations under __STRICT_ANSI__
+		amigaos* | android | dreamcast | ds | gamecube | mingw* | n64 | psp | ps2 | wii | wince )
+			CXXFLAGS="$CXXFLAGS -W -Wno-unused-parameter"
+			;;
+		*)
+			CXXFLAGS="$CXXFLAGS -ansi -W -Wno-unused-parameter"
+			;;
+		esac
+		add_line_to_config_mk 'HAVE_GCC3 = 1'
+		add_line_to_config_mk 'CXX_UPDATE_DEP_FLAG = -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" -MQ "$@" -MP'
+	fi;
+
+	if test "$_cxx_major" -eq 4 && test "$_cxx_minor" -ge 3 || \
+	   test "$_cxx_major" -gt 4 ; then
+		CXXFLAGS="$CXXFLAGS -Wno-empty-body"
+	else
+		CXXFLAGS="$CXXFLAGS -Wconversion"
+	fi;
+elif test "$have_icc" = yes ; then
+	add_line_to_config_mk 'CXX_UPDATE_DEP_FLAG = -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" -MQ "$@" -MP'
+fi;
+
+# Some platforms use certain GNU extensions in header files
+case $_host_os in
+android | gamecube | psp | wii)
+	;;
+*)
+	# ICC does not support pedantic
+	if test "$have_icc" = no ; then
+		CXXFLAGS="$CXXFLAGS -pedantic"
+	fi
+	;;
+esac
+
+#
 # Check for endianness
 #
 echo_n "Checking endianness... "
 cat > tmp_endianness_check.cpp << EOF
-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+unsigned short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+unsigned short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
 void _ascii() { char* s = (char*) ascii_mm; s = (char*) ascii_ii; }
-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+unsigned short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+unsigned short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
 void _ebcdic() { char* s = (char*) ebcdic_mm; s = (char*) ebcdic_ii; }
 int main() { _ascii (); _ebcdic (); return 0; }
 EOF
@@ -2117,6 +2158,157 @@ EOF
 fi
 
 #
+# Backend related stuff
+#
+case $_backend in
+	android)
+		# ssp at this point so the cxxtests link
+		if test "$_debug_build" = yes; then
+			CXXFLAGS="$CXXFLAGS -fstack-protector"
+		else
+			CXXFLAGS="$CXXFLAGS -fno-stack-protector"
+		fi
+		CXXFLAGS="$CXXFLAGS -Wa,--noexecstack"
+		LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
+
+		static_libs=''
+		system_libs=''
+		for lib in $LIBS; do
+			case $lib in
+			-lz|-lm)
+				system_libs="$system_libs $lib"
+				;;
+			*)
+				static_libs="$static_libs $lib"
+				;;
+			esac
+		done
+
+		# -lgcc is carefully placed here - we want to catch
+		# all toolchain symbols in *our* libraries rather
+		# than pick up anything unhygenic from the Android libs.
+		LIBS="-Wl,-Bstatic $static_libs"
+		LIBS="$LIBS -Wl,-Bdynamic -lgcc $system_libs -llog -lGLESv1_CM"
+		DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
+		;;
+	dc)
+		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc -isystem $(ronindir)/include'
+		LDFLAGS="$LDFLAGS -Wl,-Ttext,0x8c010000 -nostartfiles "'$(ronindir)/lib/crt0.o -L$(ronindir)/lib'
+		LIBS="$LIBS -lronin -lm"
+		;;
+	dingux)
+		find_sdlconfig
+		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
+		DEFINES="$DEFINES -DSDL_BACKEND -DDINGUX"
+		LDFLAGS="$LDFLAGS "
+		MODULES="$MODULES backends/platform/sdl"
+		;;
+	ds)
+		# TODO ds
+		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/arm9/source'
+		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/commoninclude'
+		INCLUDES="$INCLUDES "'-Ibackends/platform/ds/arm9/data'
+		;;
+	gp2x)
+		find_sdlconfig
+		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
+		LDFLAGS="$LDFLAGS"
+		DEFINES="$DEFINES -DSDL_BACKEND"
+		;;
+	gph)
+		find_sdlconfig
+		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
+		LDFLAGS="$LDFLAGS"
+		DEFINES="$DEFINES -DSDL_BACKEND"
+		;;
+	iphone)
+		OBJCFLAGS="$OBJCFLAGS --std=c99"
+		LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES -framework QuartzCore -framework GraphicsServices -framework CoreFoundation -framework Foundation -framework AudioToolbox -framework CoreAudio"
+		;;
+	linuxmoto)
+		find_sdlconfig
+		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
+		DEFINES="$DEFINES -DSDL_BACKEND -DLINUXMOTO"
+		;;
+	n64)
+		INCLUDES="$INCLUDES "'-I$(N64SDK)/include'
+		INCLUDES="$INCLUDES "'-I$(N64SDK)/mips64/include'
+		INCLUDES="$INCLUDES "'-I$(N64SDK)/hkz-libn64'
+		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/n64'
+		LIBS="$LIBS -lpakfs -lframfs -ln64 -ln64utils -lromfs -lm -lstdc++ -lc -lgcc -lz -lnosys"
+		;;
+	null)
+		DEFINES="$DEFINES -DUSE_NULL_DRIVER"
+		;;
+	openpandora)
+		find_sdlconfig
+		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
+		LDFLAGS="$LDFLAGS"
+		DEFINES="$DEFINES -DSDL_BACKEND"
+		;;
+	ps2)
+		# TODO ps2
+		DEFINES="$DEFINES -D_EE -DFORCE_RTL"
+		INCLUDES="$INCLUDES -I$PS2SDK/ee/include -I$PS2SDK/common/include -I$PS2SDK/ports/include"
+		if test "$_dynamic_modules" = no ; then
+			LDFLAGS="$LDFLAGS -mno-crt0 $PS2SDK/ee/startup/crt0.o -T $PS2SDK/ee/startup/linkfile"
+		fi
+		LDFLAGS="$LDFLAGS -L$PS2SDK/ee/lib -L$PS2SDK/ports/lib"
+		LIBS="$LIBS -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lm -lc -lfileXio -lkernel -lstdc++ "
+		;;
+	psp)
+		DEFINES="$DEFINES -D__PSP__ -DDISABLE_COMMAND_LINE -DDISABLE_DOSBOX_OPL"
+		LIBS="$LIBS -lpng -Wl,-Map,mapfile.txt"
+		;;
+	samsungtv)
+		find_sdlconfig
+		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
+		DEFINES="$DEFINES -DSDL_BACKEND -DSAMSUNGTV"
+		LDFLAGS="$LDFLAGS -shared -fpic"
+		MODULES="$MODULES backends/platform/sdl"
+		;;
+	sdl)
+		find_sdlconfig
+		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
+		DEFINES="$DEFINES -DSDL_BACKEND"
+		;;
+	webos)
+		# There is no sdl-config in the WebOS PDK so we don't use find_sdlconfig here.
+		LIBS="$LIBS -lSDL"
+		DEFINES="$DEFINES -DSDL_BACKEND -DWEBOS"
+		MODULES="$MODULES backends/platform/sdl"
+		;;
+	wii)
+		DEFINES="$DEFINES -D__WII__ -DGEKKO"
+		case $_host_os in
+		gamecube)
+			LIBS="$LIBS -lgxflux -liso9660 -lfat -logc -ldb"
+			;;
+		*)
+			LIBS="$LIBS -lgxflux -ldi -liso9660 -ltinysmb -lfat -lwiiuse -lbte -logc -lwiikeyboard -ldb"
+			;;
+		esac
+		;;
+	wince)
+		INCLUDES="$INCLUDES "'-I$(srcdir) -I$(srcdir)/backends/platform/wince -I$(srcdir)/engines -I$(srcdir)/backends/platform/wince/missing/gcc -I$(srcdir)/backends/platform/wince/CEgui -I$(srcdir)/backends/platform/wince/CEkeys'
+		LIBS="$LIBS -static -lSDL"
+		DEFINES="$DEFINES -DSDL_BACKEND"
+		;;
+	*)
+		echo "support for $_backend backend not implemented in configure script yet"
+		exit 1
+		;;
+esac
+MODULES="$MODULES backends/platform/$_backend"
+
+#
 # Enable 16bit support only for backends which support it
 #
 case $_backend in
@@ -3035,198 +3227,6 @@ else
 fi
 
 #
-# Backend related stuff
-#
-case $_backend in
-	android)
-		# ssp at this point so the cxxtests link
-		if test "$_debug_build" = yes; then
-			CXXFLAGS="$CXXFLAGS -fstack-protector"
-		else
-			CXXFLAGS="$CXXFLAGS -fno-stack-protector"
-		fi
-		CXXFLAGS="$CXXFLAGS -Wa,--noexecstack"
-		LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
-
-		static_libs=''
-		system_libs=''
-		for lib in $LIBS; do
-			case $lib in
-			-lz|-lm)
-				system_libs="$system_libs $lib"
-				;;
-			*)
-				static_libs="$static_libs $lib"
-				;;
-			esac
-		done
-
-		# -lgcc is carefully placed here - we want to catch
-		# all toolchain symbols in *our* libraries rather
-		# than pick up anything unhygenic from the Android libs.
-		LIBS="-Wl,-Bstatic $static_libs"
-		LIBS="$LIBS -Wl,-Bdynamic -lgcc $system_libs -llog -lGLESv1_CM"
-		DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
-		;;
-	dc)
-		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc -isystem $(ronindir)/include'
-		LDFLAGS="$LDFLAGS -Wl,-Ttext,0x8c010000 -nostartfiles "'$(ronindir)/lib/crt0.o -L$(ronindir)/lib'
-		LIBS="$LIBS -lronin -lm"
-		;;
-	dingux)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		DEFINES="$DEFINES -DSDL_BACKEND -DDINGUX"
-		LDFLAGS="$LDFLAGS "
-		MODULES="$MODULES backends/platform/sdl"
-		;;
-	ds)
-		# TODO ds
-		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/arm9/source'
-		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/commoninclude'
-		INCLUDES="$INCLUDES "'-Ibackends/platform/ds/arm9/data'
-		;;
-	gp2x)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		LDFLAGS="$LDFLAGS"
-		DEFINES="$DEFINES -DSDL_BACKEND"
-		;;
-	gph)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		LDFLAGS="$LDFLAGS"
-		DEFINES="$DEFINES -DSDL_BACKEND"
-		;;
-	iphone)
-		OBJCFLAGS="$OBJCFLAGS --std=c99"
-		LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES -framework QuartzCore -framework GraphicsServices -framework CoreFoundation -framework Foundation -framework AudioToolbox -framework CoreAudio"
-		;;
-	linuxmoto)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		DEFINES="$DEFINES -DSDL_BACKEND -DLINUXMOTO"
-		;;
-	n64)
-		INCLUDES="$INCLUDES "'-I$(N64SDK)/include'
-		INCLUDES="$INCLUDES "'-I$(N64SDK)/mips64/include'
-		INCLUDES="$INCLUDES "'-I$(N64SDK)/hkz-libn64'
-		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/n64'
-		LIBS="$LIBS -lpakfs -lframfs -ln64 -ln64utils -lromfs -lm -lstdc++ -lc -lgcc -lz -lnosys"
-		;;
-	null)
-		DEFINES="$DEFINES -DUSE_NULL_DRIVER"
-		;;
-	openpandora)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		LDFLAGS="$LDFLAGS"
-		DEFINES="$DEFINES -DSDL_BACKEND"
-		;;
-	ps2)
-		# TODO ps2
-		DEFINES="$DEFINES -D_EE -DFORCE_RTL"
-		INCLUDES="$INCLUDES -I$PS2SDK/ee/include -I$PS2SDK/common/include -I$PS2SDK/ports/include"
-		if test "$_dynamic_modules" = no ; then
-			LDFLAGS="$LDFLAGS -mno-crt0 $PS2SDK/ee/startup/crt0.o -T $PS2SDK/ee/startup/linkfile"
-		fi
-		LDFLAGS="$LDFLAGS -L$PS2SDK/ee/lib -L$PS2SDK/ports/lib"
-		LIBS="$LIBS -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lm -lc -lfileXio -lkernel -lstdc++ "
-		;;
-	psp)
-		DEFINES="$DEFINES -D__PSP__ -DDISABLE_COMMAND_LINE -DDISABLE_DOSBOX_OPL"
-		LIBS="$LIBS -lpng -Wl,-Map,mapfile.txt"
-		;;
-	samsungtv)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		DEFINES="$DEFINES -DSDL_BACKEND -DSAMSUNGTV"
-		LDFLAGS="$LDFLAGS -shared -fpic"
-		MODULES="$MODULES backends/platform/sdl"
-		;;
-	sdl)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		DEFINES="$DEFINES -DSDL_BACKEND"
-		;;
-	webos)
-		# There is no sdl-config in the WebOS PDK so we don't use find_sdlconfig here.
-		LIBS="$LIBS -lSDL"
-		DEFINES="$DEFINES -DSDL_BACKEND -DWEBOS"
-		MODULES="$MODULES backends/platform/sdl"
-		;;
-	wii)
-		DEFINES="$DEFINES -D__WII__ -DGEKKO"
-		case $_host_os in
-		gamecube)
-			LIBS="$LIBS -lgxflux -liso9660 -lfat -logc -ldb"
-			;;
-		*)
-			LIBS="$LIBS -lgxflux -ldi -liso9660 -ltinysmb -lfat -lwiiuse -lbte -logc -lwiikeyboard -ldb"
-			;;
-		esac
-		;;
-	wince)
-		INCLUDES="$INCLUDES "'-I$(srcdir) -I$(srcdir)/backends/platform/wince -I$(srcdir)/engines -I$(srcdir)/backends/platform/wince/missing/gcc -I$(srcdir)/backends/platform/wince/CEgui -I$(srcdir)/backends/platform/wince/CEkeys'
-		LIBS="$LIBS -static -lSDL"
-		DEFINES="$DEFINES -DSDL_BACKEND"
-		;;
-	*)
-		echo "support for $_backend backend not implemented in configure script yet"
-		exit 1
-		;;
-esac
-MODULES="$MODULES backends/platform/$_backend"
-
-#
-# Do CXXFLAGS now that we know the compiler version
-#
-if test "$have_gcc" = yes ; then
-	if test "$_cxx_major" -ge "3" ; then
-		case $_host_os in
-		# newlib-based system include files suppress non-C89 function
-		# declarations under __STRICT_ANSI__
-		amigaos* | android | dreamcast | ds | gamecube | mingw* | n64 | psp | ps2 | wii | wince )
-			CXXFLAGS="$CXXFLAGS -W -Wno-unused-parameter"
-			;;
-		*)
-			CXXFLAGS="$CXXFLAGS -ansi -W -Wno-unused-parameter"
-			;;
-		esac
-		add_line_to_config_mk 'HAVE_GCC3 = 1'
-		add_line_to_config_mk 'CXX_UPDATE_DEP_FLAG = -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" -MQ "$@" -MP'
-	fi;
-
-	if test "$_cxx_major" -eq 4 && test "$_cxx_minor" -ge 3 || \
-	   test "$_cxx_major" -gt 4 ; then
-		CXXFLAGS="$CXXFLAGS -Wno-empty-body"
-	else
-		CXXFLAGS="$CXXFLAGS -Wconversion"
-	fi;
-elif test "$have_icc" = yes ; then
-	add_line_to_config_mk 'CXX_UPDATE_DEP_FLAG = -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" -MQ "$@" -MP'
-fi;
-
-# Some platforms use certain GNU extensions in header files
-case $_host_os in
-android | gamecube | psp | wii)
-	;;
-*)
-	# ICC does not support pedantic
-	if test "$have_icc" = no ; then
-		CXXFLAGS="$CXXFLAGS -pedantic"
-	fi
-	;;
-esac
-
-#
 # Engine selection
 #
 _engines_built_static=""


Commit: 7585303c06fbac525b8e24404c79b673fa1be9c5
    https://github.com/scummvm/scummvm/commit/7585303c06fbac525b8e24404c79b673fa1be9c5
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:21:01-07:00

Commit Message:
BUILD: Do not manually set endianess

If for some reason the endianess is not detected right, then this should
be reported as a bug; and any (hopefully temporary) specification of
the endianess should be accompanied by an explanatory comment.

Changed paths:
    configure



diff --git a/configure b/configure
index e839038..5519a0a 100755
--- a/configure
+++ b/configure
@@ -1851,7 +1851,6 @@ if test -n "$_host"; then
 			_port_mk="backends/platform/ds/ds.mk"
 			;;
 		gamecube)
-			_endian=big
 			_need_memalign=yes
 			_backend="wii"
 			_build_scalers=no
@@ -1918,7 +1917,6 @@ if test -n "$_host"; then
 		m68k-atari-mint)
 			DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 			_unix=yes
-			_endian=big
 			_need_memalign=yes
 			_ranlib=m68k-atari-mint-ranlib
 			_ar="m68k-atari-mint-ar cru"
@@ -1933,7 +1931,6 @@ if test -n "$_host"; then
 		mips-sgi*)
 			LDFLAGS="$LDFLAGS -static-libgcc"
 			LIBS="$LIBS -laudio"
-			_endian=big
 			_need_memalign=yes
 			;;
 		motoezx)
@@ -2014,7 +2011,6 @@ if test -n "$_host"; then
 			_port_mk="backends/platform/openpandora/op-bundle.mk"
 			;;
 		ppc-amigaos)
-			_endian=big
 			# AmigaOS exec allocates memory always in an aligned way
 			_need_memalign=yes
 			;;
@@ -2080,7 +2076,6 @@ if test -n "$_host"; then
 			_keymapper=yes
 			;;
 		wii)
-			_endian=big
 			_need_memalign=yes
 			_backend="wii"
 			_build_scalers=no


Commit: ecb8618cb723bed6eb054f25c4ee1d2822adabb5
    https://github.com/scummvm/scummvm/commit/ecb8618cb723bed6eb054f25c4ee1d2822adabb5
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:21:01-07:00

Commit Message:
BUILD: Unify build & configure rules for SDL based backends

Changed paths:
    backends/platform/dingux/module.mk
    backends/platform/gp2x/module.mk
    backends/platform/gph/module.mk
    backends/platform/linuxmoto/module.mk
    backends/platform/openpandora/module.mk
    backends/platform/samsungtv/module.mk
    configure



diff --git a/backends/platform/dingux/module.mk b/backends/platform/dingux/module.mk
index 2247625..b924fec 100644
--- a/backends/platform/dingux/module.mk
+++ b/backends/platform/dingux/module.mk
@@ -4,8 +4,10 @@ MODULE_OBJS := \
 	main.o \
 	dingux.o 
 
-MODULE_DIRS += \
-	backends/platform/dingux/
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
 
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# Hack to ensure the SDL backend is built so we can use OSystem_SDL.
+-include $(srcdir)/backends/platform/sdl/module.mk
diff --git a/backends/platform/gp2x/module.mk b/backends/platform/gp2x/module.mk
index 837ad99..4846f16 100644
--- a/backends/platform/gp2x/module.mk
+++ b/backends/platform/gp2x/module.mk
@@ -10,3 +10,6 @@ MODULE_OBJS := \
 MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
 OBJS := $(MODULE_OBJS) $(OBJS)
 MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
+
+# Hack to ensure the SDL backend is built so we can use OSystem_SDL.
+-include $(srcdir)/backends/platform/sdl/module.mk
diff --git a/backends/platform/gph/module.mk b/backends/platform/gph/module.mk
index a995149..d8a1a6c 100644
--- a/backends/platform/gph/module.mk
+++ b/backends/platform/gph/module.mk
@@ -11,4 +11,4 @@ OBJS := $(MODULE_OBJS) $(OBJS)
 MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
 
 # Hack to ensure the SDL backend is built so we can use OSystem_SDL.
--include $(srcdir)/backends/platform/sdl/module.mk
\ No newline at end of file
+-include $(srcdir)/backends/platform/sdl/module.mk
diff --git a/backends/platform/linuxmoto/module.mk b/backends/platform/linuxmoto/module.mk
index c604d69..4c81aac 100644
--- a/backends/platform/linuxmoto/module.mk
+++ b/backends/platform/linuxmoto/module.mk
@@ -10,5 +10,5 @@ MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
 OBJS := $(MODULE_OBJS) $(OBJS)
 MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
 
-# HACK: The linuxmoto backend is based on the SDL one, so we load that, too.
-include $(srcdir)/backends/platform/sdl/module.mk
+# Hack to ensure the SDL backend is built so we can use OSystem_SDL.
+-include $(srcdir)/backends/platform/sdl/module.mk
diff --git a/backends/platform/openpandora/module.mk b/backends/platform/openpandora/module.mk
index 8e60b87..5bd568e 100755
--- a/backends/platform/openpandora/module.mk
+++ b/backends/platform/openpandora/module.mk
@@ -5,11 +5,10 @@ MODULE_OBJS := \
 	op-backend.o \
 	op-main.o
 
-MODULE_DIRS += \
-	backends/platform/openpandora/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
 
 # Hack to ensure the SDL backend is built so we can use OSystem_SDL.
 -include $(srcdir)/backends/platform/sdl/module.mk
diff --git a/backends/platform/samsungtv/module.mk b/backends/platform/samsungtv/module.mk
index 36ad75d..cba09db 100644
--- a/backends/platform/samsungtv/module.mk
+++ b/backends/platform/samsungtv/module.mk
@@ -8,3 +8,6 @@ MODULE_OBJS := \
 MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
 OBJS := $(MODULE_OBJS) $(OBJS)
 MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
+
+# Hack to ensure the SDL backend is built so we can use OSystem_SDL.
+-include $(srcdir)/backends/platform/sdl/module.mk
diff --git a/configure b/configure
index 5519a0a..367289e 100755
--- a/configure
+++ b/configure
@@ -2192,12 +2192,7 @@ case $_backend in
 		LIBS="$LIBS -lronin -lm"
 		;;
 	dingux)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		DEFINES="$DEFINES -DSDL_BACKEND -DDINGUX"
-		LDFLAGS="$LDFLAGS "
-		MODULES="$MODULES backends/platform/sdl"
+		DEFINES="$DEFINES -DDINGUX"
 		;;
 	ds)
 		# TODO ds
@@ -2206,28 +2201,15 @@ case $_backend in
 		INCLUDES="$INCLUDES "'-Ibackends/platform/ds/arm9/data'
 		;;
 	gp2x)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		LDFLAGS="$LDFLAGS"
-		DEFINES="$DEFINES -DSDL_BACKEND"
 		;;
 	gph)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		LDFLAGS="$LDFLAGS"
-		DEFINES="$DEFINES -DSDL_BACKEND"
 		;;
 	iphone)
 		OBJCFLAGS="$OBJCFLAGS --std=c99"
 		LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES -framework QuartzCore -framework GraphicsServices -framework CoreFoundation -framework Foundation -framework AudioToolbox -framework CoreAudio"
 		;;
 	linuxmoto)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		DEFINES="$DEFINES -DSDL_BACKEND -DLINUXMOTO"
+		DEFINES="$DEFINES -DLINUXMOTO"
 		;;
 	n64)
 		INCLUDES="$INCLUDES "'-I$(N64SDK)/include'
@@ -2240,11 +2222,6 @@ case $_backend in
 		DEFINES="$DEFINES -DUSE_NULL_DRIVER"
 		;;
 	openpandora)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		LDFLAGS="$LDFLAGS"
-		DEFINES="$DEFINES -DSDL_BACKEND"
 		;;
 	ps2)
 		# TODO ps2
@@ -2261,18 +2238,8 @@ case $_backend in
 		LIBS="$LIBS -lpng -Wl,-Map,mapfile.txt"
 		;;
 	samsungtv)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		DEFINES="$DEFINES -DSDL_BACKEND -DSAMSUNGTV"
+		DEFINES="$DEFINES -DSAMSUNGTV"
 		LDFLAGS="$LDFLAGS -shared -fpic"
-		MODULES="$MODULES backends/platform/sdl"
-		;;
-	sdl)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		DEFINES="$DEFINES -DSDL_BACKEND"
 		;;
 	webos)
 		# There is no sdl-config in the WebOS PDK so we don't use find_sdlconfig here.
@@ -2296,6 +2263,8 @@ case $_backend in
 		LIBS="$LIBS -static -lSDL"
 		DEFINES="$DEFINES -DSDL_BACKEND"
 		;;
+	sdl)
+		;;
 	*)
 		echo "support for $_backend backend not implemented in configure script yet"
 		exit 1
@@ -2304,6 +2273,19 @@ esac
 MODULES="$MODULES backends/platform/$_backend"
 
 #
+# Setup SDL specifics for SDL based backends
+#
+case $_backend in
+	dingux | gp2x | gph | linuxmoto | openpandora | samsungtv | sdl)
+		find_sdlconfig
+		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
+		DEFINES="$DEFINES -DSDL_BACKEND"
+		;;
+esac
+
+
+#
 # Enable 16bit support only for backends which support it
 #
 case $_backend in


Commit: e013a516041b56e2c0f94b7c967de5cad615d12d
    https://github.com/scummvm/scummvm/commit/e013a516041b56e2c0f94b7c967de5cad615d12d
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:21:02-07:00

Commit Message:
BUILD: Enable ARM asm only based on _host_cpu

Also moved x86 and ARM recognition code in configure to be
next to each other; and print whether ARM specific code is
going to be used or not.

Changed paths:
    configure



diff --git a/configure b/configure
index 367289e..1528015 100755
--- a/configure
+++ b/configure
@@ -145,7 +145,6 @@ _text_console=no
 _mt32emu=yes
 _build_scalers=yes
 _build_hq_scalers=yes
-_arm_asm=no
 _indeo3=auto
 _enable_prof=no
 _unix=no
@@ -161,6 +160,7 @@ _backend=sdl
 _endian=unknown
 _need_memalign=no
 _have_x86=no
+_arm_asm=no
 _verbose_build=no
 _dynamic_modules=no
 _plugins_default=static
@@ -1543,20 +1543,6 @@ echo "$type_4_byte"
 test $TMPR -eq 0 || exit 1	# check exit code of subshell
 
 #
-# Check whether we can use x86 asm routines
-#
-echo_n "Compiling for x86... "
-case $_host_cpu in
-	i386|i486|i586|i686)
-		_have_x86=yes
-		;;
-	*)
-		_have_x86=no
-		;;
-esac
-echo "$_have_x86"
-
-#
 # Determine build settings
 #
 echo_n "Checking hosttype... "
@@ -1762,7 +1748,6 @@ if test -n "$_host"; then
 			HOSTEXEEXT=.so
 			_backend="android"
 			_port_mk="backends/platform/android/android.mk"
-			_arm_asm=yes
 			_build_scalers=no
 			_seq_midi=no
 			_mt32emu=no
@@ -1771,7 +1756,6 @@ if test -n "$_host"; then
 		arm-linux|arm*-linux-gnueabi|arm-*-linux)
 			_unix=yes
 			_need_memalign=yes
-			_arm_asm=yes
 			;;
 		arm-riscos|linupy)
 			DEFINES="$DEFINES -DLINUPY"
@@ -1795,7 +1779,6 @@ if test -n "$_host"; then
 			ASFLAGS="$ASFLAGS"
 			_unix=yes
 			_need_memalign=yes
-			_arm_asm=yes
 			_backend="gph"
 			_build_hq_scalers=no
 			_vkeybd=yes
@@ -1843,7 +1826,6 @@ if test -n "$_host"; then
 			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL -DDISABLE_SID -DDISABLE_NES_APU"
 			DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
 			_need_memalign=yes
-			_arm_asm=yes
 			add_line_to_config_h '#define DISABLE_TEXT_CONSOLE'
 			_backend="ds"
 			_build_scalers=no
@@ -1876,7 +1858,6 @@ if test -n "$_host"; then
 			LDFLAGS="$LDFLAGS -static"
 			_unix=yes
 			_need_memalign=yes
-			_arm_asm=yes
 			_backend="gph"
 			_build_hq_scalers=no
 			_vkeybd=yes
@@ -1896,7 +1877,6 @@ if test -n "$_host"; then
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
 			_unix=yes
 			_need_memalign=yes
-			_arm_asm=yes
 			_backend="gph"
 			_build_hq_scalers=no
 			_vkeybd=yes
@@ -1909,7 +1889,6 @@ if test -n "$_host"; then
 			DEFINES="$DEFINES -DIPHONE"
 			_unix=yes
 			_need_memalign=yes
-			_arm_asm=yes
 			_backend="iphone"
 			_build_hq_scalers=no
 			_seq_midi=no
@@ -1938,7 +1917,6 @@ if test -n "$_host"; then
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
 			_unix=yes
 			_need_memalign=yes
-			_arm_asm=yes
 			_backend="linuxmoto"
 			_build_hq_scalers=no
 			_mt32emu=no
@@ -1951,7 +1929,6 @@ if test -n "$_host"; then
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
 			_unix=yes
 			_need_memalign=yes
-			_arm_asm=yes
 			_backend="linuxmoto"
 			_build_hq_scalers=no
 			_mt32emu=no
@@ -2002,7 +1979,6 @@ if test -n "$_host"; then
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
 			_unix=yes
 			_need_memalign=yes
-			_arm_asm=yes
 			_backend="openpandora"
 			_build_hq_scalers=yes
 			_vkeybd=no
@@ -2057,7 +2033,6 @@ if test -n "$_host"; then
 			HOSTEXEEXT=".so"
 			_unix=yes
 			_need_memalign=yes
-			_arm_asm=yes
 			_backend="samsungtv"
 			_mt32emu=no
 			_vkeybd=yes
@@ -2065,7 +2040,6 @@ if test -n "$_host"; then
 		webos)
 			_unix=yes
 			_need_memalign=yes
-			_arm_asm=yes
 			_backend="webos"
 			_port_mk="backends/platform/webos/webos.mk"
 			_build_scalers=no
@@ -2092,7 +2066,6 @@ if test -n "$_host"; then
 		wince)
 			LDFLAGS="$LDFLAGS -Wl,--stack,65536"
 			_need_memalign=yes
-			_arm_asm=yes
 			_tremolo=yes
 			_backend="wince"
 			_mt32emu=no
@@ -2319,7 +2292,6 @@ case $_endian in
 		;;
 esac
 
-define_in_config_h_if_yes $_have_x86 'HAVE_X86'
 
 define_in_config_h_if_yes $_need_memalign 'SCUMM_NEED_ALIGNMENT'
 
@@ -2592,15 +2564,6 @@ define_in_config_if_yes "$_build_scalers" 'USE_SCALERS'
 define_in_config_if_yes "$_build_hq_scalers" 'USE_HQ_SCALERS'
 
 #
-# Check whether to use optimized ARM asm
-#
-define_in_config_if_yes "$_arm_asm" 'USE_ARM_SCALER_ASM'
-define_in_config_if_yes "$_arm_asm" 'USE_ARM_SOUND_ASM'
-define_in_config_if_yes "$_arm_asm" 'USE_ARM_SMUSH_ASM'
-define_in_config_if_yes "$_arm_asm" 'USE_ARM_GFX_ASM'
-define_in_config_if_yes "$_arm_asm" 'USE_ARM_COSTUME_ASM'
-
-#
 # Check whether to compile the Indeo3 decoder
 #
 if test "$_indeo3" = auto ; then
@@ -3037,6 +3000,41 @@ fi
 define_in_config_if_yes "$_opengl" "USE_OPENGL"
 define_in_config_if_yes "$_opengles" "USE_GLES"
 
+
+#
+# Check whether we can use x86 asm routines
+#
+echo_n "Compiling for x86... "
+case $_host_cpu in
+	i386|i486|i586|i686)
+		_have_x86=yes
+		;;
+	*)
+		_have_x86=no
+		;;
+esac
+echo "$_have_x86"
+define_in_config_h_if_yes $_have_x86 'HAVE_X86'
+
+#
+# Check whether to use optimized ARM asm
+#
+echo_n "Compiling for ARM... "
+case $_host_cpu in
+	arm*)
+		_arm_asm=yes
+		;;
+	*)
+		_arm_asm=no
+		;;
+esac
+echo "$_arm_asm"
+define_in_config_if_yes "$_arm_asm" 'USE_ARM_SCALER_ASM'
+define_in_config_if_yes "$_arm_asm" 'USE_ARM_SOUND_ASM'
+define_in_config_if_yes "$_arm_asm" 'USE_ARM_SMUSH_ASM'
+define_in_config_if_yes "$_arm_asm" 'USE_ARM_GFX_ASM'
+define_in_config_if_yes "$_arm_asm" 'USE_ARM_COSTUME_ASM'
+
 #
 # Check for nasm
 #


Commit: 63a69b4f1e3356c1bfbfbfdc77dbb58e26b85d7e
    https://github.com/scummvm/scummvm/commit/63a69b4f1e3356c1bfbfbfdc77dbb58e26b85d7e
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:21:52-07:00

Commit Message:
BUILD: Overhaul how we determine the need for aligned mem access

Also add some comments explaining what is going on and why.

Changed paths:
    configure



diff --git a/configure b/configure
index 1528015..4bbc829 100755
--- a/configure
+++ b/configure
@@ -158,7 +158,7 @@ _translation=yes
 # Default platform settings
 _backend=sdl
 _endian=unknown
-_need_memalign=no
+_need_memalign=yes
 _have_x86=no
 _arm_asm=no
 _verbose_build=no
@@ -1741,7 +1741,6 @@ if test -n "$_host"; then
 	case "$_host" in
 		android | android-v7a)
 			_unix=yes
-			_need_memalign=yes
 			# we link a .so as default
 			LDFLAGS="$LDFLAGS -shared -Wl,-Bsymbolic,--no-undefined"
 			HOSTEXEPRE=lib
@@ -1755,15 +1754,12 @@ if test -n "$_host"; then
 			;;
 		arm-linux|arm*-linux-gnueabi|arm-*-linux)
 			_unix=yes
-			_need_memalign=yes
 			;;
 		arm-riscos|linupy)
 			DEFINES="$DEFINES -DLINUPY"
 			_unix=yes
-			_need_memalign=yes
 			;;
 		bfin*)
-			_need_memalign=yes
 			;;
 		caanoo)
 			# This uses the GPH backend.
@@ -1778,7 +1774,6 @@ if test -n "$_host"; then
 			CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
 			ASFLAGS="$ASFLAGS"
 			_unix=yes
-			_need_memalign=yes
 			_backend="gph"
 			_build_hq_scalers=no
 			_vkeybd=yes
@@ -1795,7 +1790,6 @@ if test -n "$_host"; then
 			DEFINES="$DEFINES -DUNIX -DDINGUX -DDISABLE_DOSBOX_OPL -DREDUCE_MEMORY_USAGE"
 			ASFLAGS="$ASFLAGS"
 			CXXFLAGS="$CXXFLAGS -msoft-float -mips32"
-			_need_memalign=yes
 			_backend="dingux"
 			_mt32emu=no
 			_vkeybd=yes
@@ -1810,7 +1804,6 @@ if test -n "$_host"; then
 		dreamcast)
 			DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE"
 			CXXFLAGS="$CXXFLAGS -O3 -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks"
-			_need_memalign=yes
 			_backend="dc"
 			_build_scalers=no
 			_mad=yes
@@ -1825,7 +1818,6 @@ if test -n "$_host"; then
 			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE -DSTREAM_AUDIO_FROM_DISK"
 			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL -DDISABLE_SID -DDISABLE_NES_APU"
 			DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
-			_need_memalign=yes
 			add_line_to_config_h '#define DISABLE_TEXT_CONSOLE'
 			_backend="ds"
 			_build_scalers=no
@@ -1833,7 +1825,6 @@ if test -n "$_host"; then
 			_port_mk="backends/platform/ds/ds.mk"
 			;;
 		gamecube)
-			_need_memalign=yes
 			_backend="wii"
 			_build_scalers=no
 			_mt32emu=no
@@ -1857,7 +1848,6 @@ if test -n "$_host"; then
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
 			LDFLAGS="$LDFLAGS -static"
 			_unix=yes
-			_need_memalign=yes
 			_backend="gph"
 			_build_hq_scalers=no
 			_vkeybd=yes
@@ -1876,7 +1866,6 @@ if test -n "$_host"; then
 			CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
 			_unix=yes
-			_need_memalign=yes
 			_backend="gph"
 			_build_hq_scalers=no
 			_vkeybd=yes
@@ -1888,7 +1877,6 @@ if test -n "$_host"; then
 		iphone)
 			DEFINES="$DEFINES -DIPHONE"
 			_unix=yes
-			_need_memalign=yes
 			_backend="iphone"
 			_build_hq_scalers=no
 			_seq_midi=no
@@ -1896,7 +1884,6 @@ if test -n "$_host"; then
 		m68k-atari-mint)
 			DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 			_unix=yes
-			_need_memalign=yes
 			_ranlib=m68k-atari-mint-ranlib
 			_ar="m68k-atari-mint-ar cru"
 			_seq_midi=no
@@ -1910,13 +1897,11 @@ if test -n "$_host"; then
 		mips-sgi*)
 			LDFLAGS="$LDFLAGS -static-libgcc"
 			LIBS="$LIBS -laudio"
-			_need_memalign=yes
 			;;
 		motoezx)
 			DEFINES="$DEFINES -DMOTOEZX"
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
 			_unix=yes
-			_need_memalign=yes
 			_backend="linuxmoto"
 			_build_hq_scalers=no
 			_mt32emu=no
@@ -1928,7 +1913,6 @@ if test -n "$_host"; then
 			DEFINES="$DEFINES -DMOTOMAGX"
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
 			_unix=yes
-			_need_memalign=yes
 			_backend="linuxmoto"
 			_build_hq_scalers=no
 			_mt32emu=no
@@ -1943,7 +1927,6 @@ if test -n "$_host"; then
 			LDFLAGS="$LDFLAGS -L$N64SDK/hkz-libn64 -L$N64SDK/lib"
 			LDFLAGS="$LDFLAGS -T n64ld_cpp.x -Xlinker -Map -Xlinker scummvm.map"
 			_backend="n64"
-			_need_memalign=yes
 			_mt32emu=no
 			_build_scalers=no
 			_indeo3=no
@@ -1962,7 +1945,6 @@ if test -n "$_host"; then
 		neuros)
 			DEFINES="$DEFINES -DNEUROS"
 			_unix=yes
-			_need_memalign=yes
 			_backend='null'
 			_build_hq_scalers=no
 			_mt32emu=no
@@ -1978,7 +1960,6 @@ if test -n "$_host"; then
 			CXXFLAGS="$CXXFLAGS -march=armv7-a -mtune=cortex-a8 -mfpu=neon"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
 			_unix=yes
-			_need_memalign=yes
 			_backend="openpandora"
 			_build_hq_scalers=yes
 			_vkeybd=no
@@ -1987,14 +1968,11 @@ if test -n "$_host"; then
 			_port_mk="backends/platform/openpandora/op-bundle.mk"
 			;;
 		ppc-amigaos)
-			# AmigaOS exec allocates memory always in an aligned way
-			_need_memalign=yes
 			;;
 		ps2)
 			# TODO: complete this
 			DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DDISABLE_DOSBOX_OPL"
 			DEFINES="$DEFINES -DDISABLE_SID -DDISABLE_NES_APU"
-			_need_memalign=yes
 			_backend="ps2"
 			_build_scalers=no
 			_mt32emu=no
@@ -2021,7 +1999,6 @@ if test -n "$_host"; then
 			fi
 			;;
 		psp)
-			_need_memalign=yes
 			_backend="psp"
 			_build_scalers=no
 			_mt32emu=no
@@ -2032,14 +2009,12 @@ if test -n "$_host"; then
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
 			HOSTEXEEXT=".so"
 			_unix=yes
-			_need_memalign=yes
 			_backend="samsungtv"
 			_mt32emu=no
 			_vkeybd=yes
 			;;
 		webos)
 			_unix=yes
-			_need_memalign=yes
 			_backend="webos"
 			_port_mk="backends/platform/webos/webos.mk"
 			_build_scalers=no
@@ -2050,7 +2025,6 @@ if test -n "$_host"; then
 			_keymapper=yes
 			;;
 		wii)
-			_need_memalign=yes
 			_backend="wii"
 			_build_scalers=no
 			_port_mk="backends/platform/wii/wii.mk"
@@ -2065,7 +2039,6 @@ if test -n "$_host"; then
 			;;
 		wince)
 			LDFLAGS="$LDFLAGS -Wl,--stack,65536"
-			_need_memalign=yes
 			_tremolo=yes
 			_backend="wince"
 			_mt32emu=no
@@ -2075,33 +2048,42 @@ if test -n "$_host"; then
 			echo "WARNING: Unknown target, continuing with auto-detected values"
 			;;
 	esac
+fi
 
-else
-	#
-	# Check whether memory alignment is required
-	#
-	echo_n "Alignment required... "
-	case $_host_cpu in
-		alpha*)
-			# Hardcode alignment requirements for Alpha processsors
-			_need_memalign=yes
-			;;
-		arm*)
-			_need_memalign=yes
-			;;
-		mips*)
-			# Hardcode alignment requirements for MIPS processsors.
-			# While these can emulate unaligned memory access, this
-			# emulation is rather slow.
-			_need_memalign=yes
-			;;
-		sh*)
-			# Hardcode alignment requirements for SH processsors.
-			# While these can emulate unaligned memory access, this
-			# emulation is rather slow.
-			_need_memalign=yes
-			;;
-		*)
+#
+# Check whether memory alignment is required
+#
+# For some CPU types, unaligned memory access is either not supported at
+# all (and so leads to a crash), requires a super-slow emulation via an
+# exception handler, or just results in incorrect results.
+# On the other hand, accessing data in a manner that works regardless of
+# alignment can be a lot slower than regular access, so we don't want
+# to use it if we don't have to.
+#
+# So we do the following: First, for CPU families where we know whether
+# unaligned access is safe & fast, we enable / disable unaligned access
+# accordingly.
+# Otherwise, for cross compiled builds we just disable memory alignment.
+# For native builds, we run some test code that detects whether unaligned
+# access is supported (and is supported without an exception handler).
+#
+# NOTE: The only kinds of unaligned access we allow are for 2 byte and
+# 4 byte loads / stores. No promises are made for bigger sizes, such as
+# 8 or 16 byte loads, for which various architectures (e.g. x86 and PowerPC)
+# behave differently than for the smaller sizes).
+echo_n "Alignment required... "
+case $_host_cpu in
+	alpha* | arm* | bfin* | hp* | mips* | sh* | sparc* | ia64 | nv1*)
+		# Unaligned access is not supported or extremely slow.
+		_need_memalign=yes
+		;;
+	i[3-6]86 | x86_64 | ppc*)
+		# Unaligned access should work reasonably well
+		_need_memalign=no
+		;;
+	*)
+		if test -z "$_host"; then
+			# NOT in cross-compiling mode:
 			# Try to auto-detect....
 			cat > $TMPC << EOF
 #include <stdlib.h>
@@ -2117,13 +2099,14 @@ int main(int argc, char **argv) {
 	return 0;
 }
 EOF
-			_need_memalign=yes
 			cc_check_no_clean && $TMPO$HOSTEXEEXT && _need_memalign=no
 			cc_check_clean
-			;;
-	esac
-	echo "$_need_memalign"
-fi
+		fi
+		;;
+esac
+echo "$_need_memalign"
+
+define_in_config_h_if_yes $_need_memalign 'SCUMM_NEED_ALIGNMENT'
 
 #
 # Backend related stuff
@@ -2292,9 +2275,6 @@ case $_endian in
 		;;
 esac
 
-
-define_in_config_h_if_yes $_need_memalign 'SCUMM_NEED_ALIGNMENT'
-
 if test "$_unix" = yes ; then
 	DEFINES="$DEFINES -DUNIX"
 	add_line_to_config_mk 'UNIX = 1'


Commit: 9b14c50b774afe0d257534e261f412455d8ed93e
    https://github.com/scummvm/scummvm/commit/9b14c50b774afe0d257534e261f412455d8ed93e
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:21:53-07:00

Commit Message:
BUILD: Unify how debug/release mode defaults are determined

Changed paths:
    configure



diff --git a/configure b/configure
index 4bbc829..833ee14 100755
--- a/configure
+++ b/configure
@@ -990,15 +990,6 @@ caanoo)
 	_host_os=gph-linux
 	_host_cpu=arm
 	_host_alias=arm-none-linux-gnueabi
-	if test "$_debug_build" = auto; then
-		# If you want to debug on the Caanoo use '--disable-release --enable-debug'
-		_debug_build=no
-	fi
-
-	if test "$_release_build" = auto; then
-		# Enable release build by default.
-		_release_build=yes
-	fi
 	;;
 dingux)
 	_host_os=linux
@@ -1026,29 +1017,11 @@ gp2x)
 	_host_os=gph-linux
 	_host_cpu=arm
 	_host_alias=arm-open2x-linux
-	if test "$_debug_build" = auto; then
-		# If you want to debug on the GP2X use '--disable-release --enable-debug'
-		_debug_build=no
-	fi
-
-	if test "$_release_build" = auto; then
-		# Enable release build by default.
-		_release_build=yes
-	fi
 	;;
 gp2xwiz)
 	_host_os=gph-linux
 	_host_cpu=arm
 	_host_alias=arm-open2x-linux
-	if test "$_debug_build" = auto; then
-		# If you want to debug on the GP2XWiz use '--disable-release --enable-debug'
-		_debug_build=no
-	fi
-
-	if test "$_release_build" = auto; then
-		# Enable release build by default.
-		_release_build=yes
-	fi
 	;;
 i586-mingw32msvc)
 	_host_os=mingw32msvc
@@ -1086,15 +1059,6 @@ openpandora)
 	_host_os=linux
 	_host_cpu=arm
 	_host_alias=arm-angstrom-linux-gnueabi
-	if test "$_debug_build" = auto; then
-		# If you want to debug on the OP use '--disable-release --enable-debug'
-		_debug_build=no
-	fi
-
-	if test "$_release_build" = auto; then
-		# Enable release build by default.
-		_release_build=yes
-	fi
 	;;
 ppc-amigaos)
 	_host_os=amigaos
@@ -1104,16 +1068,6 @@ ps2)
 	_host_os=ps2
 	_host_cpu=mips64r5900el
 	_host_alias=ee
-	if test "$_debug_build" = auto; then
-		# Disable debug mode by default. The resulting binaries are far too big in general,
-		# and one has to disable multiple engines to make it usable.
-		_debug_build=no
-	fi
-
-	if test "$_release_build" = auto; then
-		# Enable release build by default.
-		_release_build=yes
-	fi
 	;;
 psp)
 	_host_os=psp
@@ -1182,6 +1136,20 @@ fi
 # Determine extra build flags for debug and/or release builds
 #
 
+case $_host in
+caanoo | gp2x | gp2xwiz | openpandora | ps2)
+	if test "$_debug_build" = auto; then
+		# If you want to debug one of these platforms, use '--disable-release --enable-debug'
+		_debug_build=no
+	fi
+
+	if test "$_release_build" = auto; then
+		# Enable release build by default.
+		_release_build=yes
+	fi
+	;;
+esac
+
 if test "$_debug_build" != no; then
 	# debug mode not explicitly disabled -> compile with -g
 	CXXFLAGS="$CXXFLAGS -g"


Commit: d935c53cdf00a54d95714139046abc35bf5c2c6a
    https://github.com/scummvm/scummvm/commit/d935c53cdf00a54d95714139046abc35bf5c2c6a
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:21:53-07:00

Commit Message:
BUILD: Rearrange some PSP stuff

Cursory testing shows no regressions caused by this, but proper
testing of this change is recommended.

Changed paths:
    configure



diff --git a/configure b/configure
index 833ee14..2bf6f99 100755
--- a/configure
+++ b/configure
@@ -1073,13 +1073,6 @@ psp)
 	_host_os=psp
 	_host_cpu=mipsallegrexel
 	_host_alias=psp
-	if test -z "$PSPDEV"; then
-		PSPDEV=`psp-config --pspdev-path`
-	fi
-	if test -d "$PSPDEV/psp/lib"; then
-		LDFLAGS="$LDFLAGS -L$PSPDEV/psp/lib"
-	fi
-	LDFLAGS="$LDFLAGS -L$PSPDEV/psp/sdk/lib -specs=$_srcdir/backends/platform/psp/psp.spec"
 	;;
 samsungtv)
 	_host_os=linux
@@ -1216,9 +1209,15 @@ ps2)
 	fi
 	;;
 psp)
-	PSPSDK=`psp-config --pspsdk-path`
+	if test -z "$PSPDEV"; then
+		PSPDEV=`psp-config --pspdev-path`
+	fi
+	# TODO: Should we also insist on a valid PSPDEV value?
 	if test -z "$PSPSDK"; then
-		echo "Please set the path to PSPSDK in your environment."
+		PSPSDK=`psp-config --pspsdk-path`
+	fi
+	if test -z "$PSPSDK"; then
+		echo "Please set PSPSDK in your environment. export PSPSDK=<path to psp sdk>"
 		exit 1
 	fi
 	;;
@@ -1660,6 +1659,10 @@ case $_host_os in
 		DEFINES="$DEFINES -D_EE -D__PLAYSTATION2__"
 		;;
 	psp)
+		if test -d "$PSPDEV/psp/lib"; then
+			LDFLAGS="$LDFLAGS -L$PSPDEV/psp/lib"
+		fi
+		LDFLAGS="$LDFLAGS -L$PSPSDK/lib -specs=$_srcdir/backends/platform/psp/psp.spec"
 		CXXFLAGS="$CXXFLAGS -O3 -I$PSPSDK/include -D_PSP_FW_VERSION=150"
 		;;
 	solaris*)


Commit: 6639eacb3ae7189bd18e4267d0115caa0a05edb4
    https://github.com/scummvm/scummvm/commit/6639eacb3ae7189bd18e4267d0115caa0a05edb4
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:21:53-07:00

Commit Message:
BUILD: Move some Android 'hack' back to near end of configure

Changed paths:
    configure



diff --git a/configure b/configure
index 2bf6f99..828e990 100755
--- a/configure
+++ b/configure
@@ -2093,24 +2093,6 @@ case $_backend in
 		CXXFLAGS="$CXXFLAGS -Wa,--noexecstack"
 		LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
 
-		static_libs=''
-		system_libs=''
-		for lib in $LIBS; do
-			case $lib in
-			-lz|-lm)
-				system_libs="$system_libs $lib"
-				;;
-			*)
-				static_libs="$static_libs $lib"
-				;;
-			esac
-		done
-
-		# -lgcc is carefully placed here - we want to catch
-		# all toolchain symbols in *our* libraries rather
-		# than pick up anything unhygenic from the Android libs.
-		LIBS="-Wl,-Bstatic $static_libs"
-		LIBS="$LIBS -Wl,-Bdynamic -lgcc $system_libs -llog -lGLESv1_CM"
 		DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
 		;;
 	dc)
@@ -3153,6 +3135,33 @@ else
 fi
 
 #
+# Some last-minute backend specific stuff, executed
+# after all of CXXFLAGS, LDFLAGS, LIBS etc. have been setup
+#
+case $_backend in
+	android)
+		static_libs=''
+		system_libs=''
+		for lib in $LIBS; do
+			case $lib in
+			-lz|-lm)
+				system_libs="$system_libs $lib"
+				;;
+			*)
+				static_libs="$static_libs $lib"
+				;;
+			esac
+		done
+
+		# -lgcc is carefully placed here - we want to catch
+		# all toolchain symbols in *our* libraries rather
+		# than pick up anything unhygenic from the Android libs.
+		LIBS="-Wl,-Bstatic $static_libs -Wl,-Bdynamic -lgcc $system_libs -llog -lGLESv1_CM"
+		;;
+esac
+
+
+#
 # Engine selection
 #
 _engines_built_static=""


Commit: 39076ef9722529d80feff94bdff25843beb4fc13
    https://github.com/scummvm/scummvm/commit/39076ef9722529d80feff94bdff25843beb4fc13
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:23:03-07:00

Commit Message:
BUILD: Rename UNIX #define to POSIX

Changed paths:
    backends/base-backend.cpp
    backends/events/sdl/sdl-events.cpp
    backends/fs/posix/posix-fs-factory.cpp
    backends/fs/posix/posix-fs.cpp
    backends/module.mk
    backends/platform/null/null.cpp
    backends/platform/sdl/main.cpp
    backends/platform/sdl/module.mk
    backends/platform/sdl/posix/posix-main.cpp
    backends/platform/sdl/posix/posix.cpp
    backends/plugins/posix/posix-provider.cpp
    backends/plugins/posix/posix-provider.h
    backends/saves/posix/posix-saves.cpp
    backends/saves/posix/posix-saves.h
    common/savefile.h
    configure
    dists/iphone/scummvm.xcodeproj/project.pbxproj
    ports.mk



diff --git a/backends/base-backend.cpp b/backends/base-backend.cpp
index f3935b5..624de1f 100644
--- a/backends/base-backend.cpp
+++ b/backends/base-backend.cpp
@@ -18,6 +18,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
+ * $URL$
+ * $Id$
+ *
  */
 
 #include "backends/base-backend.h"
@@ -57,11 +60,15 @@ void BaseBackend::fillScreen(uint32 col) {
 */
 
 
-#if defined(UNIX)
+#if defined(POSIX)
+#if defined(SAMSUNGTV)
+#define DEFAULT_CONFIG_FILE "/dtv/usb/sda1/.scummvmrc"
+#else
 #define DEFAULT_CONFIG_FILE ".scummvmrc"
 #endif
+#endif
 
-#if !defined(UNIX)
+#if !defined(POSIX)
 #define DEFAULT_CONFIG_FILE "scummvm.ini"
 #endif
 
diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index cadb10a..835d98e 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -279,7 +279,7 @@ bool SdlEventSource::handleKeyDown(SDL_Event &ev, Common::Event &event) {
 		event.type = Common::EVENT_QUIT;
 		return true;
 	}
-#elif defined(UNIX)
+#elif defined(POSIX)
 	// On other *nix systems, Control-Q quits
 	if ((ev.key.keysym.mod & KMOD_CTRL) && ev.key.keysym.sym == 'q') {
 		event.type = Common::EVENT_QUIT;
@@ -323,7 +323,7 @@ bool SdlEventSource::handleKeyUp(SDL_Event &ev, Common::Event &event) {
 		if (ev.key.keysym.sym == 'm' ||	// Ctrl-m toggles mouse capture
 #if defined(MACOSX)
 			// Meta - Q, handled below
-#elif defined(UNIX)
+#elif defined(POSIX)
 			ev.key.keysym.sym == 'q' ||	// On other *nix systems, Control-Q quits
 #else
 			ev.key.keysym.sym == 'z' ||	// Ctrl-z quit
@@ -336,7 +336,7 @@ bool SdlEventSource::handleKeyUp(SDL_Event &ev, Common::Event &event) {
 #if defined(MACOSX)
 	if ((mod & KMOD_META) && ev.key.keysym.sym == 'q')
 		return false;	// On Macintosh, Cmd-Q quits
-#elif defined(UNIX)
+#elif defined(POSIX)
 	// Control Q has already been handled above
 #else
 	if ((mod & KMOD_ALT) && ev.key.keysym.sym == 'x')
diff --git a/backends/fs/posix/posix-fs-factory.cpp b/backends/fs/posix/posix-fs-factory.cpp
index c94e90c..ccff8a8 100644
--- a/backends/fs/posix/posix-fs-factory.cpp
+++ b/backends/fs/posix/posix-fs-factory.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#if defined(UNIX)
+#if defined(POSIX)
 
 // Re-enable some forbidden symbols to avoid clashes with stat.h and unistd.h.
 // Also with clock() in sys/time.h in some Mac OS X SDKs.
diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp
index 7f2ca69..08a7601 100644
--- a/backends/fs/posix/posix-fs.cpp
+++ b/backends/fs/posix/posix-fs.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#if defined(UNIX)
+#if defined(POSIX)
 
 // Re-enable some forbidden symbols to avoid clashes with stat.h and unistd.h.
 // Also with clock() in sys/time.h in some Mac OS X SDKs.
@@ -249,4 +249,4 @@ Common::WriteStream *POSIXFilesystemNode::createWriteStream() {
 	return StdioStream::makeFromPath(getPath(), true);
 }
 
-#endif //#if defined(UNIX)
+#endif //#if defined(POSIX)
diff --git a/backends/module.mk b/backends/module.mk
index 04db313..07a8cbb 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -55,7 +55,7 @@ MODULE_OBJS += \
 	plugins/sdl/sdl-provider.o \
 	timer/sdl/sdl-timer.o
 
-ifdef UNIX
+ifdef POSIX
 MODULE_OBJS += \
 	fs/posix/posix-fs.o \
 	fs/posix/posix-fs-factory.o \
diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp
index 7dd127f..b9e901b 100644
--- a/backends/platform/null/null.cpp
+++ b/backends/platform/null/null.cpp
@@ -34,7 +34,7 @@
  */
 #if defined(__amigaos4__)
 	#include "backends/fs/amigaos4/amigaos4-fs-factory.h"
-#elif defined(UNIX)
+#elif defined(POSIX)
 	#include "backends/fs/posix/posix-fs-factory.h"
 #elif defined(WIN32)
 	#include "backends/fs/windows/windows-fs-factory.h"
@@ -60,7 +60,7 @@ public:
 OSystem_NULL::OSystem_NULL() {
 	#if defined(__amigaos4__)
 		_fsFactory = new AmigaOSFilesystemFactory();
-	#elif defined(UNIX)
+	#elif defined(POSIX)
 		_fsFactory = new POSIXFilesystemFactory();
 	#elif defined(WIN32)
 		_fsFactory = new WindowsFilesystemFactory();
diff --git a/backends/platform/sdl/main.cpp b/backends/platform/sdl/main.cpp
index a0a64e1..1992bdd 100644
--- a/backends/platform/sdl/main.cpp
+++ b/backends/platform/sdl/main.cpp
@@ -24,7 +24,7 @@
 
 // Several SDL based ports use a custom main, and hence do not want to compile
 // of this file. The following "#if" ensures that.
-#if !defined(UNIX) && \
+#if !defined(POSIX) && \
     !defined(WIN32) && \
     !defined(__MAEMO__) && \
     !defined(__SYMBIAN32__) && \
diff --git a/backends/platform/sdl/module.mk b/backends/platform/sdl/module.mk
index 87a0e3d..efc5168 100644
--- a/backends/platform/sdl/module.mk
+++ b/backends/platform/sdl/module.mk
@@ -5,7 +5,7 @@ MODULE_OBJS := \
 	main.o \
 	sdl.o
 
-ifdef UNIX
+ifdef POSIX
 MODULE_OBJS += \
 	posix/posix-main.o \
 	posix/posix.o
diff --git a/backends/platform/sdl/posix/posix-main.cpp b/backends/platform/sdl/posix/posix-main.cpp
index ffc28b3..f78e001 100644
--- a/backends/platform/sdl/posix/posix-main.cpp
+++ b/backends/platform/sdl/posix/posix-main.cpp
@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#if defined(UNIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA)
+#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA)
 
 #include "backends/platform/sdl/posix/posix.h"
 #include "backends/plugins/sdl/sdl-provider.h"
diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp
index 4dd0039..21ad7b9 100644
--- a/backends/platform/sdl/posix/posix.cpp
+++ b/backends/platform/sdl/posix/posix.cpp
@@ -26,7 +26,7 @@
 
 #include "common/scummsys.h"
 
-#ifdef UNIX
+#ifdef POSIX
 
 #include "backends/platform/sdl/posix/posix.h"
 #include "backends/saves/posix/posix-saves.h"
@@ -61,7 +61,7 @@ void OSystem_POSIX::initBackend() {
 Common::String OSystem_POSIX::getDefaultConfigFileName() {
 	char configFile[MAXPATHLEN];
 
-	// On UNIX type systems, by default we store the config file inside
+	// On POSIX type systems, by default we store the config file inside
 	// to the HOME directory of the user.
 	const char *home = getenv("HOME");
 	if (home != NULL && strlen(home) < MAXPATHLEN)
diff --git a/backends/plugins/posix/posix-provider.cpp b/backends/plugins/posix/posix-provider.cpp
index 39ed247..a68a792 100644
--- a/backends/plugins/posix/posix-provider.cpp
+++ b/backends/plugins/posix/posix-provider.cpp
@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#if defined(DYNAMIC_MODULES) && defined(UNIX)
+#if defined(DYNAMIC_MODULES) && defined(POSIX)
 
 #include "backends/plugins/posix/posix-provider.h"
 #include "backends/plugins/dynamic-plugin.h"
@@ -77,9 +77,9 @@ public:
 };
 
 
-Plugin* POSIXPluginProvider::createPlugin(const Common::FSNode &node) const {
+Plugin *POSIXPluginProvider::createPlugin(const Common::FSNode &node) const {
 	return new POSIXPlugin(node.getPath());
 }
 
 
-#endif // defined(DYNAMIC_MODULES) && defined(UNIX)
+#endif // defined(DYNAMIC_MODULES) && defined(POSIX)
diff --git a/backends/plugins/posix/posix-provider.h b/backends/plugins/posix/posix-provider.h
index 7d6d6ad..b1186cc 100644
--- a/backends/plugins/posix/posix-provider.h
+++ b/backends/plugins/posix/posix-provider.h
@@ -25,13 +25,13 @@
 
 #include "base/plugins.h"
 
-#if defined(DYNAMIC_MODULES) && defined(UNIX)
+#if defined(DYNAMIC_MODULES) && defined(POSIX)
 
 class POSIXPluginProvider : public FilePluginProvider {
 protected:
-	Plugin* createPlugin(const Common::FSNode &node) const;
+	Plugin *createPlugin(const Common::FSNode &node) const;
 };
 
-#endif // defined(DYNAMIC_MODULES) && defined(UNIX)
+#endif // defined(DYNAMIC_MODULES) && defined(POSIX)
 
 #endif
diff --git a/backends/saves/posix/posix-saves.cpp b/backends/saves/posix/posix-saves.cpp
index fc75abf..40380a1 100644
--- a/backends/saves/posix/posix-saves.cpp
+++ b/backends/saves/posix/posix-saves.cpp
@@ -28,7 +28,7 @@
 
 #include "common/scummsys.h"
 
-#if defined(UNIX) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)
+#if defined(POSIX) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)
 
 #include "backends/saves/posix/posix-saves.h"
 
@@ -83,13 +83,7 @@ POSIXSaveFileManager::POSIXSaveFileManager() {
 	}
 #endif
 }
-/*
-POSIXSaveFileManager::POSIXSaveFileManager(const Common::String &defaultSavepath)
-	: DefaultSaveFileManager(defaultSavepath) {
-}
-*/
 
-#if defined(UNIX)
 void POSIXSaveFileManager::checkPath(const Common::FSNode &dir) {
 	const Common::String path = dir.getPath();
 	clearError();
@@ -154,6 +148,5 @@ void POSIXSaveFileManager::checkPath(const Common::FSNode &dir) {
 		}
 	}
 }
-#endif
 
 #endif
diff --git a/backends/saves/posix/posix-saves.h b/backends/saves/posix/posix-saves.h
index b7ee7ff..160075d 100644
--- a/backends/saves/posix/posix-saves.h
+++ b/backends/saves/posix/posix-saves.h
@@ -25,7 +25,7 @@
 
 #include "backends/saves/default/default-saves.h"
 
-#if defined(UNIX)
+#if defined(POSIX) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)
 /**
  * Customization of the DefaultSaveFileManager for POSIX platforms.
  * The only two differences are that the default constructor sets
@@ -35,7 +35,6 @@
 class POSIXSaveFileManager : public DefaultSaveFileManager {
 public:
 	POSIXSaveFileManager();
-//	POSIXSaveFileManager(const Common::String &defaultSavepath);
 
 protected:
 	/**
diff --git a/common/savefile.h b/common/savefile.h
index 40f3162..03a7b52 100644
--- a/common/savefile.h
+++ b/common/savefile.h
@@ -142,7 +142,7 @@ public:
 
 	/**
 	 * Request a list of available savegames with a given DOS-style pattern,
-	 * also known as "glob" in the UNIX world. Refer to the Common::matchString()
+	 * also known as "glob" in the POSIX world. Refer to the Common::matchString()
 	 * function to learn about the precise pattern format.
 	 * @param pattern Pattern to match. Wildcards like * or ? are available.
 	 * @return list of strings for all present file names.
diff --git a/configure b/configure
index 828e990..2fc8631 100755
--- a/configure
+++ b/configure
@@ -147,7 +147,7 @@ _build_scalers=yes
 _build_hq_scalers=yes
 _indeo3=auto
 _enable_prof=no
-_unix=no
+_posix=no
 _global_constructors=no
 _elf_loader=no
 # Default vkeybd/keymapper options
@@ -1548,7 +1548,7 @@ case $_host_os in
 		LDFLAGS="$LDFLAGS --sysroot=$ANDROID_NDK/platforms/android-4/arch-arm"
 		LDFLAGS="$LDFLAGS -mthumb-interwork"
 		add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK"
-		_unix=yes
+		_posix=yes
 		_seq_midi=no
 		;;
 	beos*)
@@ -1558,11 +1558,11 @@ case $_host_os in
 		CFLAGS="-I/boot/home/config/include"
 		CXXFLAGS="$CXXFLAGS -fhuge-objects"
 		LIBS="$LIBS -lbind -lsocket"
-		_unix=yes
+		_posix=yes
 		_seq_midi=no
 		;;
 	bsd* | hpux* | netbsd* | openbsd* | sunos*)
-		_unix=yes
+		_posix=yes
 		;;
 	cygwin*)
 		echo ERROR: Cygwin building is not supported by ScummVM anymore. Consider using MinGW.
@@ -1572,7 +1572,7 @@ case $_host_os in
 		DEFINES="$DEFINES -DMACOSX"
 		LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI"
 		add_line_to_config_mk 'MACOSX = 1'
-		_unix=yes
+		_posix=yes
 		;;
 	dreamcast)
 		DEFINES="$DEFINES -D__DC__ -DNONSTANDARD_PORT"
@@ -1598,7 +1598,7 @@ case $_host_os in
 	freebsd*)
 		LDFLAGS="$LDFLAGS -L/usr/local/lib"
 		CXXFLAGS="$CXXFLAGS -I/usr/local/include"
-		_unix=yes
+		_posix=yes
 		;;
 	gamecube)
 		CXXFLAGS="$CXXFLAGS -Os -mogc -mcpu=750 -meabi -mhard-float"
@@ -1616,14 +1616,14 @@ case $_host_os in
 		DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		# Needs -lnetwork for the timidity MIDI driver
 		LIBS="$LIBS -lnetwork"
-		_unix=yes
+		_posix=yes
 		_seq_midi=no
 		;;
 	irix*)
 		DEFINES="$DEFINES -DIRIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		LIBS="$LIBS -lmd -lfastm -lm"
 		_ranlib=:
-		_unix=yes
+		_posix=yes
 		;;
 	linux* | uclinux*)
 		# When not cross-compiling, enable large file support, but don't
@@ -1631,7 +1631,7 @@ case $_host_os in
 		if test -z "$_host"; then
 			CXXFLAGS="$CXXFLAGS $(getconf LFS_CFLAGS 2>/dev/null)"
 		fi
-		_unix=yes
+		_posix=yes
 		DEFINES="$DEFINES -DLUA_USE_POSIX"
 		;;
 	mingw*)
@@ -1642,7 +1642,7 @@ case $_host_os in
 		;;
 	mint*)
 		DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
-		_unix=yes
+		_posix=yes
 		;;
 	n64)
 		DEFINES="$DEFINES -D__N64__ -DLIMIT_FPS -DNONSTANDARD_PORT"
@@ -1651,7 +1651,7 @@ case $_host_os in
 		DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
 		;;
 	os2-emx*)
-		_unix=yes	# FIXME??? Why??
+		_posix=yes	# FIXME??? Why??
 		;;
 	ps2)
 		# TODO ps2
@@ -1669,7 +1669,7 @@ case $_host_os in
 		DEFINES="$DEFINES -DSOLARIS -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		# Needs -lbind -lsocket for the timidity MIDI driver
 		LIBS="$LIBS -lnsl -lsocket"
-		_unix=yes
+		_posix=yes
 		;;
 	webos)
 		CXXFLAGS="$CXXFLAGS -I$WEBOS_PDK/include -I$WEBOS_PDK/include/SDL -I$WEBOS_PDK/device/usr/include"
@@ -1679,7 +1679,7 @@ case $_host_os in
 		LDFLAGS="$LDFLAGS -Wl,--allow-shlib-undefined"
 		LDFLAGS="$LDFLAGS --sysroot=$WEBOS_PDK/arm-gcc/sysroot"
 		add_line_to_config_mk "WEBOS_SDK = $WEBOS_SDK"
-		_unix=yes
+		_posix=yes
 		_seq_midi=no
 		;;
 	wii)
@@ -1699,10 +1699,10 @@ case $_host_os in
 		DEFINES="$DEFINES -D__ARM__ -D_ARM_ -DUNICODE -DFPM_DEFAULT -DNONSTANDARD_PORT"
 		DEFINES="$DEFINES -DWIN32 -Dcdecl= -D__cdecl__="
 		;;
-	# given this is a shell script assume some type of unix
+	# given this is a shell script assume some type of posix
 	*)
 		echo "WARNING: could not establish system type, assuming unix like"
-		_unix=yes
+		_posix=yes
 		;;
 esac
 
@@ -1711,7 +1711,7 @@ if test -n "$_host"; then
 	echo "Cross-compiling to $_host"
 	case "$_host" in
 		android | android-v7a)
-			_unix=yes
+			_posix=yes
 			# we link a .so as default
 			LDFLAGS="$LDFLAGS -shared -Wl,-Bsymbolic,--no-undefined"
 			HOSTEXEPRE=lib
@@ -1724,11 +1724,11 @@ if test -n "$_host"; then
 			_timidity=no
 			;;
 		arm-linux|arm*-linux-gnueabi|arm-*-linux)
-			_unix=yes
+			_posix=yes
 			;;
 		arm-riscos|linupy)
 			DEFINES="$DEFINES -DLINUPY"
-			_unix=yes
+			_posix=yes
 			;;
 		bfin*)
 			;;
@@ -1744,7 +1744,7 @@ if test -n "$_host"; then
 			fi
 			CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
 			ASFLAGS="$ASFLAGS"
-			_unix=yes
+			_posix=yes
 			_backend="gph"
 			_build_hq_scalers=no
 			_vkeybd=yes
@@ -1758,7 +1758,7 @@ if test -n "$_host"; then
 			_strip=$_host-strip
 			;;
 		dingux)
-			DEFINES="$DEFINES -DUNIX -DDINGUX -DDISABLE_DOSBOX_OPL -DREDUCE_MEMORY_USAGE"
+			DEFINES="$DEFINES -DDINGUX -DDISABLE_DOSBOX_OPL -DREDUCE_MEMORY_USAGE"
 			ASFLAGS="$ASFLAGS"
 			CXXFLAGS="$CXXFLAGS -msoft-float -mips32"
 			_backend="dingux"
@@ -1818,7 +1818,7 @@ if test -n "$_host"; then
 			CXXFLAGS="$CXXFLAGS -march=armv4t"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
 			LDFLAGS="$LDFLAGS -static"
-			_unix=yes
+			_posix=yes
 			_backend="gph"
 			_build_hq_scalers=no
 			_vkeybd=yes
@@ -1836,7 +1836,7 @@ if test -n "$_host"; then
 			fi
 			CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
-			_unix=yes
+			_posix=yes
 			_backend="gph"
 			_build_hq_scalers=no
 			_vkeybd=yes
@@ -1847,14 +1847,14 @@ if test -n "$_host"; then
 			;;
 		iphone)
 			DEFINES="$DEFINES -DIPHONE"
-			_unix=yes
+			_posix=yes
 			_backend="iphone"
 			_build_hq_scalers=no
 			_seq_midi=no
 			;;
 		m68k-atari-mint)
 			DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
-			_unix=yes
+			_posix=yes
 			_ranlib=m68k-atari-mint-ranlib
 			_ar="m68k-atari-mint-ar cru"
 			_seq_midi=no
@@ -1872,7 +1872,7 @@ if test -n "$_host"; then
 		motoezx)
 			DEFINES="$DEFINES -DMOTOEZX"
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
-			_unix=yes
+			_posix=yes
 			_backend="linuxmoto"
 			_build_hq_scalers=no
 			_mt32emu=no
@@ -1883,7 +1883,7 @@ if test -n "$_host"; then
 		motomagx)
 			DEFINES="$DEFINES -DMOTOMAGX"
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
-			_unix=yes
+			_posix=yes
 			_backend="linuxmoto"
 			_build_hq_scalers=no
 			_mt32emu=no
@@ -1915,7 +1915,7 @@ if test -n "$_host"; then
 			;;
 		neuros)
 			DEFINES="$DEFINES -DNEUROS"
-			_unix=yes
+			_posix=yes
 			_backend='null'
 			_build_hq_scalers=no
 			_mt32emu=no
@@ -1930,7 +1930,7 @@ if test -n "$_host"; then
 			fi
 			CXXFLAGS="$CXXFLAGS -march=armv7-a -mtune=cortex-a8 -mfpu=neon"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
-			_unix=yes
+			_posix=yes
 			_backend="openpandora"
 			_build_hq_scalers=yes
 			_vkeybd=no
@@ -1979,13 +1979,13 @@ if test -n "$_host"; then
 			DEFINES="$DEFINES -DSAMSUNGTV -DDISABLE_COMMAND_LINE"
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
 			HOSTEXEEXT=".so"
-			_unix=yes
+			_posix=yes
 			_backend="samsungtv"
 			_mt32emu=no
 			_vkeybd=yes
 			;;
 		webos)
-			_unix=yes
+			_posix=yes
 			_backend="webos"
 			_port_mk="backends/platform/webos/webos.mk"
 			_build_scalers=no
@@ -2228,9 +2228,9 @@ case $_endian in
 		;;
 esac
 
-if test "$_unix" = yes ; then
-	DEFINES="$DEFINES -DUNIX"
-	add_line_to_config_mk 'UNIX = 1'
+if test "$_posix" = yes ; then
+	DEFINES="$DEFINES -DPOSIX"
+	add_line_to_config_mk 'POSIX = 1'
 fi
 
 #
@@ -2697,9 +2697,9 @@ fi
 echocheck "SEQ MIDI"
 if test "$_seq_midi" = auto ; then
 	# TODO: Test for /dev/sequencer presence? Or maybe just for /dev ?
-	# For now, we just always enable it when "unix" mode is on (backends
+	# For now, we just always enable it when "posix" mode is on (backends
 	# that do not want it can disable it by setting _seq_midi=no).
-	_seq_midi="$_unix"
+	_seq_midi="$_posix"
 fi
 define_in_config_h_if_yes "$_seq_midi" 'USE_SEQ_MIDI'
 echo "$_seq_midi"
@@ -2712,7 +2712,7 @@ if test "$_timidity" = auto ; then
 	# TODO: Is there a good possibility of auto detecting whether we
 	# should include TiMidity support? It can only be used on Unix
 	# currently so we use that as "detection" for now.
-	_timidity="$_unix"
+	_timidity="$_posix"
 fi
 define_in_config_h_if_yes "$_timidity" 'USE_TIMIDITY'
 echo "$_timidity"
diff --git a/dists/iphone/scummvm.xcodeproj/project.pbxproj b/dists/iphone/scummvm.xcodeproj/project.pbxproj
index 08b67b6..d1ab410 100755
--- a/dists/iphone/scummvm.xcodeproj/project.pbxproj
+++ b/dists/iphone/scummvm.xcodeproj/project.pbxproj
@@ -36,6 +36,7 @@
 		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 */; };
@@ -67,6 +68,7 @@
 		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 */; };
@@ -98,6 +100,7 @@
 		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 */; };
@@ -235,14 +238,41 @@
 		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 */; };
@@ -870,6 +900,7 @@
 		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 */; };
@@ -886,6 +917,7 @@
 		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 */; };
@@ -957,9 +989,12 @@
 		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 */; };
@@ -994,255 +1029,9 @@
 		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 */; };
-		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 */; };
+		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 */; };
 		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 */; };
@@ -1264,8 +1053,15 @@
 		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 */; };
@@ -1313,6 +1109,36 @@
 		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 */; };
@@ -1403,137 +1229,6 @@
 		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 */; };
@@ -1558,10 +1253,20 @@
 		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 */; };
@@ -1573,6 +1278,7 @@
 		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 */; };
@@ -1584,6 +1290,7 @@
 		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 */; };
@@ -1610,6 +1317,9 @@
 		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 */; };
@@ -1643,6 +1353,12 @@
 		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 */; };
@@ -1719,6 +1435,9 @@
 		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 */; };
@@ -2348,9 +2067,28 @@
 		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 */; };
@@ -2363,8 +2101,27 @@
 		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 */; };
@@ -2374,6 +2131,12 @@
 		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 */; };
@@ -2388,13 +2151,15 @@
 		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 */; };
-		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 */; };
+		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 */; };
 		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 */; };
@@ -2410,6 +2175,9 @@
 		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 */; };
@@ -2439,6 +2207,9 @@
 		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 */; };
@@ -2497,14 +2268,41 @@
 		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 */; };
@@ -2520,6 +2318,11 @@
 		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 */; };
@@ -2572,14 +2375,41 @@
 		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 */; };
@@ -3210,6 +3040,7 @@
 		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 */; };
@@ -3226,6 +3057,7 @@
 		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 */; };
@@ -3297,6 +3129,7 @@
 		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 */; };
@@ -3311,6 +3144,7 @@
 		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 */; };
@@ -3369,9 +3203,12 @@
 		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>"; };
@@ -3468,6 +3305,8 @@
 		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>"; };
@@ -3500,156 +3339,8 @@
 		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>"; };
-		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; };
+		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>"; };
 		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>"; };
@@ -3663,12 +3354,16 @@
 		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>"; };
-		DF2FFBD60F485E360006E566 /* gui-manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gui-manager.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>"; };
 		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>"; };
@@ -3746,6 +3441,26 @@
 		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>"; };
@@ -3808,97 +3523,6 @@
 		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>"; };
@@ -3922,11 +3546,19 @@
 		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>"; };
@@ -3945,6 +3577,8 @@
 		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>"; };
@@ -3963,6 +3597,10 @@
 		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>"; };
@@ -4023,6 +3661,8 @@
 		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>"; };
@@ -5065,21 +4705,54 @@
 		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>"; };
@@ -5092,10 +4765,12 @@
 		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>"; };
-		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; };
+		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>"; };
 		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>"; };
@@ -5106,6 +4781,8 @@
 		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>"; };
@@ -5134,6 +4811,8 @@
 		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>"; };
@@ -5263,10 +4942,16 @@
 		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>"; };
@@ -5275,10 +4960,54 @@
 		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>"; };
@@ -5293,7 +5022,11 @@
 		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 */
 
@@ -5313,7 +5046,6 @@
 				DFF959080FB22D3300A3EC78 /* libvorbisidec.a in Frameworks */,
 				DFF95CCF0FB22D8500A3EC78 /* libmpeg2.a in Frameworks */,
 				DF224E040FB23BC500C8E453 /* OpenGLES.framework in Frameworks */,
-				DFADEC071382140300C46364 /* libz.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5370,7 +5102,6 @@
 				DF842A170E7BB34E00F5680E /* CoreFoundation.framework */,
 				DF842A180E7BB34E00F5680E /* Foundation.framework */,
 				DF842A190E7BB34E00F5680E /* UIKit.framework */,
-				DFADEC061382140300C46364 /* libz.dylib */,
 			);
 			name = "Linked Frameworks";
 			sourceTree = "<group>";
@@ -5395,8 +5126,6 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
-				DF2040461380C9ED0056300A /* audio */,
-				DF203F521380C2470056300A /* video */,
 				DF9B9277118E475D0069C19D /* games */,
 				DFD6476A0F49F7D2008E18EF /* libs */,
 				DF841FF50E7BA6A600F5680E /* engines */,
@@ -5405,6 +5134,7 @@
 				DFE473950D81F4E800B6D1FB /* common */,
 				DFE477520D81F4E900B6D1FB /* graphics */,
 				DFE477880D81F4E900B6D1FB /* gui */,
+				DFE477C60D81F4E900B6D1FB /* sound */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
 				DFA2A57A118E433A00344DFD /* Resources-iPad */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
@@ -5457,33 +5187,15 @@
 		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 */,
@@ -5593,6 +5305,8 @@
 			isa = PBXGroup;
 			children = (
 				DF6118CB0FE3AAFD0042AD3F /* hardwarekeys.cpp */,
+				DF0942350F63CB9A002D821E /* events.cpp */,
+				DF0942370F63CB9A002D821E /* graphics.cpp */,
 				DF0942390F63CB9A002D821E /* main.cpp */,
 				DF09423C0F63CB9A002D821E /* sdl.cpp */,
 				DF09423D0F63CB9A002D821E /* sdl.h */,
@@ -5613,189 +5327,28 @@
 			path = demos;
 			sourceTree = "<group>";
 		};
-		DF203F521380C2470056300A /* video */ = {
+		DF2FFB940F485D950006E566 /* video */ = {
 			isa = PBXGroup;
 			children = (
-				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 */,
+				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 */,
 			);
-			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;
+			path = video;
 			sourceTree = "<group>";
 		};
 		DF2FFBF50F4860A60006E566 /* posix */ = {
@@ -5846,8 +5399,6 @@
 		DF2FFD040F4870E50006E566 /* tucker */ = {
 			isa = PBXGroup;
 			children = (
-				DF46B7D41381E7C600D08723 /* console.cpp */,
-				DF46B7D51381E7C600D08723 /* console.h */,
 				DF2FFD050F4870E50006E566 /* detection.cpp */,
 				DF2FFD060F4870E50006E566 /* graphics.cpp */,
 				DF2FFD070F4870E50006E566 /* graphics.h */,
@@ -5862,6 +5413,35 @@
 			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 = (
@@ -5961,129 +5541,15 @@
 		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 */,
@@ -6091,6 +5557,7 @@
 				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 */,
@@ -6108,7 +5575,6 @@
 		DF841FF50E7BA6A600F5680E /* engines */ = {
 			isa = PBXGroup;
 			children = (
-				DF46B8851381F56400D08723 /* util.h */,
 				DF2FFC4C0F4863560006E566 /* advancedDetector.cpp */,
 				DF2FFC4D0F4863560006E566 /* advancedDetector.h */,
 				DF841FF60E7BA6A600F5680E /* agi */,
@@ -6291,9 +5757,6 @@
 		DF8420640E7BA6A600F5680E /* cine */ = {
 			isa = PBXGroup;
 			children = (
-				DF46B75B1381E4A400D08723 /* console.cpp */,
-				DF46B75C1381E4A400D08723 /* console.h */,
-				DF46B75D1381E4A400D08723 /* detection_tables.h */,
 				DF8420650E7BA6A600F5680E /* anim.cpp */,
 				DF8420660E7BA6A600F5680E /* anim.h */,
 				DF8420670E7BA6A600F5680E /* bg.cpp */,
@@ -6429,17 +5892,6 @@
 		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 */,
@@ -6466,6 +5918,7 @@
 				DF8421300E7BA6A700F5680E /* goblin_v2.cpp */,
 				DF8421310E7BA6A700F5680E /* goblin_v3.cpp */,
 				DF8421320E7BA6A700F5680E /* goblin_v4.cpp */,
+				DF6118590FE3A9020042AD3F /* helper.h */,
 				DF7585C5100CB66E00CC3324 /* hotspots.cpp */,
 				DF7585C6100CB66E00CC3324 /* hotspots.h */,
 				DF8421330E7BA6A700F5680E /* init.cpp */,
@@ -6812,8 +6265,6 @@
 		DF8422C90E7BA6A900F5680E /* made */ = {
 			isa = PBXGroup;
 			children = (
-				DF46B8501381F3B400D08723 /* console.cpp */,
-				DF46B8511381F3B400D08723 /* console.h */,
 				DF8422CA0E7BA6A900F5680E /* database.cpp */,
 				DF8422CB0E7BA6A900F5680E /* database.h */,
 				DF8422CC0E7BA6A900F5680E /* detection.cpp */,
@@ -7012,10 +6463,6 @@
 		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 */,
@@ -7291,8 +6738,6 @@
 		DF84244E0E7BA6AB00F5680E /* sword1 */ = {
 			isa = PBXGroup;
 			children = (
-				DF46B7C61381E72500D08723 /* console.cpp */,
-				DF46B7C71381E72500D08723 /* console.h */,
 				DF84244F0E7BA6AB00F5680E /* animation.cpp */,
 				DF8424500E7BA6AB00F5680E /* animation.h */,
 				DF8424510E7BA6AB00F5680E /* collision.h */,
@@ -7338,7 +6783,6 @@
 		DF8424770E7BA6AB00F5680E /* sword2 */ = {
 			isa = PBXGroup;
 			children = (
-				DF46B7A81381E5F100D08723 /* header.cpp */,
 				DF8424780E7BA6AB00F5680E /* animation.cpp */,
 				DF8424790E7BA6AB00F5680E /* animation.h */,
 				DF84247A0E7BA6AB00F5680E /* anims.cpp */,
@@ -7395,9 +6839,6 @@
 		DF8424AA0E7BA6AB00F5680E /* tinsel */ = {
 			isa = PBXGroup;
 			children = (
-				DF46B8901381F62B00D08723 /* adpcm.cpp */,
-				DF46B8911381F62B00D08723 /* adpcm.h */,
-				DF46B6F21381E18900D08723 /* coroutine.cpp */,
 				DF8424AB0E7BA6AB00F5680E /* actors.cpp */,
 				DF8424AC0E7BA6AB00F5680E /* actors.h */,
 				DF8424AD0E7BA6AB00F5680E /* anim.cpp */,
@@ -7492,8 +6933,6 @@
 		DF8424FC0E7BA6AB00F5680E /* touche */ = {
 			isa = PBXGroup;
 			children = (
-				DF46B84B1381F39E00D08723 /* console.cpp */,
-				DF46B84C1381F39E00D08723 /* console.h */,
 				DF8424FD0E7BA6AB00F5680E /* detection.cpp */,
 				DF8424FE0E7BA6AB00F5680E /* graphics.cpp */,
 				DF8424FF0E7BA6AB00F5680E /* graphics.h */,
@@ -7510,6 +6949,48 @@
 			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 = (
@@ -7555,9 +7036,6 @@
 		DFC8301B0F48AF18005EF03C /* engine */ = {
 			isa = PBXGroup;
 			children = (
-				DF46B7BB1381E6C000D08723 /* object.cpp */,
-				DF46B7BC1381E6C000D08723 /* object.h */,
-				DF46B7661381E4E400D08723 /* vm_types.cpp */,
 				DFCDC6D5116629CE00A7D2A0 /* features.cpp */,
 				DFCDC6D6116629CE00A7D2A0 /* features.h */,
 				DFC8301E0F48AF18005EF03C /* gc.cpp */,
@@ -7654,11 +7132,6 @@
 		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 */,
@@ -7676,7 +7149,6 @@
 		DFE470D60D81F4E700B6D1FB /* events */ = {
 			isa = PBXGroup;
 			children = (
-				DF46B7CC1381E74D00D08723 /* sdl */,
 				DFE470D70D81F4E700B6D1FB /* default */,
 			);
 			path = events;
@@ -7706,7 +7178,6 @@
 		DFE470F50D81F4E700B6D1FB /* posix */ = {
 			isa = PBXGroup;
 			children = (
-				DFADEBB613820E0C00C46364 /* posix-fs.cpp */,
 				DF842A4C0E7BBBEB00F5680E /* posix-fs.h */,
 				DFE470F60D81F4E700B6D1FB /* posix-fs-factory.cpp */,
 				DFE470F70D81F4E700B6D1FB /* posix-fs-factory.h */,
@@ -7757,7 +7228,6 @@
 		DFE4737B0D81F4E800B6D1FB /* plugins */ = {
 			isa = PBXGroup;
 			children = (
-				DF46B8861381F5C600D08723 /* sdl */,
 				DFE4737F0D81F4E800B6D1FB /* dynamic-plugin.h */,
 				DFE473800D81F4E800B6D1FB /* posix */,
 			);
@@ -7795,7 +7265,6 @@
 		DFE473910D81F4E800B6D1FB /* timer */ = {
 			isa = PBXGroup;
 			children = (
-				DF46B7A21381E5CC00D08723 /* sdl */,
 				DFE473920D81F4E800B6D1FB /* default */,
 			);
 			path = timer;
@@ -7813,19 +7282,6 @@
 		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 */,
@@ -7912,13 +7368,6 @@
 		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 */,
@@ -7955,6 +7404,7 @@
 				DF7E8C080ED5FCAF001CB19F /* VectorRenderer.h */,
 				DF7E8C090ED5FCAF001CB19F /* VectorRendererSpec.cpp */,
 				DF7E8C0A0ED5FCAF001CB19F /* VectorRendererSpec.h */,
+				DF2FFB940F485D950006E566 /* video */,
 			);
 			name = graphics;
 			path = ../../graphics;
@@ -7963,8 +7413,6 @@
 		DFE4775C0D81F4E900B6D1FB /* fonts */ = {
 			isa = PBXGroup;
 			children = (
-				DF46B79D1381E5B500D08723 /* winfont.cpp */,
-				DF46B79E1381E5B500D08723 /* winfont.h */,
 				DFE4775D0D81F4E900B6D1FB /* consolefont.cpp */,
 				DFE4775E0D81F4E900B6D1FB /* newfont.cpp */,
 				DFE4775F0D81F4E900B6D1FB /* newfont_big.cpp */,
@@ -7976,8 +7424,6 @@
 		DFE477880D81F4E900B6D1FB /* gui */ = {
 			isa = PBXGroup;
 			children = (
-				DF2040211380C8A60056300A /* widgets */,
-				DF203F461380C06E0056300A /* gui-manager.cpp */,
 				DFE477890D81F4E900B6D1FB /* about.cpp */,
 				DFE4778A0D81F4E900B6D1FB /* about.h */,
 				DFE4778B0D81F4E900B6D1FB /* Actions.cpp */,
@@ -7994,13 +7440,20 @@
 				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 */,
@@ -8009,8 +7462,14 @@
 				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 */,
@@ -8040,6 +7499,98 @@
 			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 */
@@ -8237,14 +7788,41 @@
 				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 */,
@@ -8875,6 +8453,7 @@
 				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 */,
@@ -8891,6 +8470,7 @@
 				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 */,
@@ -8962,6 +8542,7 @@
 				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 */,
@@ -8976,15 +8557,20 @@
 				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 */,
@@ -8998,6 +8584,7 @@
 				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 */,
@@ -9022,15 +8609,31 @@
 				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 */,
@@ -9064,19 +8667,25 @@
 				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 */,
@@ -9087,11 +8696,25 @@
 				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 */,
@@ -9099,6 +8722,7 @@
 				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 */,
@@ -9147,134 +8771,6 @@
 				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;
 		};
@@ -9321,14 +8817,41 @@
 				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 */,
@@ -9956,6 +9479,7 @@
 				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 */,
@@ -9972,6 +9496,7 @@
 				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 */,
@@ -10043,9 +9568,12 @@
 				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 */,
@@ -10061,15 +9589,20 @@
 				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 */,
@@ -10084,6 +9617,7 @@
 				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 */,
@@ -10104,9 +9638,13 @@
 				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 */,
@@ -10114,6 +9652,18 @@
 				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 */,
@@ -10147,19 +9697,25 @@
 				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 */,
@@ -10170,11 +9726,25 @@
 				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 */,
@@ -10182,6 +9752,7 @@
 				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 */,
@@ -10230,136 +9801,6 @@
 				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;
 		};
@@ -10408,14 +9849,41 @@
 				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 */,
@@ -11046,6 +10514,7 @@
 				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 */,
@@ -11062,6 +10531,7 @@
 				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 */,
@@ -11133,6 +10603,7 @@
 				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 */,
@@ -11147,15 +10618,20 @@
 				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 */,
@@ -11169,6 +10645,7 @@
 				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 */,
@@ -11193,15 +10670,31 @@
 				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 */,
@@ -11235,19 +10728,25 @@
 				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 */,
@@ -11258,11 +10757,25 @@
 				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 */,
@@ -11270,6 +10783,7 @@
 				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 */,
@@ -11318,134 +10832,6 @@
 				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;
 		};
@@ -11471,43 +10857,6 @@
 				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 = (
@@ -11516,7 +10865,6 @@
 					include/,
 				);
 				INFOPLIST_FILE = Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/lib\"",
@@ -11524,11 +10872,10 @@
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
 				PRODUCT_NAME = ScummVM;
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "EF590570-5FAC-4346-9071-D609DE2B28D8";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos4.2;
+				SDKROOT = iphoneos4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "armv6 armv7";
 			};
 			name = Debug;
 		};
@@ -11550,10 +10897,49 @@
 				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,
+					POSIX,
+					SCUMM_LITTLE_ENDIAN,
+					SCUMM_NEED_ALIGNMENT,
 					ENABLE_SCUMM,
 					ENABLE_SCUMM_7_8,
 					ENABLE_HE,
@@ -11585,48 +10971,8 @@
 					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;
@@ -11634,15 +10980,16 @@
 					../../engines/,
 					../../,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
 				LIBRARY_SEARCH_PATHS = "";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "-lz";
 				PREBINDING = NO;
-				SDKROOT = "";
+				PROVISIONING_PROFILE = "";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
+				SDKROOT = iphoneos4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "i386 ppc ppc64 x86_64 armv6 armv7";
+				VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7";
 			};
 			name = Debug;
 		};
@@ -11650,39 +10997,91 @@
 			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";
+				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_ENABLE_EXCEPTIONS = NO;
 				GCC_INPUT_FILETYPE = automatic;
-				GCC_PREPROCESSOR_DEFINITIONS = "";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					CONFIG_H,
+					IPHONE_OFFICIAL,
+					IPHONE,
+					POSIX,
+					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_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 = "";
+				OTHER_LDFLAGS = (
+					"-lSDLmain",
+					"-logg",
+					"-lvorbisfile",
+					"-lvorbis",
+					"-lmad",
+					"-lFLAC",
+					"-lSDL",
+					"-lz",
+				);
 				PREBINDING = NO;
-				SDKROOT = "";
+				PROVISIONING_PROFILE = "";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
+				SDKROOT = iphonesimulator3.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "i386 ppc ppc64 x86_64 armv6 armv7";
+				VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64 armv6 armv7";
 			};
 			name = Release;
 		};
 		DF0942280F63CB26002D821E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				COMPRESS_PNG_FILES = NO;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -11693,9 +11092,12 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				GCC_PREPROCESSOR_DEFINITIONS = (
+					CONFIG_H,
 					MACOSX,
 					SDL_BACKEND,
-					UNIX,
+					POSIX,
+					SCUMM_LITTLE_ENDIAN,
+					SCUMM_NEED_ALIGNMENT,
 					ENABLE_SCUMM,
 					ENABLE_SCUMM_7_8,
 					ENABLE_HE,
@@ -11725,6 +11127,7 @@
 					USE_FLAC,
 					USE_MAD,
 					USE_MPEG2,
+					USE_TREMOR,
 					USE_VORBIS,
 					USE_ZLIB,
 				);
@@ -11734,6 +11137,7 @@
 					/opt/local/include,
 					/sw/include/SDL,
 					/sw/include,
+					include/,
 					../../engines/,
 					../../,
 				);
@@ -11743,8 +11147,7 @@
 					/opt/local/lib,
 					"$(inherited)",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-lSDLmain",
@@ -11758,15 +11161,15 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = ScummVM;
-				SDKROOT = macosx10.5;
-				VALID_ARCHS = "i386 ppc ppc64 x86_64";
+				SDKROOT = macosx10.6;
+				VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64";
 			};
 			name = Debug;
 		};
 		DF0942290F63CB26002D821E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				COMPRESS_PNG_FILES = NO;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -11775,9 +11178,12 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				GCC_PREPROCESSOR_DEFINITIONS = (
+					CONFIG_H,
 					MACOSX,
 					SDL_BACKEND,
-					UNIX,
+					POSIX,
+					SCUMM_LITTLE_ENDIAN,
+					SCUMM_NEED_ALIGNMENT,
 					ENABLE_SCUMM,
 					ENABLE_SCUMM_7_8,
 					ENABLE_HE,
@@ -11807,6 +11213,7 @@
 					USE_FLAC,
 					USE_MAD,
 					USE_MPEG2,
+					USE_TREMOR,
 					USE_VORBIS,
 					USE_ZLIB,
 				);
@@ -11825,8 +11232,7 @@
 					/opt/local/lib,
 					"$(inherited)",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-lSDLmain",
@@ -11840,8 +11246,8 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = ScummVM;
-				SDKROOT = macosx10.5;
-				VALID_ARCHS = "i386 ppc ppc64 x86_64";
+				SDKROOT = macosx10.6;
+				VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
@@ -11849,7 +11255,6 @@
 		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;
@@ -11878,7 +11283,6 @@
 					/opt/local/lib,
 					"$(inherited)",
 				);
-				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-lSDLmain",
 					"-logg",
@@ -11893,15 +11297,13 @@
 				PRODUCT_NAME = ScummVM;
 				PROVISIONING_PROFILE = "EF590570-5FAC-4346-9071-D609DE2B28D8";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos;
-				VALID_ARCHS = "i386 x86_64";
+				SDKROOT = iphonesimulator3.2;
 			};
 			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;
@@ -11929,7 +11331,6 @@
 					/opt/local/lib,
 					"$(inherited)",
 				);
-				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-lSDLmain",
 					"-logg",
@@ -11944,8 +11345,7 @@
 				PRODUCT_NAME = ScummVM;
 				PROVISIONING_PROFILE = "EF590570-5FAC-4346-9071-D609DE2B28D8";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos;
-				VALID_ARCHS = "i386 x86_64";
+				SDKROOT = iphonesimulator3.2;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
diff --git a/ports.mk b/ports.mk
index dc0c720..5e5ee03 100644
--- a/ports.mk
+++ b/ports.mk
@@ -4,7 +4,7 @@
 
 
 #
-# UNIX specific
+# POSIX specific
 #
 install:
 	$(INSTALL) -d "$(DESTDIR)$(bindir)"


Commit: 38ff07589c8e6c3ecd2b2fcfbc8e1bc1b495eb78
    https://github.com/scummvm/scummvm/commit/38ff07589c8e6c3ecd2b2fcfbc8e1bc1b495eb78
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:23:04-07:00

Commit Message:
BUILD: Unify how _posix is computed

However, the current approach of determining _posix based on _host_os is
flawed and should be replaced by feature detection; added a TODO about
this.

Changed paths:
    configure



diff --git a/configure b/configure
index 2fc8631..69fffc7 100755
--- a/configure
+++ b/configure
@@ -1548,7 +1548,6 @@ case $_host_os in
 		LDFLAGS="$LDFLAGS --sysroot=$ANDROID_NDK/platforms/android-4/arch-arm"
 		LDFLAGS="$LDFLAGS -mthumb-interwork"
 		add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK"
-		_posix=yes
 		_seq_midi=no
 		;;
 	beos*)
@@ -1558,12 +1557,8 @@ case $_host_os in
 		CFLAGS="-I/boot/home/config/include"
 		CXXFLAGS="$CXXFLAGS -fhuge-objects"
 		LIBS="$LIBS -lbind -lsocket"
-		_posix=yes
 		_seq_midi=no
 		;;
-	bsd* | hpux* | netbsd* | openbsd* | sunos*)
-		_posix=yes
-		;;
 	cygwin*)
 		echo ERROR: Cygwin building is not supported by ScummVM anymore. Consider using MinGW.
 		exit 1
@@ -1572,7 +1567,6 @@ case $_host_os in
 		DEFINES="$DEFINES -DMACOSX"
 		LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI"
 		add_line_to_config_mk 'MACOSX = 1'
-		_posix=yes
 		;;
 	dreamcast)
 		DEFINES="$DEFINES -D__DC__ -DNONSTANDARD_PORT"
@@ -1598,7 +1592,6 @@ case $_host_os in
 	freebsd*)
 		LDFLAGS="$LDFLAGS -L/usr/local/lib"
 		CXXFLAGS="$CXXFLAGS -I/usr/local/include"
-		_posix=yes
 		;;
 	gamecube)
 		CXXFLAGS="$CXXFLAGS -Os -mogc -mcpu=750 -meabi -mhard-float"
@@ -1616,14 +1609,12 @@ case $_host_os in
 		DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		# Needs -lnetwork for the timidity MIDI driver
 		LIBS="$LIBS -lnetwork"
-		_posix=yes
 		_seq_midi=no
 		;;
 	irix*)
 		DEFINES="$DEFINES -DIRIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		LIBS="$LIBS -lmd -lfastm -lm"
 		_ranlib=:
-		_posix=yes
 		;;
 	linux* | uclinux*)
 		# When not cross-compiling, enable large file support, but don't
@@ -1631,7 +1622,6 @@ case $_host_os in
 		if test -z "$_host"; then
 			CXXFLAGS="$CXXFLAGS $(getconf LFS_CFLAGS 2>/dev/null)"
 		fi
-		_posix=yes
 		DEFINES="$DEFINES -DLUA_USE_POSIX"
 		;;
 	mingw*)
@@ -1642,7 +1632,6 @@ case $_host_os in
 		;;
 	mint*)
 		DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
-		_posix=yes
 		;;
 	n64)
 		DEFINES="$DEFINES -D__N64__ -DLIMIT_FPS -DNONSTANDARD_PORT"
@@ -1650,9 +1639,6 @@ case $_host_os in
 		DEFINES="$DEFINES -DDISABLE_FANCY_THEMES -DDISABLE_DOSBOX_OPL -DDISABLE_SID -DDISABLE_NES_APU"
 		DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
 		;;
-	os2-emx*)
-		_posix=yes	# FIXME??? Why??
-		;;
 	ps2)
 		# TODO ps2
 		CXXFLAGS="$CXXFLAGS -G2"
@@ -1669,7 +1655,6 @@ case $_host_os in
 		DEFINES="$DEFINES -DSOLARIS -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		# Needs -lbind -lsocket for the timidity MIDI driver
 		LIBS="$LIBS -lnsl -lsocket"
-		_posix=yes
 		;;
 	webos)
 		CXXFLAGS="$CXXFLAGS -I$WEBOS_PDK/include -I$WEBOS_PDK/include/SDL -I$WEBOS_PDK/device/usr/include"
@@ -1679,7 +1664,6 @@ case $_host_os in
 		LDFLAGS="$LDFLAGS -Wl,--allow-shlib-undefined"
 		LDFLAGS="$LDFLAGS --sysroot=$WEBOS_PDK/arm-gcc/sysroot"
 		add_line_to_config_mk "WEBOS_SDK = $WEBOS_SDK"
-		_posix=yes
 		_seq_midi=no
 		;;
 	wii)
@@ -1699,19 +1683,42 @@ case $_host_os in
 		DEFINES="$DEFINES -D__ARM__ -D_ARM_ -DUNICODE -DFPM_DEFAULT -DNONSTANDARD_PORT"
 		DEFINES="$DEFINES -DWIN32 -Dcdecl= -D__cdecl__="
 		;;
-	# given this is a shell script assume some type of posix
-	*)
-		echo "WARNING: could not establish system type, assuming unix like"
+esac
+
+#
+# Determine whether host is POSIX compliant, or at least POSIX
+# compatible enough to support our POSIX code (including dlsym(),
+# mkdir() and some other APIs).
+#
+# TODO: Instead of basing this on the host name, we should really base
+# this on the presence of features (such as the dlsym and mkdir APIs).
+#
+echo_n "Checking if host is POSIX compliant... "
+case $_host_os in
+	amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | psp | wii | wince)
+		;;
+	android | beos* | bsd* | darwin* | freebsd* | gph-linux | haiku* | hpux* | iphone | irix* | linux* | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
 		_posix=yes
 		;;
+	os2-emx*)
+		_posix=yes	# FIXME: Really???
+		;;
+	*)
+		# given this is a shell script, we might assume some type of posix.
+		# However, the host system might be a totally different one, so
+		# we can assume nothing about it.
+		# Indeed, as mentioned further above, we really should test for the
+		# presences of relevant APIs on the host anyway...
+		_posix=no
+		;;
 esac
+echo $_posix
 
 if test -n "$_host"; then
 	# Cross-compiling mode - add your target here if needed
 	echo "Cross-compiling to $_host"
 	case "$_host" in
 		android | android-v7a)
-			_posix=yes
 			# we link a .so as default
 			LDFLAGS="$LDFLAGS -shared -Wl,-Bsymbolic,--no-undefined"
 			HOSTEXEPRE=lib
@@ -1724,11 +1731,9 @@ if test -n "$_host"; then
 			_timidity=no
 			;;
 		arm-linux|arm*-linux-gnueabi|arm-*-linux)
-			_posix=yes
 			;;
 		arm-riscos|linupy)
 			DEFINES="$DEFINES -DLINUPY"
-			_posix=yes
 			;;
 		bfin*)
 			;;
@@ -1744,7 +1749,6 @@ if test -n "$_host"; then
 			fi
 			CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
 			ASFLAGS="$ASFLAGS"
-			_posix=yes
 			_backend="gph"
 			_build_hq_scalers=no
 			_vkeybd=yes
@@ -1818,7 +1822,6 @@ if test -n "$_host"; then
 			CXXFLAGS="$CXXFLAGS -march=armv4t"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
 			LDFLAGS="$LDFLAGS -static"
-			_posix=yes
 			_backend="gph"
 			_build_hq_scalers=no
 			_vkeybd=yes
@@ -1836,7 +1839,6 @@ if test -n "$_host"; then
 			fi
 			CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
-			_posix=yes
 			_backend="gph"
 			_build_hq_scalers=no
 			_vkeybd=yes
@@ -1847,14 +1849,12 @@ if test -n "$_host"; then
 			;;
 		iphone)
 			DEFINES="$DEFINES -DIPHONE"
-			_posix=yes
 			_backend="iphone"
 			_build_hq_scalers=no
 			_seq_midi=no
 			;;
 		m68k-atari-mint)
 			DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
-			_posix=yes
 			_ranlib=m68k-atari-mint-ranlib
 			_ar="m68k-atari-mint-ar cru"
 			_seq_midi=no
@@ -1872,7 +1872,6 @@ if test -n "$_host"; then
 		motoezx)
 			DEFINES="$DEFINES -DMOTOEZX"
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
-			_posix=yes
 			_backend="linuxmoto"
 			_build_hq_scalers=no
 			_mt32emu=no
@@ -1883,7 +1882,6 @@ if test -n "$_host"; then
 		motomagx)
 			DEFINES="$DEFINES -DMOTOMAGX"
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
-			_posix=yes
 			_backend="linuxmoto"
 			_build_hq_scalers=no
 			_mt32emu=no
@@ -1915,7 +1913,6 @@ if test -n "$_host"; then
 			;;
 		neuros)
 			DEFINES="$DEFINES -DNEUROS"
-			_posix=yes
 			_backend='null'
 			_build_hq_scalers=no
 			_mt32emu=no
@@ -1930,7 +1927,6 @@ if test -n "$_host"; then
 			fi
 			CXXFLAGS="$CXXFLAGS -march=armv7-a -mtune=cortex-a8 -mfpu=neon"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
-			_posix=yes
 			_backend="openpandora"
 			_build_hq_scalers=yes
 			_vkeybd=no
@@ -1979,13 +1975,11 @@ if test -n "$_host"; then
 			DEFINES="$DEFINES -DSAMSUNGTV -DDISABLE_COMMAND_LINE"
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
 			HOSTEXEEXT=".so"
-			_posix=yes
 			_backend="samsungtv"
 			_mt32emu=no
 			_vkeybd=yes
 			;;
 		webos)
-			_posix=yes
 			_backend="webos"
 			_port_mk="backends/platform/webos/webos.mk"
 			_build_scalers=no


Commit: 8387b68c5758819789a0f555abadb089a7c500b1
    https://github.com/scummvm/scummvm/commit/8387b68c5758819789a0f555abadb089a7c500b1
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:24:37-07:00

Commit Message:
BUILD: Add only one -D to DEFINES per line; add FIXMEs to -D in CXXFLAGS

Changed paths:
    configure



diff --git a/configure b/configure
index 69fffc7..a2542da 100755
--- a/configure
+++ b/configure
@@ -1153,7 +1153,9 @@ if test "$_release_build" = yes; then
 	# makes it possible to use -Wuninitialized, so let's do that.
 	# We will also add a define, which indicates we are doing
 	# an build for a release version.
-	CXXFLAGS="$CXXFLAGS -O2 -Wuninitialized -DRELEASE_BUILD"
+	CXXFLAGS="$CXXFLAGS -O2 -Wuninitialized"
+	# FIXME: Why is the following in CXXFLAGS and not in DEFINES? Change or document this.
+	CXXFLAGS="$CXXFLAGS -DRELEASE_BUILD"
 fi
 
 
@@ -1541,6 +1543,7 @@ case $_host_os in
 		fi
 		CXXFLAGS="$CXXFLAGS -finline-limit=300"
 		CXXFLAGS="$CXXFLAGS -Os -mthumb-interwork"
+		# FIXME: Why is the following in CXXFLAGS and not in DEFINES? Change or document this.
 		CXXFLAGS="$CXXFLAGS -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__"
 		CXXFLAGS="$CXXFLAGS -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__"
 		# supress 'mangling of 'va_list' has changed in GCC 4.4'
@@ -1569,11 +1572,16 @@ case $_host_os in
 		add_line_to_config_mk 'MACOSX = 1'
 		;;
 	dreamcast)
-		DEFINES="$DEFINES -D__DC__ -DNONSTANDARD_PORT"
+		DEFINES="$DEFINES -D__DC__"
+		DEFINES="$DEFINES -DNONSTANDARD_PORT"
 		;;
 	ds)
 		# TODO Nintendo DS
-		DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT"
+		DEFINES="$DEFINES -D__DS__"
+		DEFINES="$DEFINES -DNDS"
+		DEFINES="$DEFINES -DARM9"
+		DEFINES="$DEFINES -DARM"
+		DEFINES="$DEFINES -DNONSTANDARD_PORT"
 		CXXFLAGS="$CXXFLAGS -isystem $DEVKITPRO/libnds/include -isystem $DEVKITPRO/devkitARM/arm-eabi/include"
 		CXXFLAGS="$CXXFLAGS -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -mthumb-interwork"
 		CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections -fno-strict-aliasing"
@@ -1612,7 +1620,8 @@ case $_host_os in
 		_seq_midi=no
 		;;
 	irix*)
-		DEFINES="$DEFINES -DIRIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+		DEFINES="$DEFINES -DIRIX"
+		DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		LIBS="$LIBS -lmd -lfastm -lm"
 		_ranlib=:
 		;;
@@ -1625,7 +1634,8 @@ case $_host_os in
 		DEFINES="$DEFINES -DLUA_USE_POSIX"
 		;;
 	mingw*)
-		DEFINES="$DEFINES -DWIN32 -D__USE_MINGW_ANSI_STDIO=0"
+		DEFINES="$DEFINES -DWIN32"
+		DEFINES="$DEFINES -D__USE_MINGW_ANSI_STDIO=0"
 		LIBS="$LIBS -lmingw32 -lwinmm"
 		OBJS="$OBJS scummvmwinres.o"
 		add_line_to_config_mk 'WIN32 = 1'
@@ -1634,25 +1644,35 @@ case $_host_os in
 		DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		;;
 	n64)
-		DEFINES="$DEFINES -D__N64__ -DLIMIT_FPS -DNONSTANDARD_PORT"
-		DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_COMMAND_LINE"
-		DEFINES="$DEFINES -DDISABLE_FANCY_THEMES -DDISABLE_DOSBOX_OPL -DDISABLE_SID -DDISABLE_NES_APU"
+		DEFINES="$DEFINES -D__N64__"
+		DEFINES="$DEFINES -DLIMIT_FPS"
+		DEFINES="$DEFINES -DNONSTANDARD_PORT"
+		DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
+		DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
+		DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+		DEFINES="$DEFINES -DDISABLE_FANCY_THEMES"
+		DEFINES="$DEFINES -DDISABLE_NES_APU"
+		DEFINES="$DEFINES -DDISABLE_SID"
 		DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
 		;;
 	ps2)
 		# TODO ps2
 		CXXFLAGS="$CXXFLAGS -G2"
-		DEFINES="$DEFINES -D_EE -D__PLAYSTATION2__"
+		DEFINES="$DEFINES -D_EE"
+		DEFINES="$DEFINES -D__PLAYSTATION2__"
 		;;
 	psp)
 		if test -d "$PSPDEV/psp/lib"; then
 			LDFLAGS="$LDFLAGS -L$PSPDEV/psp/lib"
 		fi
 		LDFLAGS="$LDFLAGS -L$PSPSDK/lib -specs=$_srcdir/backends/platform/psp/psp.spec"
-		CXXFLAGS="$CXXFLAGS -O3 -I$PSPSDK/include -D_PSP_FW_VERSION=150"
+		CXXFLAGS="$CXXFLAGS -O3 -I$PSPSDK/include"
+		# FIXME: Why is the following in CXXFLAGS and not in DEFINES? Change or document this.
+		CXXFLAGS="$CXXFLAGS -D_PSP_FW_VERSION=150"
 		;;
 	solaris*)
-		DEFINES="$DEFINES -DSOLARIS -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+		DEFINES="$DEFINES -DSOLARIS"
+		DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		# Needs -lbind -lsocket for the timidity MIDI driver
 		LIBS="$LIBS -lnsl -lsocket"
 		;;
@@ -1679,9 +1699,16 @@ case $_host_os in
 		fi
 		;;
 	wince)
-		CXXFLAGS="$CXXFLAGS -O3 -fno-inline-functions -march=armv4 -mtune=xscale -D_WIN32_WCE=300 "
-		DEFINES="$DEFINES -D__ARM__ -D_ARM_ -DUNICODE -DFPM_DEFAULT -DNONSTANDARD_PORT"
-		DEFINES="$DEFINES -DWIN32 -Dcdecl= -D__cdecl__="
+		CXXFLAGS="$CXXFLAGS -O3 -fno-inline-functions -march=armv4 -mtune=xscale"
+		DEFINES="$DEFINES -D_WIN32_WCE=300"
+		DEFINES="$DEFINES -D__ARM__"
+		DEFINES="$DEFINES -D_ARM_"
+		DEFINES="$DEFINES -DUNICODE"
+		DEFINES="$DEFINES -DFPM_DEFAULT"
+		DEFINES="$DEFINES -DNONSTANDARD_PORT"
+		DEFINES="$DEFINES -DWIN32"
+		DEFINES="$DEFINES -Dcdecl="
+		DEFINES="$DEFINES -D__cdecl__="
 		;;
 esac
 
@@ -1740,7 +1767,8 @@ if test -n "$_host"; then
 		caanoo)
 			# This uses the GPH backend.
 			DEFINES="$DEFINES -DGPH_DEVICE"
-			DEFINES="$DEFINES -DCAANOO -DREDUCE_MEMORY_USAGE"
+			DEFINES="$DEFINES -DCAANOO"
+			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
 			if test "$_debug_build" = yes; then
 				DEFINES="$DEFINES -DGPH_DEBUG"
 			else
@@ -1762,7 +1790,9 @@ if test -n "$_host"; then
 			_strip=$_host-strip
 			;;
 		dingux)
-			DEFINES="$DEFINES -DDINGUX -DDISABLE_DOSBOX_OPL -DREDUCE_MEMORY_USAGE"
+			DEFINES="$DEFINES -DDINGUX"
+			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
 			ASFLAGS="$ASFLAGS"
 			CXXFLAGS="$CXXFLAGS -msoft-float -mips32"
 			_backend="dingux"
@@ -1777,7 +1807,9 @@ if test -n "$_host"; then
 			_port_mk="backends/platform/dingux/dingux.mk"
 			;;
 		dreamcast)
-			DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE"
+			DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
+			DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE"
+			DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
 			CXXFLAGS="$CXXFLAGS -O3 -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks"
 			_backend="dc"
 			_build_scalers=no
@@ -1788,11 +1820,14 @@ if test -n "$_host"; then
 			;;
 		ds)
 			# TODO: complete this
-			DEFINES="$DEFINES -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555"
-			DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
-			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE -DSTREAM_AUDIO_FROM_DISK"
-			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL -DDISABLE_SID -DDISABLE_NES_APU"
 			DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
+			DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
+			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+			DEFINES="$DEFINES -DDISABLE_FANCY_THEMES"
+			DEFINES="$DEFINES -DDISABLE_SID -DDISABLE_NES_APU"
+			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
+			DEFINES="$DEFINES -DSTREAM_AUDIO_FROM_DISK"
+			DEFINES="$DEFINES -DVECTOR_RENDERER_FORMAT=1555"
 			add_line_to_config_h '#define DISABLE_TEXT_CONSOLE'
 			_backend="ds"
 			_build_scalers=no
@@ -1815,7 +1850,8 @@ if test -n "$_host"; then
 		gp2x)
 			# This uses the GPH backend.
 			DEFINES="$DEFINES -DGPH_DEVICE"	
-			DEFINES="$DEFINES -DGP2X -DREDUCE_MEMORY_USAGE"
+			DEFINES="$DEFINES -DGP2X"
+			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
 			if test "$_debug_build" = yes; then
 				DEFINES="$DEFINES -DGPH_DEBUG"
 			fi
@@ -1833,7 +1869,8 @@ if test -n "$_host"; then
 		gp2xwiz)
 			# This uses the GPH backend.
 			DEFINES="$DEFINES -DGPH_DEVICE"
-			DEFINES="$DEFINES -DGP2XWIZ -DREDUCE_MEMORY_USAGE"
+			DEFINES="$DEFINES -DGP2XWIZ"
+			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
 			if test "$_debug_build" = yes; then
 				DEFINES="$DEFINES -DGPH_DEBUG"
 			fi
@@ -1918,7 +1955,8 @@ if test -n "$_host"; then
 			_mt32emu=no
 			;;
 		openpandora)
-			DEFINES="$DEFINES -DOPENPANDORA -DREDUCE_MEMORY_USAGE"
+			DEFINES="$DEFINES -DOPENPANDORA"
+			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
 			if test "$_release_build" = no; then
 				DEFINES="$DEFINES -DOP_DEBUG"
 			else
@@ -1938,8 +1976,11 @@ if test -n "$_host"; then
 			;;
 		ps2)
 			# TODO: complete this
-			DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DDISABLE_DOSBOX_OPL"
-			DEFINES="$DEFINES -DDISABLE_SID -DDISABLE_NES_APU"
+			DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE"
+			DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
+			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+			DEFINES="$DEFINES -DDISABLE_SID"
+			DEFINES="$DEFINES -DDISABLE_NES_APU"
 			_backend="ps2"
 			_build_scalers=no
 			_mt32emu=no
@@ -1972,7 +2013,8 @@ if test -n "$_host"; then
 			_port_mk="backends/platform/psp/psp.mk"
 			;;
 		samsungtv)
-			DEFINES="$DEFINES -DSAMSUNGTV -DDISABLE_COMMAND_LINE"
+			DEFINES="$DEFINES -DSAMSUNGTV"
+			DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
 			HOSTEXEEXT=".so"
 			_backend="samsungtv"
@@ -2128,7 +2170,8 @@ case $_backend in
 		;;
 	ps2)
 		# TODO ps2
-		DEFINES="$DEFINES -D_EE -DFORCE_RTL"
+		DEFINES="$DEFINES -D_EE"
+		DEFINES="$DEFINES -DFORCE_RTL"
 		INCLUDES="$INCLUDES -I$PS2SDK/ee/include -I$PS2SDK/common/include -I$PS2SDK/ports/include"
 		if test "$_dynamic_modules" = no ; then
 			LDFLAGS="$LDFLAGS -mno-crt0 $PS2SDK/ee/startup/crt0.o -T $PS2SDK/ee/startup/linkfile"
@@ -2137,7 +2180,9 @@ case $_backend in
 		LIBS="$LIBS -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lm -lc -lfileXio -lkernel -lstdc++ "
 		;;
 	psp)
-		DEFINES="$DEFINES -D__PSP__ -DDISABLE_COMMAND_LINE -DDISABLE_DOSBOX_OPL"
+		DEFINES="$DEFINES -D__PSP__"
+		DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
+		DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
 		LIBS="$LIBS -lpng -Wl,-Map,mapfile.txt"
 		;;
 	samsungtv)
@@ -2147,11 +2192,13 @@ case $_backend in
 	webos)
 		# There is no sdl-config in the WebOS PDK so we don't use find_sdlconfig here.
 		LIBS="$LIBS -lSDL"
-		DEFINES="$DEFINES -DSDL_BACKEND -DWEBOS"
+		DEFINES="$DEFINES -DSDL_BACKEND"
+		DEFINES="$DEFINES -DWEBOS"
 		MODULES="$MODULES backends/platform/sdl"
 		;;
 	wii)
-		DEFINES="$DEFINES -D__WII__ -DGEKKO"
+		DEFINES="$DEFINES -D__WII__"
+		DEFINES="$DEFINES -DGEKKO"
 		case $_host_os in
 		gamecube)
 			LIBS="$LIBS -lgxflux -liso9660 -lfat -logc -ldb"


Commit: 717a7accf5f4c58e4b4b9187ee349841163c3896
    https://github.com/scummvm/scummvm/commit/717a7accf5f4c58e4b4b9187ee349841163c3896
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:24:37-07:00

Commit Message:
BUILD: Always enable indeo3 codec

Changed paths:
    configure
    devtools/create_project/create_project.cpp
    video/avi_decoder.cpp
    video/codecs/indeo3.cpp
    video/codecs/indeo3.h
    video/coktel_decoder.cpp



diff --git a/configure b/configure
index a2542da..a86bff7 100755
--- a/configure
+++ b/configure
@@ -145,7 +145,6 @@ _text_console=no
 _mt32emu=yes
 _build_scalers=yes
 _build_hq_scalers=yes
-_indeo3=auto
 _enable_prof=no
 _posix=no
 _global_constructors=no
@@ -746,8 +745,6 @@ Optional Libraries:
   --with-opengl-prefix=DIR Prefix where OpenGL (ES) is installed (optional)
   --disable-opengl         disable OpenGL (ES) support [autodetect]
 
-  --disable-indeo3         disable Indeo3 decoder [autodetect]
-
   --with-png-prefix=DIR    Prefix where libpng is installed (optional)
   --disable-png            disable PNG decoder [autodetect]
 
@@ -806,8 +803,6 @@ for ac_option in $@; do
 	--enable-nasm)            _nasm=yes       ;;
 	--disable-nasm)           _nasm=no        ;;
 	--enable-mpeg2)           _mpeg2=yes      ;;
-	--disable-indeo3)         _indeo3=no      ;;
-	--enable-indeo3)          _indeo3=yes     ;;
 	--disable-png)            _png=no         ;;
 	--enable-png)             _png=yes        ;;
 	--disable-theoradec)      _theoradec=no   ;;
@@ -1935,7 +1930,6 @@ if test -n "$_host"; then
 			_backend="n64"
 			_mt32emu=no
 			_build_scalers=no
-			_indeo3=no
 			_translation=no
 			_keymapper=no
 			_text_console=no
@@ -2538,19 +2532,6 @@ define_in_config_if_yes "$_build_scalers" 'USE_SCALERS'
 define_in_config_if_yes "$_build_hq_scalers" 'USE_HQ_SCALERS'
 
 #
-# Check whether to compile the Indeo3 decoder
-#
-if test "$_indeo3" = auto ; then
-	# Autodetect. Build if either the gob engine or plugins are enabled
-	if test `get_engine_build gob` = yes || test "$_dynamic_modules" = yes ; then
-		_indeo3=yes
-	else
-		_indeo3=no
-	fi
-fi
-define_in_config_if_yes "$_indeo3" 'USE_INDEO3'
-
-#
 # Check for math lib
 #
 cat > $TMPC << EOF
@@ -3157,10 +3138,6 @@ if test "$_mt32emu" = yes ; then
 	echo_n ", MT-32 emu"
 fi
 
-if test "$_indeo3" = yes ; then
-	echo_n ", Indeo3 decoder"
-fi
-
 if test "$_text_console" = yes ; then
 	echo_n ", text console"
 fi
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index b75b22a..fd28882 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -738,7 +738,6 @@ const Feature s_features[] = {
 	{     "mt32emu",     "USE_MT32EMU",         "", true, "integrated MT-32 emulator" },
 	{        "nasm",        "USE_NASM",         "", true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling.
 	{      "opengl",      "USE_OPENGL", "opengl32", true, "OpenGL support" },
-	{      "indeo3",      "USE_INDEO3",         "", true, "Indeo3 codec support"},
 	{ "translation", "USE_TRANSLATION",         "", true, "Translation support" },
 	{      "vkeybd",   "ENABLE_VKEYBD",         "", false, "Virtual keyboard support"},
 	{  "langdetect",  "USE_DETECTLANG",         "", true, "System language detection support" } // This feature actually depends on "translation", there
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp
index e3fb2d0..9685952 100644
--- a/video/avi_decoder.cpp
+++ b/video/avi_decoder.cpp
@@ -399,10 +399,8 @@ Codec *AviDecoder::createCodec() {
 			return new MSRLEDecoder(_bmInfo.width, _bmInfo.height, _bmInfo.bitCount);
 		case ID_CVID:
 			return new CinepakDecoder(_bmInfo.bitCount);
-#ifdef USE_INDEO3
 		case ID_IV32:
 			return new Indeo3Decoder(_bmInfo.width, _bmInfo.height);
-#endif
 #ifdef VIDEO_CODECS_TRUEMOTION1_H
 		case ID_DUCK:
 			return new TrueMotion1Decoder(_bmInfo.width, _bmInfo.height);
diff --git a/video/codecs/indeo3.cpp b/video/codecs/indeo3.cpp
index 529f0b5..7bf7fc8 100644
--- a/video/codecs/indeo3.cpp
+++ b/video/codecs/indeo3.cpp
@@ -22,8 +22,6 @@
 
 #include "common/scummsys.h"
 
-#ifdef USE_INDEO3
-
 /* Intel Indeo 3 decompressor, derived from ffmpeg.
  *
  * Original copyright note: * Intel Indeo 3 (IV31, IV32, etc.) video decoder for ffmpeg
@@ -3516,5 +3514,3 @@ const uint32 Indeo3Decoder::correctionhighorder[] = {
 };
 
 } // End of namespace Video
-
-#endif // USE_INDEO3
diff --git a/video/codecs/indeo3.h b/video/codecs/indeo3.h
index c0a88fe..a07d779 100644
--- a/video/codecs/indeo3.h
+++ b/video/codecs/indeo3.h
@@ -22,8 +22,6 @@
 
 #include "common/scummsys.h"
 
-#ifdef USE_INDEO3
-
 /* Intel Indeo 3 decompressor, derived from ffmpeg.
  *
  * Original copyright note:
@@ -87,5 +85,3 @@ private:
 } // End of namespace Video
 
 #endif // VIDEO_CODECS_INDEO3_H
-
-#endif // USE_INDEO3
diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp
index ee4b22e..8ea2d08 100644
--- a/video/coktel_decoder.cpp
+++ b/video/coktel_decoder.cpp
@@ -1624,11 +1624,7 @@ bool VMDDecoder::openExternalCodec() {
 		if (_videoCodec == kVideoCodecIndeo3) {
 			_isPaletted = false;
 
-#ifdef USE_INDEO3
 			_codec = new Indeo3Decoder(_width, _height);
-#else
-			warning("VMDDecoder::openExternalCodec(): Indeo3 decoder not compiled in");
-#endif
 
 		} else {
 			warning("VMDDecoder::openExternalCodec(): Unknown video codec FourCC \"%s\"",


Commit: 4b7f6dfa3c8ca3ee614810007728e49ba2fd9e6e
    https://github.com/scummvm/scummvm/commit/4b7f6dfa3c8ca3ee614810007728e49ba2fd9e6e
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:24:37-07:00

Commit Message:
BUILD: Rename USE_TEXT_CONSOLE -> USE_TEXT_CONSOLE_FOR_DEBUGGER

This reduces the similarity in name to the otherwise mostly
unrelated DISABLE_TEXT_CONSOLE #define.

Changed paths:
    backends/platform/ds/arm9/makefile
    configure
    gui/debugger.cpp
    gui/debugger.h



diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index 7817382..65fb98e 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -245,7 +245,7 @@ ifdef USE_MAD
 	DEFINES += -DUSE_MAD
 endif
 
-DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE -DDISABLE_MASS_ADD -DDISABLE_NES_APU
+DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE_FOR_DEBUGGER -DDISABLE_MASS_ADD -DDISABLE_NES_APU
 
 LDFLAGS = -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt -Wl,--gc-sections
 
diff --git a/configure b/configure
index a86bff7..6697fcc 100755
--- a/configure
+++ b/configure
@@ -2869,7 +2869,7 @@ if test "$_readline" = yes ; then
 fi
 define_in_config_h_if_yes "$_readline" 'USE_READLINE'
 
-define_in_config_h_if_yes "$_text_console" 'USE_TEXT_CONSOLE'
+define_in_config_h_if_yes "$_text_console" 'USE_TEXT_CONSOLE_FOR_DEBUGGER'
 
 #
 # Check for OpenGL (ES)
diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index ab3fcef..2f49cb2 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -29,7 +29,7 @@
 #include "engines/engine.h"
 
 #include "gui/debugger.h"
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 	#include "gui/console.h"
 #elif defined(USE_READLINE)
 	#include <readline/readline.h>
@@ -44,7 +44,7 @@ Debugger::Debugger() {
 	_isActive = false;
 	_errStr = NULL;
 	_firstTime = true;
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 	_debuggerDialog = new GUI::ConsoleDialog(1.0f, 0.67f);
 	_debuggerDialog->setInputCallback(debuggerInputCallback, this);
 	_debuggerDialog->setCompletionCallback(debuggerCompletionCallback, this);
@@ -66,7 +66,7 @@ Debugger::Debugger() {
 }
 
 Debugger::~Debugger() {
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 	delete _debuggerDialog;
 #endif
 }
@@ -78,7 +78,7 @@ int Debugger::DebugPrintf(const char *format, ...) {
 
 	va_start(argptr, format);
 	int count;
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 	count = _debuggerDialog->vprintFormat(1, format, argptr);
 #else
 	count = ::vprintf(format, argptr);
@@ -125,7 +125,7 @@ void Debugger::onFrame() {
 	}
 }
 
-#if defined(USE_TEXT_CONSOLE) && defined(USE_READLINE)
+#if defined(USE_TEXT_CONSOLE_FOR_DEBUGGER) && defined(USE_READLINE)
 namespace {
 Debugger *g_readline_debugger;
 
@@ -140,7 +140,7 @@ void Debugger::enter() {
 	// TODO: Having three I/O methods #ifdef-ed in this file is not the
 	// cleanest approach to this...
 
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 	if (_firstTime) {
 		DebugPrintf("Debugger started, type 'exit' to return to the game.\n");
 		DebugPrintf("Type 'help' to see a little list of commands and variables.\n");
@@ -363,7 +363,7 @@ bool Debugger::tabComplete(const char *input, Common::String &completion) const
 	return true;
 }
 
-#if defined(USE_TEXT_CONSOLE) && defined(USE_READLINE)
+#if defined(USE_TEXT_CONSOLE_FOR_DEBUGGER) && defined(USE_READLINE)
 char *Debugger::readlineComplete(const char *input, int state) {
 	static CommandsMap::const_iterator iter;
 
@@ -417,7 +417,7 @@ bool Debugger::Cmd_Exit(int argc, const char **argv) {
 // Print a list of all registered commands (and variables, if any),
 // nicely word-wrapped.
 bool Debugger::Cmd_Help(int argc, const char **argv) {
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 	const int charsPerLine = _debuggerDialog->getCharsPerLine();
 #elif defined(USE_READLINE)
 	int charsPerLine, rows;
@@ -520,7 +520,7 @@ bool Debugger::Cmd_DebugFlagDisable(int argc, const char **argv) {
 }
 
 // Console handler
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 bool Debugger::debuggerInputCallback(GUI::ConsoleDialog *console, const char *input, void *refCon) {
 	Debugger *debugger = (Debugger *)refCon;
 
diff --git a/gui/debugger.h b/gui/debugger.h
index c6fce87..6da569e 100644
--- a/gui/debugger.h
+++ b/gui/debugger.h
@@ -29,7 +29,7 @@
 
 namespace GUI {
 
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 class ConsoleDialog;
 #endif
 
@@ -144,7 +144,7 @@ private:
 	 */
 	bool _firstTime;
 
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 	GUI::ConsoleDialog *_debuggerDialog;
 #endif
 
@@ -194,7 +194,7 @@ protected:
 	bool Cmd_DebugFlagEnable(int argc, const char **argv);
 	bool Cmd_DebugFlagDisable(int argc, const char **argv);
 
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 private:
 	static bool debuggerInputCallback(GUI::ConsoleDialog *console, const char *input, void *refCon);
 	static bool debuggerCompletionCallback(GUI::ConsoleDialog *console, const char *input, Common::String &completion, void *refCon);


Commit: d2e778bf0b4692e957c74a7749a75d6fd5ed214d
    https://github.com/scummvm/scummvm/commit/d2e778bf0b4692e957c74a7749a75d6fd5ed214d
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:24:38-07:00

Commit Message:
BUILD: Replace _need_memalign runtime test by hardcoded list

According to a discussion on -devel, this test cannot work reliably in
general: It cannot determine when unaligned access really works reliably
in all situations, nor on all implementations of the target CPU arch;
nor does it determine whether unaligned access is supported effectively
(as opposed to say supported via super-slow fault handler mechanism).

Changed paths:
    configure



diff --git a/configure b/configure
index 6697fcc..d230d58 100755
--- a/configure
+++ b/configure
@@ -2061,48 +2061,34 @@ fi
 # alignment can be a lot slower than regular access, so we don't want
 # to use it if we don't have to.
 #
-# So we do the following: First, for CPU families where we know whether
-# unaligned access is safe & fast, we enable / disable unaligned access
-# accordingly.
-# Otherwise, for cross compiled builds we just disable memory alignment.
-# For native builds, we run some test code that detects whether unaligned
-# access is supported (and is supported without an exception handler).
-#
-# NOTE: The only kinds of unaligned access we allow are for 2 byte and
-# 4 byte loads / stores. No promises are made for bigger sizes, such as
-# 8 or 16 byte loads, for which various architectures (e.g. x86 and PowerPC)
-# behave differently than for the smaller sizes).
+# So we do the following: For CPU families where we know whether unaligned
+# access is safe & fast, we enable / disable unaligned access accordingly.
+# Otherwise, we just disable memory alignment.
+#
+# NOTE: In the past, for non-cross compiled builds, we would also run some code
+# which would try to test whether unaligned access worked or not. But this test
+# could not reliably determine whether unaligned access really worked in all
+# situations (and across different implementations of the target CPU arch), nor
+# whether it was fast (as opposed to slowly emulated by fault handlers). Hence,
+# we do not use this approach anymore.
+#
+# NOTE: The only kinds of unaligned access we allow are for 2 byte and 4
+# byte loads / stores. No promises are made for bigger sizes, such as 8
+# or 16 byte loads, for which architectures may behave differently than
+# for the smaller sizes.
 echo_n "Alignment required... "
 case $_host_cpu in
+	i[3-6]86 | x86_64 | ppc*)
+		# Unaligned access should work
+		_need_memalign=no
+		;;
 	alpha* | arm* | bfin* | hp* | mips* | sh* | sparc* | ia64 | nv1*)
 		# Unaligned access is not supported or extremely slow.
 		_need_memalign=yes
 		;;
-	i[3-6]86 | x86_64 | ppc*)
-		# Unaligned access should work reasonably well
-		_need_memalign=no
-		;;
 	*)
-		if test -z "$_host"; then
-			# NOT in cross-compiling mode:
-			# Try to auto-detect....
-			cat > $TMPC << EOF
-#include <stdlib.h>
-#include <signal.h>
-int main(int argc, char **argv) {
-	unsigned char test[8] = { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88 };
-	signal(SIGBUS, exit);
-	signal(SIGABRT, exit);
-	signal(SIGSEGV, exit);
-	if (*((unsigned int *)(test + 1)) != 0x55443322 && *((unsigned int *)(test + 1)) != 0x22334455) {
-		return 1;
-	}
-	return 0;
-}
-EOF
-			cc_check_no_clean && $TMPO$HOSTEXEEXT && _need_memalign=no
-			cc_check_clean
-		fi
+		# Status of unaligned access is unknown, so assume the worst.
+		_need_memalign=yes
 		;;
 esac
 echo "$_need_memalign"


Commit: c439e08590f3e340d80c0c135f412893ddc0c8d5
    https://github.com/scummvm/scummvm/commit/c439e08590f3e340d80c0c135f412893ddc0c8d5
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:24:38-07:00

Commit Message:
BUILD: Declare RELEASE_BUILD in DEFINES, not CXXFLAGS

Changed paths:
    configure



diff --git a/configure b/configure
index d230d58..16a4e4c 100755
--- a/configure
+++ b/configure
@@ -1149,8 +1149,7 @@ if test "$_release_build" = yes; then
 	# We will also add a define, which indicates we are doing
 	# an build for a release version.
 	CXXFLAGS="$CXXFLAGS -O2 -Wuninitialized"
-	# FIXME: Why is the following in CXXFLAGS and not in DEFINES? Change or document this.
-	CXXFLAGS="$CXXFLAGS -DRELEASE_BUILD"
+	DEFINES="$DEFINES -DRELEASE_BUILD"
 fi
 
 


Commit: 652bf358c25784fe84aed473b555cbe4c836b34d
    https://github.com/scummvm/scummvm/commit/652bf358c25784fe84aed473b555cbe4c836b34d
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:40:07-07:00

Commit Message:
BUILD: Update comments

Changed paths:
    configure



diff --git a/configure b/configure
index 16a4e4c..4b86a8b 100755
--- a/configure
+++ b/configure
@@ -1376,6 +1376,9 @@ fi
 
 echo "$cxx_version"
 
+#
+# Bail out now if now useable compiler was found.
+#
 if test "$cxx_verc_fail" = yes ; then
 	echo
 	echo "The version of your compiler is not supported at this time"
@@ -1383,19 +1386,10 @@ if test "$cxx_verc_fail" = yes ; then
 	exit 1
 fi
 
-echocheck "whether -Wglobal-constructors work"
-cat > $TMPC << EOF
-int main() { return 0; }
-EOF
-cc_check -Wglobal-constructors && _global_constructors=yes
-
-if test "$_global_constructors" = yes; then
-	CXXFLAGS="$CXXFLAGS -Wglobal-constructors"
-fi
-echo $_global_constructors
-
 #
-# Do CXXFLAGS now that we know the compiler version
+# Setup compiler specific CXXFLAGS now that we know the compiler version.
+# Foremost, this means enabling various warnings.
+# In addition, we set CXX_UPDATE_DEP_FLAG for GCC >= 3.0 and for ICC.
 #
 if test "$have_gcc" = yes ; then
 	if test "$_cxx_major" -ge "3" ; then
@@ -1423,18 +1417,34 @@ elif test "$have_icc" = yes ; then
 	add_line_to_config_mk 'CXX_UPDATE_DEP_FLAG = -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" -MQ "$@" -MP'
 fi;
 
-# Some platforms use certain GNU extensions in header files
+# By default, we add -pedantic to the CXXFLAGS to catch some potentially
+# non-portable constructs, like use of GNU extensions.
+# However, some platforms use GNU extensions in system header files, so
+# for these we must not use -pedantic.
 case $_host_os in
 android | gamecube | psp | wii)
 	;;
 *)
-	# ICC does not support pedantic
+	# ICC does not support pedantic, while GCC and clang do.
 	if test "$have_icc" = no ; then
 		CXXFLAGS="$CXXFLAGS -pedantic"
 	fi
 	;;
 esac
 
+# If possible, we want to use -Wglobal-constructors
+# However, not all compilers support that, so check whether the active one does.
+echocheck "whether -Wglobal-constructors work"
+cat > $TMPC << EOF
+int main() { return 0; }
+EOF
+cc_check -Wglobal-constructors && _global_constructors=yes
+
+if test "$_global_constructors" = yes; then
+	CXXFLAGS="$CXXFLAGS -Wglobal-constructors"
+fi
+echo $_global_constructors
+
 #
 # Check for endianness
 #
@@ -1570,7 +1580,6 @@ case $_host_os in
 		DEFINES="$DEFINES -DNONSTANDARD_PORT"
 		;;
 	ds)
-		# TODO Nintendo DS
 		DEFINES="$DEFINES -D__DS__"
 		DEFINES="$DEFINES -DNDS"
 		DEFINES="$DEFINES -DARM9"
@@ -1650,7 +1659,6 @@ case $_host_os in
 		DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
 		;;
 	ps2)
-		# TODO ps2
 		CXXFLAGS="$CXXFLAGS -G2"
 		DEFINES="$DEFINES -D_EE"
 		DEFINES="$DEFINES -D__PLAYSTATION2__"
@@ -1813,7 +1821,6 @@ if test -n "$_host"; then
 			_port_mk="backends/platform/dc/dreamcast.mk"
 			;;
 		ds)
-			# TODO: complete this
 			DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
 			DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
 			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
@@ -1968,7 +1975,6 @@ if test -n "$_host"; then
 		ppc-amigaos)
 			;;
 		ps2)
-			# TODO: complete this
 			DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE"
 			DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
 			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
@@ -2119,7 +2125,6 @@ case $_backend in
 		DEFINES="$DEFINES -DDINGUX"
 		;;
 	ds)
-		# TODO ds
 		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/arm9/source'
 		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/commoninclude'
 		INCLUDES="$INCLUDES "'-Ibackends/platform/ds/arm9/data'
@@ -2148,7 +2153,6 @@ case $_backend in
 	openpandora)
 		;;
 	ps2)
-		# TODO ps2
 		DEFINES="$DEFINES -D_EE"
 		DEFINES="$DEFINES -DFORCE_RTL"
 		INCLUDES="$INCLUDES -I$PS2SDK/ee/include -I$PS2SDK/common/include -I$PS2SDK/ports/include"


Commit: 6e157fd2d4ee1cc5de5b4950ca499ba28f1f153e
    https://github.com/scummvm/scummvm/commit/6e157fd2d4ee1cc5de5b4950ca499ba28f1f153e
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T04:40:45-07:00

Commit Message:
BUILD: Do not define LUA_USE_POSIX

It doesn't really do anything useful anymore anyway (except
make linux builds use _setjmp instead of setjmp, but both
are equally bad for us and need to replaced anyway).

Changed paths:
    configure



diff --git a/configure b/configure
index 4b86a8b..23eb329 100755
--- a/configure
+++ b/configure
@@ -1634,7 +1634,6 @@ case $_host_os in
 		if test -z "$_host"; then
 			CXXFLAGS="$CXXFLAGS $(getconf LFS_CFLAGS 2>/dev/null)"
 		fi
-		DEFINES="$DEFINES -DLUA_USE_POSIX"
 		;;
 	mingw*)
 		DEFINES="$DEFINES -DWIN32"






More information about the Scummvm-git-logs mailing list