[Scummvm-cvs-logs] SF.net SVN: scummvm: [24008] scummvm/trunk

sev at users.sourceforge.net sev at users.sourceforge.net
Fri Sep 29 10:24:31 CEST 2006


Revision: 24008
          http://svn.sourceforge.net/scummvm/?rev=24008&view=rev
Author:   sev
Date:     2006-09-29 01:14:27 -0700 (Fri, 29 Sep 2006)

Log Message:
-----------
First pahse of renaming simon engine to agos. Internal renames. Compilation
is broken

Modified Paths:
--------------
    scummvm/trunk/backends/platform/PalmOS/Src/modules.cpp
    scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_simon.h
    scummvm/trunk/backends/platform/PalmOS/Src/prefixes/compile.h
    scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_simon.h
    scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.cpp
    scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.h
    scummvm/trunk/backends/platform/ds/arm9/makefile
    scummvm/trunk/backends/platform/gp32/Makefile
    scummvm/trunk/backends/platform/maemo/Makefile
    scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl
    scummvm/trunk/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
    scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in
    scummvm/trunk/backends/platform/symbian/mmp/scummvm_simon.mmp.in
    scummvm/trunk/backends/platform/symbian/src/main_features.inl
    scummvm/trunk/base/plugins.cpp
    scummvm/trunk/configure
    scummvm/trunk/dists/devcpp/scummvm.dev
    scummvm/trunk/dists/devcpp/simon.dev
    scummvm/trunk/dists/msevc4/PocketSCUMM.vcw
    scummvm/trunk/dists/msevc4/simon/simon.vcp
    scummvm/trunk/dists/msvc6/scummvm.dsp
    scummvm/trunk/dists/msvc6/scummvm.dsw
    scummvm/trunk/dists/msvc6/simon.dsp
    scummvm/trunk/dists/msvc7/scummvm.sln
    scummvm/trunk/dists/msvc7/scummvm.vcproj
    scummvm/trunk/dists/msvc7/simon.vcproj
    scummvm/trunk/dists/msvc71/scummvm.sln
    scummvm/trunk/dists/msvc71/scummvm.vcproj
    scummvm/trunk/dists/msvc71/simon.vcproj
    scummvm/trunk/dists/msvc8/scummvm.sln
    scummvm/trunk/dists/msvc8/scummvm.vcproj
    scummvm/trunk/dists/msvc8/simon.vcproj
    scummvm/trunk/engines/engines.mk
    scummvm/trunk/engines/simon/animation.cpp
    scummvm/trunk/engines/simon/charset.cpp
    scummvm/trunk/engines/simon/cursor.cpp
    scummvm/trunk/engines/simon/debug.cpp
    scummvm/trunk/engines/simon/debug.h
    scummvm/trunk/engines/simon/debugger.cpp
    scummvm/trunk/engines/simon/debugger.h
    scummvm/trunk/engines/simon/draw.cpp
    scummvm/trunk/engines/simon/event.cpp
    scummvm/trunk/engines/simon/game.cpp
    scummvm/trunk/engines/simon/icons.cpp
    scummvm/trunk/engines/simon/intern.h
    scummvm/trunk/engines/simon/items.cpp
    scummvm/trunk/engines/simon/midi.cpp
    scummvm/trunk/engines/simon/midi.h
    scummvm/trunk/engines/simon/module.mk
    scummvm/trunk/engines/simon/oracle.cpp
    scummvm/trunk/engines/simon/res.cpp
    scummvm/trunk/engines/simon/rooms.cpp
    scummvm/trunk/engines/simon/saveload.cpp
    scummvm/trunk/engines/simon/simon.cpp
    scummvm/trunk/engines/simon/simon.h
    scummvm/trunk/engines/simon/sound.cpp
    scummvm/trunk/engines/simon/sound.h
    scummvm/trunk/engines/simon/string.cpp
    scummvm/trunk/engines/simon/subroutine.cpp
    scummvm/trunk/engines/simon/verb.cpp
    scummvm/trunk/engines/simon/vga.cpp
    scummvm/trunk/engines/simon/vga.h
    scummvm/trunk/engines/simon/window.cpp

Modified: scummvm/trunk/backends/platform/PalmOS/Src/modules.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/modules.cpp	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/backends/platform/PalmOS/Src/modules.cpp	2006-09-29 08:14:27 UTC (rev 24008)
@@ -175,7 +175,7 @@
 			result = GET_MODEARM;
 #else
 #	if	!defined(DISABLE_SCUMM) || \
-		!defined(DISABLE_SIMON) || \
+		!defined(DISABLE_AGOS) || \
 		!defined(DISABLE_SWORD1)
 			result = GET_DATACOMMON|GET_DATAENGINE|GET_MODE68K;
 #	else

Modified: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_simon.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_simon.h	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/68k_simon.h	2006-09-29 08:14:27 UTC (rev 24008)
@@ -2,7 +2,7 @@
 #define PREFIX_H
 
 #include "compile.h"
-#undef DISABLE_SIMON
+#undef DISABLE_AGOS
 
 #define PALMOS_68K
 

Modified: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/compile.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/compile.h	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/compile.h	2006-09-29 08:14:27 UTC (rev 24008)
@@ -29,7 +29,7 @@
 #define DISABLE_SCUMM_7_8
 #define DISABLE_HE
 
-#define DISABLE_SIMON
+#define DISABLE_AGOS
 #define DISABLE_SKY
 #define DISABLE_SWORD1
 #define DISABLE_SWORD2

Modified: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_simon.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_simon.h	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_simon.h	2006-09-29 08:14:27 UTC (rev 24008)
@@ -2,6 +2,6 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#undef DISABLE_SIMON
+#undef DISABLE_AGOS
 
 #endif

Modified: scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.cpp	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.cpp	2006-09-29 08:14:27 UTC (rev 24008)
@@ -47,10 +47,10 @@
 		CALL_INIT(PlayerV2)
 		CALL_INIT(Scumm_md5table)
 #endif
-#ifndef DISABLE_SIMON
-		CALL_INIT(Simon_Simon)
-		CALL_INIT(Simon_Cursor)
-		CALL_INIT(Simon_Charset)
+#ifndef DISABLE_AGOS
+		CALL_INIT(AGOS_AGOS)
+		CALL_INIT(AGOS_Cursor)
+		CALL_INIT(AGOS_Charset)
 #endif
 #ifndef DISABLE_SKY
 		CALL_INIT(Sky_Hufftext)
@@ -88,10 +88,10 @@
 		CALL_RELEASE(PlayerV2)
 		CALL_RELEASE(Scumm_md5table)
 #endif
-#ifndef DISABLE_SIMON
-		CALL_RELEASE(Simon_Simon)
-		CALL_RELEASE(Simon_Cursor)
-		CALL_RELEASE(Simon_Charset)
+#ifndef DISABLE_AGOS
+		CALL_RELEASE(AGOS_AGOS)
+		CALL_RELEASE(AGOS_AGOS)
+		CALL_RELEASE(AGOS_AGOS)
 #endif
 #ifndef DISABLE_SKY
 		CALL_RELEASE(Sky_Hufftext)

Modified: scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.h	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/backends/platform/PalmOS/Src/scumm_globals.h	2006-09-29 08:14:27 UTC (rev 24008)
@@ -63,11 +63,11 @@
 PROTO_GLOBALS(PlayerV2)
 PROTO_GLOBALS(Scumm_md5table)
 #endif
-// Simon stuffs
-#ifndef DISABLE_SIMON
-PROTO_GLOBALS(Simon_Simon)
-PROTO_GLOBALS(Simon_Cursor)
-PROTO_GLOBALS(Simon_Charset)
+// AGOS stuffs
+#ifndef DISABLE_AGOS
+PROTO_GLOBALS(AGOS_AGOS)
+PROTO_GLOBALS(AGOS_Cursor)
+PROTO_GLOBALS(AGOS_Charset)
 #endif
 // Sky stuffs
 #ifndef DISABLE_SKY

Modified: scummvm/trunk/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/makefile	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/backends/platform/ds/arm9/makefile	2006-09-29 08:14:27 UTC (rev 24008)
@@ -21,7 +21,7 @@
 	DISABLE_HE = 1
 	#DISABLE_SCUMM = 1
 	DISABLE_SCUMM_7_8 = 1
-	DISABLE_SIMON = 1
+	DISABLE_AGOS = 1
 	DISABLE_SKY = 1
 	DISABLE_SWORD1 = 1
 	DISABLE_SWORD2 = 1
@@ -40,7 +40,7 @@
 	DISABLE_HE = 1
 	DISABLE_SCUMM = 1
 	DISABLE_SCUMM_7_8 = 1
-	#DISABLE_SIMON = 1
+	#DISABLE_AGOS = 1
 	DISABLE_SKY = 1
 	DISABLE_SWORD1 = 1
 	DISABLE_SWORD2 = 1
@@ -59,7 +59,7 @@
 	DISABLE_HE = 1
 	DISABLE_SCUMM = 1
 	DISABLE_SCUMM_7_8 = 1
-	DISABLE_SIMON = 1
+	DISABLE_AGOS = 1
 	DISABLE_SKY = 1
 	DISABLE_SWORD1 = 1
 	DISABLE_SWORD2 = 1

Modified: scummvm/trunk/backends/platform/gp32/Makefile
===================================================================
--- scummvm/trunk/backends/platform/gp32/Makefile	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/backends/platform/gp32/Makefile	2006-09-29 08:14:27 UTC (rev 24008)
@@ -159,7 +159,7 @@
 DISABLE_SCUMM_7_8 = 1
 DISABLE_HE = 1
 
-#DISABLE_SIMON = 1
+#DISABLE_AGOS = 1
 #DISABLE_SKY = 1
 #DISABLE_QUEEN = 1
 #DISABLE_GOB = 1

Modified: scummvm/trunk/backends/platform/maemo/Makefile
===================================================================
--- scummvm/trunk/backends/platform/maemo/Makefile	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/backends/platform/maemo/Makefile	2006-09-29 08:14:27 UTC (rev 24008)
@@ -7,7 +7,7 @@
 
 #DISABLE_SCUMM = 1
 #DISABLE_HE = 1
-DISABLE_SIMON = 1
+DISABLE_AGOS = 1
 DISABLE_SKY = 1
 DISABLE_SWORD1 = 1
 DISABLE_SWORD2 = 1

Modified: scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl
===================================================================
--- scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl	2006-09-29 08:14:27 UTC (rev 24008)
@@ -8,7 +8,7 @@
 @mmp_files = (
 	"mmp/scummvm_scumm.mmp", 
 	"mmp/scummvm_queen.mmp", 
-	"mmp/scummvm_simon.mmp", 
+	"mmp/scummvm_agos.mmp", 
 	"mmp/scummvm_sky.mmp", 
 	"mmp/scummvm_gob.mmp", 
 	"mmp/scummvm_saga.mmp", 
@@ -74,7 +74,7 @@
 chdir("engines/");
 ParseModule("_scumm",	"scumm",	\@sections_scumm);
 ParseModule("_queen",	"queen",	\@section_empty);
-ParseModule("_simon",	"simon",	\@section_empty);
+ParseModule("_agos",	"agos",		\@section_empty);
 ParseModule("_sky",		"sky",		\@section_empty);
 ParseModule("_gob",		"gob",		\@section_empty);
 ParseModule("_saga",	"saga",		\@section_empty);

Modified: scummvm/trunk/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
===================================================================
--- scummvm/trunk/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl	2006-09-29 08:14:27 UTC (rev 24008)
@@ -87,8 +87,8 @@
 	# $SDK_Variations{'UIQ2'}{''} would produce:
 	#   scummvm-051101-SymbianUIQ2.sis
 
-	# $SDK_Variations{'S60v2'}{'simon'} would produce:
-	#   scummvm-051101-SymbianS60v2_simon.sis
+	# $SDK_Variations{'S60v2'}{'agos'} would produce:
+	#   scummvm-051101-SymbianS60v2_agos.sis
 
 	# $SDK_Variations{'ALL'}{'queen'} with all $SDK_RootDirs defined would produce:
 	#   scummvm-051101-SymbianUIQ2_queen.sis
@@ -102,7 +102,7 @@
 	$SDK_Variations{'UIQ2'}{'test'} = "$DefaultTopMacro
 		MACRO			USE_TREMOR			// LIB:libtremor.lib
 		//MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-		//MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+		//MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 		//MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 		//MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		//MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
@@ -117,7 +117,7 @@
 	
 	$SDK_Variations{'ALL'}{'all'} = "$DefaultTopMacros
 		//MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-		//MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+		//MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 		//MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 		//MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		//MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
@@ -129,7 +129,7 @@
 	
 	$SDK_Variations{'ALL'}{'scumm'} = "$DefaultTopMacros
 		//MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-		MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
@@ -137,9 +137,9 @@
 		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 	$DefaultBottomMacros";
 
-	$SDK_Variations{'ALL'}{'simon'} = "$DefaultTopMacros
+	$SDK_Variations{'ALL'}{'agos'} = "$DefaultTopMacros
 		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-		//MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+		//MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
@@ -149,7 +149,7 @@
 
 	$SDK_Variations{'ALL'}{'sky'} = "$DefaultTopMacros
 		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-		MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 		//MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
@@ -159,7 +159,7 @@
 
 	$SDK_Variations{'ALL'}{'queen'} = "$DefaultTopMacros
 		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-		MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 		//MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
@@ -169,7 +169,7 @@
 
 	$SDK_Variations{'ALL'}{'gob'} = "$DefaultTopMacros
 		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-		MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		//MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
@@ -179,7 +179,7 @@
 
 	$SDK_Variations{'ALL'}{'saga'} = "$DefaultTopMacros
 		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-		MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
@@ -189,7 +189,7 @@
 
 	$SDK_Variations{'ALL'}{'kyra'} = "$DefaultTopMacros
 		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-		MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
@@ -201,7 +201,7 @@
 
 	$SDK_Variations{'ALL'}{'test_lure'} = "$DefaultTopMacros
 		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-		MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
@@ -218,7 +218,7 @@
 		//MACRO			USE_MAD				// LIB:libmad.lib
 		//MACRO			USE_TREMOR			// LIB:libtremor.lib
 		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-		MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
@@ -232,7 +232,7 @@
 		MACRO			USE_MAD				// LIB:libmad.lib
 		//MACRO			USE_TREMOR			// LIB:libtremor.lib
 		//MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-		MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
@@ -248,7 +248,7 @@
 #		MACRO			USE_MAD				// LIB:libmad.lib
 #		MACRO			USE_TREMOR			// LIB:libtremor.lib
 #		//MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-#		//MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+#		//MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 #		//MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 #		//MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 #		//MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
@@ -261,7 +261,7 @@
 #		MACRO			USE_MPEG2			// LIB:libmpeg2.lib
 #		MACRO			USE_TREMOR			// LIB:libtremor.lib
 #		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-#		MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+#		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 #		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 #		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 #		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
@@ -280,7 +280,7 @@
 #		//MACRO			USE_TREMOR			// LIB:libtremor.lib
 #		MACRO			USE_UIQ_SE_VIBRA	// LIB:vibration.lib
 #		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-#		MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+#		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 #		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 #		//MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 #		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
@@ -289,4 +289,4 @@
 
 ##################################################################################################################
 
-1;
\ No newline at end of file
+1;

Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in	2006-09-29 08:14:27 UTC (rev 24008)
@@ -44,7 +44,7 @@
 	//MACRO			DISABLE_SCUMM_7_8
 	//MACRO			DISABLE_SCUMM_HE
 	//MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-	//MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+	//MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 	//MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
 	//MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 	//MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib

Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_simon.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_simon.mmp.in	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_simon.mmp.in	2006-09-29 08:14:27 UTC (rev 24008)
@@ -26,7 +26,7 @@
 
 // *** Definitions
 
-TARGET          scummvm_simon.lib
+TARGET          scummvm_agos.lib
 TARGETTYPE      lib
 OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
 OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
@@ -39,13 +39,13 @@
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\..\engines\simon
+SOURCEPATH ..\..\..\..\engines\agos
 
-//START_AUTO_OBJECTS_SIMON_//
+//START_AUTO_OBJECTS_AGOS_//
 
 	// empty base file, will be updated by Perl build scripts
 
-//STOP_AUTO_OBJECTS_SIMON_//
+//STOP_AUTO_OBJECTS_AGOS_//
 
 // *** Include paths
 

Modified: scummvm/trunk/backends/platform/symbian/src/main_features.inl
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/main_features.inl	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/backends/platform/symbian/src/main_features.inl	2006-09-29 08:14:27 UTC (rev 24008)
@@ -30,8 +30,8 @@
 #ifndef DISABLE_SCUMM
 	"SCUMM "
 #endif
-#ifndef DISABLE_SIMON
-	"Simon "
+#ifndef DISABLE_AGOS
+	"AGOS "
 #endif
 #ifndef DISABLE_SKY
 	"Sky "

Modified: scummvm/trunk/base/plugins.cpp
===================================================================
--- scummvm/trunk/base/plugins.cpp	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/base/plugins.cpp	2006-09-29 08:14:27 UTC (rev 24008)
@@ -368,8 +368,8 @@
 	#ifndef DISABLE_SWORD2
 	LINK_PLUGIN(SWORD2)
 	#endif
-	#ifndef DISABLE_SIMON
-	LINK_PLUGIN(SIMON)
+	#ifndef DISABLE_AGOS
+	LINK_PLUGIN(AGOS)
 	#endif
 	#ifndef DISABLE_QUEEN
 	LINK_PLUGIN(QUEEN)

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/configure	2006-09-29 08:14:27 UTC (rev 24008)
@@ -49,7 +49,7 @@
 _build_scumm=yes
 _build_scumm_7_8=yes
 _build_he=yes
-_build_simon=yes
+_build_agos=yes
 _build_sky=yes
 _build_sword1=yes
 _build_sword2=yes
@@ -321,7 +321,7 @@
   --disable-scumm          don't build the SCUMM engine
   --disable-scumm-7-8      exclude v7 and v8 game in SCUMM engine (ft, dig, comi and demos)
   --disable-he             exclude HE70+ games in SCUMM engine
-  --disable-simon          don't build the simon engine
+  --disable-agos           don't build the AGOS engine
   --disable-sky            don't build the Beneath a Steel Sky engine
   --disable-sword1         don't build the Broken Sword 1 engine
   --disable-sword2         don't build the Broken Sword 2 engine
@@ -389,7 +389,7 @@
       --disable-scumm)          _build_scumm=no ;;
       --disable-scumm-7-8)      _build_scumm_7_8=no ;;
       --disable-he)             _build_he=no ;;
-      --disable-simon)          _build_simon=no ;;
+      --disable-agos)           _build_agos=no ;;
       --disable-sky)            _build_sky=no ;;
       --disable-sword1)         _build_sword1=no ;;
       --disable-sword2)         _build_sword2=no ;;
@@ -667,7 +667,7 @@
 add_flag_to_config_mk $_build_scumm       'DISABLE_SCUMM'
 add_flag_to_config_mk $_build_scumm_7_8   'DISABLE_SCUMM_7_8'
 add_flag_to_config_mk $_build_he          'DISABLE_HE'
-add_flag_to_config_mk $_build_simon       'DISABLE_SIMON'
+add_flag_to_config_mk $_build_agos        'DISABLE_AGOS'
 add_flag_to_config_mk $_build_sky         'DISABLE_SKY'
 add_flag_to_config_mk $_build_sword1      'DISABLE_SWORD1'
 add_flag_to_config_mk $_build_sword2      'DISABLE_SWORD2'
@@ -1211,8 +1211,8 @@
 	fi
 	echo
 fi
-if test "$_build_simon" = yes ; then
-	echo "    Simon the Sorcerer"
+if test "$_build_agos" = yes ; then
+	echo "    AGOS"
 fi
 if test "$_build_sky" = yes ; then
 	echo "    Beneath a Steel Sky"

Modified: scummvm/trunk/dists/devcpp/scummvm.dev
===================================================================
--- scummvm/trunk/dists/devcpp/scummvm.dev	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/dists/devcpp/scummvm.dev	2006-09-29 08:14:27 UTC (rev 24008)
@@ -12,7 +12,7 @@
 MakeIncludes=
 Compiler=
 CppCompiler=-Wno-multichar_@@_-DUSE_ZLIB_@@_
-Linker=cine/cine.a_@@_gob/gob.a_@@_kyra/kyra.a_@@_lure/lure.a_@@_queen/queen.a_@@_saga/saga.a_@@_scumm/scumm.a_@@_simon/simon.a_@@_sky/sky.a_@@_sword1/sword1.a_@@_sword2/sword2.a_@@_-lSDL.dll_@@_-lwinmm_@@_-lz.dll_@@_
+Linker=cine/cine.a_@@_gob/gob.a_@@_kyra/kyra.a_@@_lure/lure.a_@@_queen/queen.a_@@_saga/saga.a_@@_scumm/scumm.a_@@_agos/agos.a_@@_sky/sky.a_@@_sword1/sword1.a_@@_sword2/sword2.a_@@_-lSDL.dll_@@_-lwinmm_@@_-lz.dll_@@_
 IsCpp=1
 Icon=scummvm.ico
 ExeOutput=scummvm
@@ -2061,7 +2061,7 @@
 BuildCmd=
 
 [Unit203]
-FileName=simon.dev
+FileName=agos.dev
 Folder=scummvm
 Compile=0
 Link=0

Modified: scummvm/trunk/dists/devcpp/simon.dev
===================================================================
--- scummvm/trunk/dists/devcpp/simon.dev	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/dists/devcpp/simon.dev	2006-09-29 08:14:27 UTC (rev 24008)
@@ -1,6 +1,6 @@
 [Project]
-FileName=simon.dev
-Name=simon
+FileName=agos.dev
+Name=agos
 UnitCount=26
 Type=2
 Ver=1
@@ -15,10 +15,10 @@
 Linker=
 IsCpp=1
 Icon=
-ExeOutput=simon
-ObjectOutput=simon
+ExeOutput=agos
+ObjectOutput=agos
 OverrideOutput=0
-OverrideOutputName=simon.a
+OverrideOutputName=agos.a
 HostApplication=
 Folders=
 CommandLine=
@@ -48,9 +48,9 @@
 AutoIncBuildNr=0
 
 [Unit1]
-FileName=..\..\engines\simon\charset.cpp
+FileName=..\..\engines\agos\charset.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -58,9 +58,9 @@
 BuildCmd=
 
 [Unit2]
-FileName=..\..\engines\simon\cursor.cpp
+FileName=..\..\engines\agos\cursor.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -68,9 +68,9 @@
 BuildCmd=
 
 [Unit3]
-FileName=..\..\engines\simon\debug.cpp
+FileName=..\..\engines\agos\debug.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -78,9 +78,9 @@
 BuildCmd=
 
 [Unit4]
-FileName=..\..\engines\simon\debug.h
+FileName=..\..\engines\agos\debug.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -88,9 +88,9 @@
 BuildCmd=
 
 [Unit5]
-FileName=..\..\engines\simon\debugger.cpp
+FileName=..\..\engines\agos\debugger.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -98,9 +98,9 @@
 BuildCmd=
 
 [Unit6]
-FileName=..\..\engines\simon\debugger.h
+FileName=..\..\engines\agos\debugger.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -108,9 +108,9 @@
 BuildCmd=
 
 [Unit7]
-FileName=..\..\engines\simon\game.cpp
+FileName=..\..\engines\agos\game.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -118,9 +118,9 @@
 BuildCmd=
 
 [Unit8]
-FileName=..\..\engines\simon\icons.cpp
+FileName=..\..\engines\agos\icons.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -128,9 +128,9 @@
 BuildCmd=
 
 [Unit9]
-FileName=..\..\engines\simon\intern.h
+FileName=..\..\engines\agos\intern.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -138,9 +138,9 @@
 BuildCmd=
 
 [Unit10]
-FileName=..\..\engines\simon\items.cpp
+FileName=..\..\engines\agos\items.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -148,9 +148,9 @@
 BuildCmd=
 
 [Unit11]
-FileName=..\..\engines\simon\midi.cpp
+FileName=..\..\engines\agos\midi.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -158,9 +158,9 @@
 BuildCmd=
 
 [Unit12]
-FileName=..\..\engines\simon\midi.h
+FileName=..\..\engines\agos\midi.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -168,9 +168,9 @@
 BuildCmd=
 
 [Unit13]
-FileName=..\..\engines\simon\midiparser_s1d.cpp
+FileName=..\..\engines\agos\midiparser_s1d.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -178,9 +178,9 @@
 BuildCmd=
 
 [Unit14]
-FileName=..\..\engines\simon\res.cpp
+FileName=..\..\engines\agos\res.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -188,9 +188,9 @@
 BuildCmd=
 
 [Unit15]
-FileName=..\..\engines\simon\saveload.cpp
+FileName=..\..\engines\agos\saveload.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -198,9 +198,9 @@
 BuildCmd=
 
 [Unit16]
-FileName=..\..\engines\simon\simon.cpp
+FileName=..\..\engines\agos\agos.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -208,9 +208,9 @@
 BuildCmd=
 
 [Unit17]
-FileName=..\..\engines\simon\simon.h
+FileName=..\..\engines\agos\agos.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -218,9 +218,9 @@
 BuildCmd=
 
 [Unit18]
-FileName=..\..\engines\simon\sound.cpp
+FileName=..\..\engines\agos\sound.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -228,9 +228,9 @@
 BuildCmd=
 
 [Unit19]
-FileName=..\..\engines\simon\sound.h
+FileName=..\..\engines\agos\sound.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -238,9 +238,9 @@
 BuildCmd=
 
 [Unit20]
-FileName=..\..\engines\simon\verb.cpp
+FileName=..\..\engines\agos\verb.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -248,9 +248,9 @@
 BuildCmd=
 
 [Unit21]
-FileName=..\..\engines\simon\vga.cpp
+FileName=..\..\engines\agos\vga.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -258,9 +258,9 @@
 BuildCmd=
 
 [Unit22]
-FileName=..\..\engines\simon\vga.h
+FileName=..\..\engines\agos\vga.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -268,9 +268,9 @@
 BuildCmd=
 
 [Unit23]
-FileName=..\..\engines\simon\oracle.cpp
+FileName=..\..\engines\agos\oracle.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -278,9 +278,9 @@
 BuildCmd=
 
 [Unit24]
-FileName=..\..\engines\simon\animation.cpp
+FileName=..\..\engines\agos\animation.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -288,9 +288,9 @@
 BuildCmd=
 
 [Unit25]
-FileName=..\..\engines\simon\animation.h
+FileName=..\..\engines\agos\animation.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -298,9 +298,9 @@
 BuildCmd=
 
 [Unit26]
-FileName=..\..\engines\simon\string.cpp
+FileName=..\..\engines\agos\string.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000

Modified: scummvm/trunk/dists/msevc4/PocketSCUMM.vcw
===================================================================
--- scummvm/trunk/dists/msevc4/PocketSCUMM.vcw	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/dists/msevc4/PocketSCUMM.vcw	2006-09-29 08:14:27 UTC (rev 24008)
@@ -75,7 +75,7 @@
     Project_Dep_Name scumm
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name simon
+    Project_Dep_Name agos
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name sky
@@ -102,7 +102,7 @@
 
 ###############################################################################
 
-Project: "simon"=.\simon\simon.vcp - Package Owner=<4>
+Project: "agos"=.\agos\agos.vcp - Package Owner=<4>
 
 Package=<5>
 {{{

Modified: scummvm/trunk/dists/msevc4/simon/simon.vcp
===================================================================
--- scummvm/trunk/dists/msevc4/simon/simon.vcp	2006-09-29 06:58:59 UTC (rev 24007)
+++ scummvm/trunk/dists/msevc4/simon/simon.vcp	2006-09-29 08:14:27 UTC (rev 24008)
@@ -1,4 +1,4 @@
-# Microsoft eMbedded Visual Tools Project File - Name="simon" - Package Owner=<4>
+# Microsoft eMbedded Visual Tools Project File - Name="agos" - Package Owner=<4>
 # Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
 # ** DO NOT EDIT **
 
@@ -8,29 +8,29 @@
 # TARGTYPE "Win32 (WCE ARMV4) Static Library" 0xa304
 # TARGTYPE "Win32 (WCE emulator) Static Library" 0xa604
 
-CFG=simon - Win32 (WCE emulator) Debug
+CFG=agos - Win32 (WCE emulator) Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "simon.vcn".
+!MESSAGE NMAKE /f "agos.vcn".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "simon.vcn" CFG="simon - Win32 (WCE emulator) Debug"
+!MESSAGE NMAKE /f "agos.vcn" CFG="agos - Win32 (WCE emulator) Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "simon - Win32 (WCE emulator) Release" (based on "Win32 (WCE emulator) Static Library")
-!MESSAGE "simon - Win32 (WCE emulator) Debug" (based on "Win32 (WCE emulator) Static Library")
-!MESSAGE "simon - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library")
-!MESSAGE "simon - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library")
-!MESSAGE "simon - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Static Library")
-!MESSAGE "simon - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Static Library")
-!MESSAGE "simon - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Static Library")
-!MESSAGE "simon - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Static Library")
-!MESSAGE "simon - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Static Library")
-!MESSAGE "simon - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Static Library")
+!MESSAGE "agos - Win32 (WCE emulator) Release" (based on "Win32 (WCE emulator) Static Library")
+!MESSAGE "agos - Win32 (WCE emulator) Debug" (based on "Win32 (WCE emulator) Static Library")
+!MESSAGE "agos - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library")
+!MESSAGE "agos - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library")
+!MESSAGE "agos - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Static Library")
+!MESSAGE "agos - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Static Library")
+!MESSAGE "agos - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Static Library")
+!MESSAGE "agos - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Static Library")
+!MESSAGE "agos - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Static Library")
+!MESSAGE "agos - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -39,7 +39,7 @@
 # PROP Scc_LocalPath ""
 # PROP ATL_Project 2
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -65,7 +65,7 @@
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /c
 # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /c
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -91,7 +91,7 @@
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
 # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -117,7 +117,7 @@
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
 # ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /YX /O2 /M$(CECrtMT) /c
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -143,7 +143,7 @@
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
 # ADD CPP /nologo /W3 /Zi /Od /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /D "_LIB" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "USE_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /YX /M$(CECrtMTDebug) /c
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -169,7 +169,7 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -195,7 +195,7 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -221,7 +221,7 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -247,7 +247,7 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -273,7 +273,7 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -303,32 +303,32 @@
 
 # Begin Target
 
-# Name "simon - Win32 (WCE emulator) Release"
-# Name "simon - Win32 (WCE emulator) Debug"
-# Name "simon - Win32 (WCE ARMV4) Release"
-# Name "simon - Win32 (WCE ARMV4) Debug"
-# Name "simon - Win32 (WCE ARM) Debug"
-# Name "simon - Win32 (WCE ARM) Release"
-# Name "simon - Win32 (WCE MIPS) Debug"
-# Name "simon - Win32 (WCE MIPS) Release"
-# Name "simon - Win32 (WCE SH3) Debug"
-# Name "simon - Win32 (WCE SH3) Release"
+# Name "agos - Win32 (WCE emulator) Release"
+# Name "agos - Win32 (WCE emulator) Debug"
+# Name "agos - Win32 (WCE ARMV4) Release"
+# Name "agos - Win32 (WCE ARMV4) Debug"
+# Name "agos - Win32 (WCE ARM) Debug"
+# Name "agos - Win32 (WCE ARM) Release"
+# Name "agos - Win32 (WCE MIPS) Debug"
+# Name "agos - Win32 (WCE MIPS) Release"
+# Name "agos - Win32 (WCE SH3) Debug"
+# Name "agos - Win32 (WCE SH3) Release"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\animation.cpp
+SOURCE=..\..\..\engines\agos\animation.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -354,12 +354,12 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -384,12 +384,12 @@
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\graphics\cursorman.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mididrv.h"\
@@ -404,7 +404,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -430,12 +430,12 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -461,12 +461,12 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -492,12 +492,12 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -523,9 +523,9 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -533,21 +533,21 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\animation.h
+SOURCE=..\..\..\engines\agos\animation.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\charset.cpp
+SOURCE=..\..\..\engines\agos\charset.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_CHARS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -555,12 +555,12 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_CHARS=\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_CHARS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -580,12 +580,12 @@
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -595,10 +595,10 @@
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_CHARS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -606,12 +606,12 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_CHARS=\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_CHARS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -619,12 +619,12 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_CHARS=\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_CHARS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -632,12 +632,12 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_CHARS=\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_CHARS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -645,9 +645,9 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_CHARS=\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -655,17 +655,17 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\cursor.cpp
+SOURCE=..\..\..\engines\agos\cursor.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -688,11 +688,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -715,12 +715,12 @@
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\graphics\cursorman.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
@@ -731,10 +731,10 @@
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -757,11 +757,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -784,11 +784,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -811,11 +811,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -838,8 +838,8 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -847,17 +847,17 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\debug.cpp
+SOURCE=..\..\..\engines\agos\debug.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -865,13 +865,13 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\engines\simon\simon\debug.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\debug.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -891,13 +891,13 @@
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\debug.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\debug.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -909,7 +909,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -917,13 +917,13 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\engines\simon\simon\debug.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\debug.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -931,13 +931,13 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\engines\simon\simon\debug.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\debug.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -945,13 +945,13 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\engines\simon\simon\debug.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\debug.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -959,10 +959,10 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\engines\simon\simon\debug.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\debug.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
 !ENDIF 
@@ -970,21 +970,21 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\debug.h
+SOURCE=..\..\..\engines\agos\debug.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\debugger.cpp
+SOURCE=..\..\..\engines\agos\debugger.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1024,11 +1024,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1058,13 +1058,13 @@
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\debugger.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\debugger.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
@@ -1085,7 +1085,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1125,11 +1125,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1169,11 +1169,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1213,11 +1213,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1257,8 +1257,8 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -1266,21 +1266,21 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\debugger.h
+SOURCE=..\..\..\engines\agos\debugger.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\draw.cpp
+SOURCE=..\..\..\engines\agos\draw.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1300,11 +1300,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1325,12 +1325,12 @@
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -1342,7 +1342,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1362,11 +1362,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1386,11 +1386,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1410,11 +1410,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1434,8 +1434,8 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -1443,17 +1443,17 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\event.cpp
+SOURCE=..\..\..\engines\agos\event.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -1461,11 +1461,11 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_EVENT=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1485,12 +1485,12 @@
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -1502,7 +1502,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -1510,11 +1510,11 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_EVENT=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -1522,11 +1522,11 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_EVENT=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -1534,11 +1534,11 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_EVENT=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -1546,8 +1546,8 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_EVENT=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -1555,17 +1555,17 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\game.cpp
+SOURCE=..\..\..\engines\agos\game.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_GAME_=\
 	"..\..\..\backends\fs\fs.h"\
@@ -1592,10 +1592,10 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_GAME_=\
 	"..\..\..\backends\fs\fs.h"\
@@ -1623,12 +1623,12 @@
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -1640,7 +1640,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_GAME_=\
 	"..\..\..\backends\fs\fs.h"\
@@ -1667,10 +1667,10 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_GAME_=\
 	"..\..\..\backends\fs\fs.h"\
@@ -1697,10 +1697,10 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_GAME_=\
 	"..\..\..\backends\fs\fs.h"\
@@ -1727,10 +1727,10 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_GAME_=\
 	"..\..\..\backends\fs\fs.h"\
@@ -1757,7 +1757,7 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -1765,17 +1765,17 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\icons.cpp
+SOURCE=..\..\..\engines\agos\icons.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1793,10 +1793,10 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1816,12 +1816,12 @@
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -1833,7 +1833,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1851,10 +1851,10 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1872,10 +1872,10 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1893,10 +1893,10 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1914,7 +1914,7 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -1922,21 +1922,21 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\intern.h
+SOURCE=..\..\..\engines\agos\intern.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\items.cpp
+SOURCE=..\..\..\engines\agos\items.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_ITEMS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1956,11 +1956,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_ITEMS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1981,12 +1981,12 @@
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -1998,7 +1998,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_ITEMS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2018,11 +2018,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_ITEMS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2042,11 +2042,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ITEMS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2066,11 +2066,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_ITEMS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2090,8 +2090,8 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -2099,17 +2099,17 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\midi.cpp
+SOURCE=..\..\..\engines\agos\midi.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_MIDI_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2132,10 +2132,10 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_MIDI_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2156,12 +2156,12 @@
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -2173,7 +2173,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_MIDI_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2196,10 +2196,10 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_MIDI_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2222,10 +2222,10 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_MIDI_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2248,10 +2248,10 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_MIDI_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2274,7 +2274,7 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -2282,21 +2282,21 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\midi.h
+SOURCE=..\..\..\engines\agos\midi.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\midiparser_s1d.cpp
+SOURCE=..\..\..\engines\agos\midiparser_s1d.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2321,7 +2321,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2347,7 +2347,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2372,7 +2372,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2397,7 +2397,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2422,7 +2422,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2452,17 +2452,17 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\oracle.cpp
+SOURCE=..\..\..\engines\agos\oracle.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_ORACL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2478,12 +2478,12 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_ORACL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2504,12 +2504,12 @@
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -2521,7 +2521,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_ORACL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2537,12 +2537,12 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_ORACL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2558,12 +2558,12 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ORACL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2579,12 +2579,12 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_ORACL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2600,9 +2600,9 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
 !ENDIF 
@@ -2610,17 +2610,17 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\res.cpp
+SOURCE=..\..\..\engines\agos\res.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_RES_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2638,12 +2638,12 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_RES_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2665,12 +2665,12 @@
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -2682,7 +2682,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_RES_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2700,12 +2700,12 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_RES_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2723,12 +2723,12 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_RES_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2746,12 +2746,12 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_RES_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2769,9 +2769,9 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
 !ENDIF 
@@ -2779,17 +2779,17 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\saveload.cpp
+SOURCE=..\..\..\engines\agos\saveload.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2818,11 +2818,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2844,12 +2844,12 @@
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\about.h"\
@@ -2868,7 +2868,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2897,11 +2897,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2930,11 +2930,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2963,11 +2963,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2996,8 +2996,8 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -3005,19 +3005,19 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\simon.cpp
+SOURCE=..\..\..\engines\agos\agos.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SIMON=\
+DEP_CPP_AGOS=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3045,23 +3045,23 @@
 	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_SIMON=\
+NODEP_CPP_AGOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\globals.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
-DEP_CPP_SIMON=\
+DEP_CPP_AGOS=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\config.h"\
@@ -3086,13 +3086,13 @@
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\debugger.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\debugger.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\about.h"\
@@ -3103,18 +3103,18 @@
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SIMON=\
+NODEP_CPP_AGOS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\globals.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\agos\globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SIMON=\
+DEP_CPP_AGOS=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3142,23 +3142,23 @@
 	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_SIMON=\
+NODEP_CPP_AGOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\globals.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SIMON=\
+DEP_CPP_AGOS=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3186,23 +3186,23 @@
 	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_SIMON=\
+NODEP_CPP_AGOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\globals.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SIMON=\
+DEP_CPP_AGOS=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3230,23 +3230,23 @@
 	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_SIMON=\
+NODEP_CPP_AGOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\globals.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
-DEP_CPP_SIMON=\
+DEP_CPP_AGOS=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3274,18 +3274,18 @@
 	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_SIMON=\
+NODEP_CPP_AGOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\globals.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
 !ENDIF 
@@ -3293,21 +3293,21 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\simon.h
+SOURCE=..\..\..\engines\agos\agos.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\sound.cpp
+SOURCE=..\..\..\engines\agos\sound.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3333,11 +3333,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3357,12 +3357,12 @@
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\flac.h"\
@@ -3381,7 +3381,7 @@
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3407,11 +3407,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3437,11 +3437,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3467,11 +3467,11 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3497,8 +3497,8 @@
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
 !ENDIF 
@@ -3506,21 +3506,21 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\sound.h
+SOURCE=..\..\..\engines\agos\sound.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\string.cpp
+SOURCE=..\..\..\engines\agos\string.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_STRIN=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3528,11 +3528,11 @@
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_STRIN=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_STRIN=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3552,12 +3552,12 @@
 	"..\..\..\common\stream.h"\

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list