diff options
| author | Eugene Sandulenko | 2006-09-29 08:14:27 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2006-09-29 08:14:27 +0000 |
| commit | 8e2c703baba570b18aec9d871fdc8ee7efe49e57 (patch) | |
| tree | f75cab4641be96daacec06e47167dbe075f642f5 | |
| parent | 3d71f16b47c8af0f69c1f25af0eaa69f67a9beba (diff) | |
| download | scummvm-rg350-8e2c703baba570b18aec9d871fdc8ee7efe49e57.tar.gz scummvm-rg350-8e2c703baba570b18aec9d871fdc8ee7efe49e57.tar.bz2 scummvm-rg350-8e2c703baba570b18aec9d871fdc8ee7efe49e57.zip | |
First pahse of renaming simon engine to agos. Internal renames. Compilation
is broken
svn-id: r24008
63 files changed, 1054 insertions, 1054 deletions
diff --git a/backends/platform/PalmOS/Src/modules.cpp b/backends/platform/PalmOS/Src/modules.cpp index 80efa28ba9..6433c3e159 100644 --- a/backends/platform/PalmOS/Src/modules.cpp +++ b/backends/platform/PalmOS/Src/modules.cpp @@ -175,7 +175,7 @@ static UInt32 ModulesPalmMain(UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags) 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 diff --git a/backends/platform/PalmOS/Src/prefixes/68k_simon.h b/backends/platform/PalmOS/Src/prefixes/68k_simon.h index 54a57c0e93..92ed72b9d6 100644 --- a/backends/platform/PalmOS/Src/prefixes/68k_simon.h +++ b/backends/platform/PalmOS/Src/prefixes/68k_simon.h @@ -2,7 +2,7 @@ #define PREFIX_H #include "compile.h" -#undef DISABLE_SIMON +#undef DISABLE_AGOS #define PALMOS_68K diff --git a/backends/platform/PalmOS/Src/prefixes/compile.h b/backends/platform/PalmOS/Src/prefixes/compile.h index eaa7a60682..c9b764b333 100644 --- a/backends/platform/PalmOS/Src/prefixes/compile.h +++ b/backends/platform/PalmOS/Src/prefixes/compile.h @@ -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 diff --git a/backends/platform/PalmOS/Src/prefixes/native_simon.h b/backends/platform/PalmOS/Src/prefixes/native_simon.h index b3c6710141..f3b3476262 100644 --- a/backends/platform/PalmOS/Src/prefixes/native_simon.h +++ b/backends/platform/PalmOS/Src/prefixes/native_simon.h @@ -2,6 +2,6 @@ #define PREFIX_H #include "native_common.h" -#undef DISABLE_SIMON +#undef DISABLE_AGOS #endif diff --git a/backends/platform/PalmOS/Src/scumm_globals.cpp b/backends/platform/PalmOS/Src/scumm_globals.cpp index a8fc5c67a6..b394fb0e86 100644 --- a/backends/platform/PalmOS/Src/scumm_globals.cpp +++ b/backends/platform/PalmOS/Src/scumm_globals.cpp @@ -47,10 +47,10 @@ static void GlbInitAll() { 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 @@ static void GlbReleaseAll() { 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) diff --git a/backends/platform/PalmOS/Src/scumm_globals.h b/backends/platform/PalmOS/Src/scumm_globals.h index 3308c54a73..0051e4dddf 100644 --- a/backends/platform/PalmOS/Src/scumm_globals.h +++ b/backends/platform/PalmOS/Src/scumm_globals.h @@ -63,11 +63,11 @@ PROTO_GLOBALS(Costume) 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 diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile index 1e7768fd36..07ada936ed 100644 --- a/backends/platform/ds/arm9/makefile +++ b/backends/platform/ds/arm9/makefile @@ -21,7 +21,7 @@ ifdef DS_BUILD_A 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 @@ ifdef DS_BUILD_B 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 @@ ifdef DS_BUILD_C 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 diff --git a/backends/platform/gp32/Makefile b/backends/platform/gp32/Makefile index e91a27f33f..d3ae963ca2 100644 --- a/backends/platform/gp32/Makefile +++ b/backends/platform/gp32/Makefile @@ -159,7 +159,7 @@ DISABLE_HQ_SCALERS = 1 DISABLE_SCUMM_7_8 = 1 DISABLE_HE = 1 -#DISABLE_SIMON = 1 +#DISABLE_AGOS = 1 #DISABLE_SKY = 1 #DISABLE_QUEEN = 1 #DISABLE_GOB = 1 diff --git a/backends/platform/maemo/Makefile b/backends/platform/maemo/Makefile index 876248ccf9..4ef251e356 100644 --- a/backends/platform/maemo/Makefile +++ b/backends/platform/maemo/Makefile @@ -7,7 +7,7 @@ DISABLE_HQ_SCALERS = true #DISABLE_SCUMM = 1 #DISABLE_HE = 1 -DISABLE_SIMON = 1 +DISABLE_AGOS = 1 DISABLE_SKY = 1 DISABLE_SWORD1 = 1 DISABLE_SWORD2 = 1 diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl index 3688bca578..fd896d005a 100644 --- a/backends/platform/symbian/AdaptAllMMPs.pl +++ b/backends/platform/symbian/AdaptAllMMPs.pl @@ -8,7 +8,7 @@ chdir("../../../"); @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 @@ ParseModule("_base", "sound", \@section_empty, \@excludes_snd); 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); diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl index a357b836db..2f749170f4 100644 --- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl +++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl @@ -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 @@ if (0) # all regular combo's $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 @@ if (0) # all regular combo's $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 @@ if (0) # all regular combo's 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 @@ if (0) # all regular combo's $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 @@ if (0) # all regular combo's $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 @@ if (0) # all regular combo's $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 @@ if (0) # all regular combo's $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 @@ if (0) # all regular combo's $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 @@ if (0) # all regular combo's $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 @@ if (0) # all regular combo's //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 @@ if (0) # all regular combo's 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 @@ if (0) # all regular combo's # 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 @@ if (0) # all regular combo's # 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 @@ if (0) # all regular combo's # //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 @@ if (0) # all regular combo's ################################################################################################################## -1;
\ No newline at end of file +1; diff --git a/backends/platform/symbian/mmp/scummvm_base.mmp.in b/backends/platform/symbian/mmp/scummvm_base.mmp.in index de0b8f2c53..7e1f05d982 100644 --- a/backends/platform/symbian/mmp/scummvm_base.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_base.mmp.in @@ -44,7 +44,7 @@ OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way //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 diff --git a/backends/platform/symbian/mmp/scummvm_simon.mmp.in b/backends/platform/symbian/mmp/scummvm_simon.mmp.in index af0def9867..05ec375b51 100644 --- a/backends/platform/symbian/mmp/scummvm_simon.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_simon.mmp.in @@ -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 @@ OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way // *** 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 diff --git a/backends/platform/symbian/src/main_features.inl b/backends/platform/symbian/src/main_features.inl index 2e0b008e68..6c6a7a19d8 100644 --- a/backends/platform/symbian/src/main_features.inl +++ b/backends/platform/symbian/src/main_features.inl @@ -30,8 +30,8 @@ #ifndef DISABLE_SCUMM "SCUMM " #endif -#ifndef DISABLE_SIMON - "Simon " +#ifndef DISABLE_AGOS + "AGOS " #endif #ifndef DISABLE_SKY "Sky " diff --git a/base/plugins.cpp b/base/plugins.cpp index 6cd7448f68..d554f2283b 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -368,8 +368,8 @@ void PluginManager::loadPlugins() { #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) @@ -49,7 +49,7 @@ _mt32emu=yes _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 @@ Optional Features: --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 @@ for ac_option in $@; do --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 @@ fi; 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 @@ if test "$_build_scumm" = yes ; then 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" diff --git a/dists/devcpp/scummvm.dev b/dists/devcpp/scummvm.dev index 6170a161d5..2c2f65a713 100644 --- a/dists/devcpp/scummvm.dev +++ b/dists/devcpp/scummvm.dev @@ -12,7 +12,7 @@ ResourceIncludes=../..;../../icons 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 @@ OverrideBuildCmd=0 BuildCmd= [Unit203] -FileName=simon.dev +FileName=agos.dev Folder=scummvm Compile=0 Link=0 diff --git a/dists/devcpp/simon.dev b/dists/devcpp/simon.dev index 087ca152bb..9c5c04f0be 100644 --- a/dists/devcpp/simon.dev +++ b/dists/devcpp/simon.dev @@ -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 @@ CppCompiler=-Wno-multichar_@@_ 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 @@ ProductVersion= 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 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 @@ OverrideBuildCmd=0 BuildCmd= [Unit26] -FileName=..\..\engines\simon\string.cpp +FileName=..\..\engines\agos\string.cpp CompileCpp=1 -Folder=simon +Folder=agos Compile=1 Link=1 Priority=1000 diff --git a/dists/msevc4/PocketSCUMM.vcw b/dists/msevc4/PocketSCUMM.vcw index 55f8228d3d..ac01fe5dd2 100644 --- a/dists/msevc4/PocketSCUMM.vcw +++ b/dists/msevc4/PocketSCUMM.vcw @@ -75,7 +75,7 @@ Package=<4> 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 @@ Package=<4> ############################################################################### -Project: "simon"=.\simon\simon.vcp - Package Owner=<4> +Project: "agos"=.\agos\agos.vcp - Package Owner=<4> Package=<5> {{{ diff --git a/dists/msevc4/simon/simon.vcp b/dists/msevc4/simon/simon.vcp index b15ffcae45..b5b6cc954b 100644 --- a/dists/msevc4/simon/simon.vcp +++ b/dists/msevc4/simon/simon.vcp @@ -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 @@ CFG=simon - Win32 (WCE emulator) Debug # 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 @@ CPP=cl.exe # 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 @@ CPP=cl.exe # 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 @@ CPP=clarm.exe # 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 @@ CPP=clarm.exe # 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 @@ BSC32=bscmake.exe # 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 @@ BSC32=bscmake.exe # 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 @@ BSC32=bscmake.exe # 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 @@ BSC32=bscmake.exe # 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 @@ BSC32=bscmake.exe # 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 @@ BSC32=bscmake.exe # 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 @@ NODEP_CPP_ANIMA=\ "..\..\..\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 @@ DEP_CPP_ANIMA=\ "..\..\..\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 @@ NODEP_CPP_ANIMA=\ "..\..\..\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 @@ NODEP_CPP_ANIMA=\ "..\..\..\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 @@ NODEP_CPP_ANIMA=\ "..\..\..\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 @@ NODEP_CPP_ANIMA=\ "..\..\..\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 @@ NODEP_CPP_ANIMA=\ "..\..\..\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 @@ NODEP_CPP_ANIMA=\ # 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 @@ DEP_CPP_CHARS=\ "..\..\..\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 @@ DEP_CPP_CHARS=\ "..\..\..\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 @@ NODEP_CPP_CHARS=\ "..\..\..\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 @@ DEP_CPP_CHARS=\ "..\..\..\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 @@ DEP_CPP_CHARS=\ "..\..\..\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 @@ DEP_CPP_CHARS=\ "..\..\..\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 @@ DEP_CPP_CHARS=\ "..\..\..\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 @@ NODEP_CPP_CHARS=\ # 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 @@ NODEP_CPP_CURSO=\ "..\..\..\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 @@ DEP_CPP_CURSO=\ "..\..\..\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 @@ NODEP_CPP_CURSO=\ "..\..\..\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 @@ NODEP_CPP_CURSO=\ "..\..\..\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 @@ NODEP_CPP_CURSO=\ "..\..\..\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 @@ NODEP_CPP_CURSO=\ "..\..\..\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 @@ NODEP_CPP_CURSO=\ "..\..\..\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 @@ NODEP_CPP_CURSO=\ # 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 @@ DEP_CPP_DEBUG=\ "..\..\..\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 @@ DEP_CPP_DEBUG=\ "..\..\..\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 @@ NODEP_CPP_DEBUG=\ "..\..\..\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 @@ DEP_CPP_DEBUG=\ "..\..\..\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 @@ DEP_CPP_DEBUG=\ "..\..\..\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 @@ DEP_CPP_DEBUG=\ "..\..\..\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 @@ DEP_CPP_DEBUG=\ "..\..\..\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 @@ NODEP_CPP_DEBUG=\ # 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 @@ NODEP_CPP_DEBUGG=\ "..\..\..\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 @@ DEP_CPP_DEBUGG=\ "..\..\..\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 @@ NODEP_CPP_DEBUGG=\ "..\..\..\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 @@ NODEP_CPP_DEBUGG=\ "..\..\..\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 @@ NODEP_CPP_DEBUGG=\ "..\..\..\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 @@ NODEP_CPP_DEBUGG=\ "..\..\..\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 @@ NODEP_CPP_DEBUGG=\ "..\..\..\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 @@ NODEP_CPP_DEBUGG=\ # 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 @@ NODEP_CPP_DRAW_=\ "..\..\..\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 @@ DEP_CPP_DRAW_=\ "..\..\..\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 @@ NODEP_CPP_DRAW_=\ "..\..\..\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 @@ NODEP_CPP_DRAW_=\ "..\..\..\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 @@ NODEP_CPP_DRAW_=\ "..\..\..\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 @@ NODEP_CPP_DRAW_=\ "..\..\..\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 @@ NODEP_CPP_DRAW_=\ "..\..\..\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 @@ NODEP_CPP_DRAW_=\ # 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 @@ DEP_CPP_EVENT=\ "..\..\..\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 @@ DEP_CPP_EVENT=\ "..\..\..\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 @@ NODEP_CPP_EVENT=\ "..\..\..\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 @@ DEP_CPP_EVENT=\ "..\..\..\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 @@ DEP_CPP_EVENT=\ "..\..\..\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 @@ DEP_CPP_EVENT=\ "..\..\..\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 @@ DEP_CPP_EVENT=\ "..\..\..\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 @@ NODEP_CPP_EVENT=\ # 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 @@ NODEP_CPP_GAME_=\ "..\..\..\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 @@ DEP_CPP_GAME_=\ "..\..\..\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 @@ NODEP_CPP_GAME_=\ "..\..\..\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 @@ NODEP_CPP_GAME_=\ "..\..\..\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 @@ NODEP_CPP_GAME_=\ "..\..\..\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 @@ NODEP_CPP_GAME_=\ "..\..\..\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 @@ NODEP_CPP_GAME_=\ "..\..\..\common\extend.h"\ "..\..\..\common\globals.h"\ "..\..\..\common\palmversion.h"\ - "..\..\..\engines\simon\simon\simon.h"\ + "..\..\..\engines\agos\agos\agos.h"\ !ENDIF @@ -1765,17 +1765,17 @@ NODEP_CPP_GAME_=\ # 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 @@ NODEP_CPP_ICONS=\ "..\..\..\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 @@ DEP_CPP_ICONS=\ "..\..\..\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 @@ NODEP_CPP_ICONS=\ "..\..\..\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 @@ NODEP_CPP_ICONS=\ "..\..\..\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 @@ NODEP_CPP_ICONS=\ "..\..\..\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 @@ NODEP_CPP_ICONS=\ "..\..\..\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 @@ NODEP_CPP_ICONS=\ "..\..\..\common\extend.h"\ "..\..\..\common\globals.h"\ "..\..\..\common\palmversion.h"\ - "..\..\..\engines\simon\simon\simon.h"\ + "..\..\..\engines\agos\agos\agos.h"\ !ENDIF @@ -1922,21 +1922,21 @@ NODEP_CPP_ICONS=\ # 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 @@ NODEP_CPP_ITEMS=\ "..\..\..\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 @@ DEP_CPP_ITEMS=\ "..\..\..\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 @@ NODEP_CPP_ITEMS=\ "..\..\..\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 @@ NODEP_CPP_ITEMS=\ "..\..\..\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 @@ NODEP_CPP_ITEMS=\ "..\..\..\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 @@ NODEP_CPP_ITEMS=\ "..\..\..\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 @@ NODEP_CPP_ITEMS=\ "..\..\..\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 @@ NODEP_CPP_ITEMS=\ # 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 @@ NODEP_CPP_MIDI_=\ "..\..\..\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 @@ DEP_CPP_MIDI_=\ "..\..\..\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 @@ NODEP_CPP_MIDI_=\ "..\..\..\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 @@ NODEP_CPP_MIDI_=\ "..\..\..\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 @@ NODEP_CPP_MIDI_=\ "..\..\..\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 @@ NODEP_CPP_MIDI_=\ "..\..\..\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 @@ NODEP_CPP_MIDI_=\ "..\..\..\common\extend.h"\ "..\..\..\common\globals.h"\ "..\..\..\common\palmversion.h"\ - "..\..\..\engines\simon\simon\simon.h"\ + "..\..\..\engines\agos\agos\agos.h"\ !ENDIF @@ -2282,21 +2282,21 @@ NODEP_CPP_MIDI_=\ # 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 @@ NODEP_CPP_MIDIP=\ "..\..\..\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 @@ NODEP_CPP_MIDIP=\ "..\..\..\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 @@ NODEP_CPP_MIDIP=\ "..\..\..\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 @@ NODEP_CPP_MIDIP=\ "..\..\..\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 @@ NODEP_CPP_MIDIP=\ "..\..\..\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 @@ NODEP_CPP_MIDIP=\ # 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 @@ NODEP_CPP_ORACL=\ "..\..\..\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 @@ DEP_CPP_ORACL=\ "..\..\..\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 @@ NODEP_CPP_ORACL=\ "..\..\..\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 @@ NODEP_CPP_ORACL=\ "..\..\..\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 @@ NODEP_CPP_ORACL=\ "..\..\..\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 @@ NODEP_CPP_ORACL=\ "..\..\..\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 @@ NODEP_CPP_ORACL=\ "..\..\..\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 @@ NODEP_CPP_ORACL=\ # 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 @@ NODEP_CPP_RES_C=\ "..\..\..\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 @@ DEP_CPP_RES_C=\ "..\..\..\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 @@ NODEP_CPP_RES_C=\ "..\..\..\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 @@ NODEP_CPP_RES_C=\ "..\..\..\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 @@ NODEP_CPP_RES_C=\ "..\..\..\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 @@ NODEP_CPP_RES_C=\ "..\..\..\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 @@ NODEP_CPP_RES_C=\ "..\..\..\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 @@ NODEP_CPP_RES_C=\ # 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 @@ NODEP_CPP_SAVEL=\ "..\..\..\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 @@ DEP_CPP_SAVEL=\ "..\..\..\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 @@ NODEP_CPP_SAVEL=\ "..\..\..\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 @@ NODEP_CPP_SAVEL=\ "..\..\..\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 @@ NODEP_CPP_SAVEL=\ "..\..\..\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 @@ NODEP_CPP_SAVEL=\ "..\..\..\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 @@ NODEP_CPP_SAVEL=\ "..\..\..\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 @@ NODEP_CPP_SAVEL=\ # 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 @@ DEP_CPP_SIMON=\ "..\..\..\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 @@ DEP_CPP_SIMON=\ "..\..\..\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 @@ DEP_CPP_SIMON=\ "..\..\..\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 @@ DEP_CPP_SIMON=\ "..\..\..\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 @@ DEP_CPP_SIMON=\ "..\..\..\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 @@ DEP_CPP_SIMON=\ "..\..\..\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 @@ DEP_CPP_SIMON=\ "..\..\..\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 @@ NODEP_CPP_SIMON=\ # 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 @@ NODEP_CPP_SOUND=\ "..\..\..\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 @@ DEP_CPP_SOUND=\ "..\..\..\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 @@ NODEP_CPP_SOUND=\ "..\..\..\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 @@ NODEP_CPP_SOUND=\ "..\..\..\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 @@ NODEP_CPP_SOUND=\ "..\..\..\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 @@ NODEP_CPP_SOUND=\ "..\..\..\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 @@ NODEP_CPP_SOUND=\ "..\..\..\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 @@ NODEP_CPP_SOUND=\ # 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 @@ DEP_CPP_STRIN=\ "..\..\..\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 @@ DEP_CPP_STRIN=\ "..\..\..\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"\ @@ -3569,7 +3569,7 @@ NODEP_CPP_STRIN=\ "..\..\..\common\palmversion.h"\ -!ELSEIF "$(CFG)" == "simon - Win32 (WCE MIPS) Debug" +!ELSEIF "$(CFG)" == "agos - Win32 (WCE MIPS) Debug" DEP_CPP_STRIN=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -3577,11 +3577,11 @@ DEP_CPP_STRIN=\ "..\..\..\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 MIPS) Release" +!ELSEIF "$(CFG)" == "agos - Win32 (WCE MIPS) Release" DEP_CPP_STRIN=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -3589,11 +3589,11 @@ DEP_CPP_STRIN=\ "..\..\..\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 SH3) Debug" +!ELSEIF "$(CFG)" == "agos - Win32 (WCE SH3) Debug" DEP_CPP_STRIN=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -3601,11 +3601,11 @@ DEP_CPP_STRIN=\ "..\..\..\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 SH3) Release" +!ELSEIF "$(CFG)" == "agos - Win32 (WCE SH3) Release" DEP_CPP_STRIN=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -3613,8 +3613,8 @@ DEP_CPP_STRIN=\ "..\..\..\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"\ !ENDIF @@ -3622,17 +3622,17 @@ NODEP_CPP_STRIN=\ # End Source File # Begin Source File -SOURCE=..\..\..\engines\simon\subroutine.cpp +SOURCE=..\..\..\engines\agos\subroutine.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_SUBRO=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -3640,11 +3640,11 @@ DEP_CPP_SUBRO=\ "..\..\..\common\stdafx.h"\ NODEP_CPP_SUBRO=\ - "..\..\..\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_SUBRO=\ "..\..\..\backends\ps2\fileio.h"\ @@ -3664,12 +3664,12 @@ DEP_CPP_SUBRO=\ "..\..\..\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"\ @@ -3681,7 +3681,7 @@ NODEP_CPP_SUBRO=\ "..\..\..\common\palmversion.h"\ -!ELSEIF "$(CFG)" == "simon - Win32 (WCE MIPS) Debug" +!ELSEIF "$(CFG)" == "agos - Win32 (WCE MIPS) Debug" DEP_CPP_SUBRO=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -3689,11 +3689,11 @@ DEP_CPP_SUBRO=\ "..\..\..\common\stdafx.h"\ NODEP_CPP_SUBRO=\ - "..\..\..\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_SUBRO=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -3701,11 +3701,11 @@ DEP_CPP_SUBRO=\ "..\..\..\common\stdafx.h"\ NODEP_CPP_SUBRO=\ - "..\..\..\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_SUBRO=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -3713,11 +3713,11 @@ DEP_CPP_SUBRO=\ "..\..\..\common\stdafx.h"\ NODEP_CPP_SUBRO=\ - "..\..\..\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_SUBRO=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -3725,8 +3725,8 @@ DEP_CPP_SUBRO=\ "..\..\..\common\stdafx.h"\ NODEP_CPP_SUBRO=\ - "..\..\..\engines\simon\simon\intern.h"\ - "..\..\..\engines\simon\simon\simon.h"\ + "..\..\..\engines\agos\agos\intern.h"\ + "..\..\..\engines\agos\agos\agos.h"\ !ENDIF @@ -3734,17 +3734,17 @@ NODEP_CPP_SUBRO=\ # End Source File # Begin Source File -SOURCE=..\..\..\engines\simon\verb.cpp +SOURCE=..\..\..\engines\agos\verb.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_VERB_=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -3752,11 +3752,11 @@ DEP_CPP_VERB_=\ "..\..\..\common\stdafx.h"\ NODEP_CPP_VERB_=\ - "..\..\..\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_VERB_=\ "..\..\..\backends\ps2\fileio.h"\ @@ -3776,12 +3776,12 @@ DEP_CPP_VERB_=\ "..\..\..\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"\ @@ -3793,7 +3793,7 @@ NODEP_CPP_VERB_=\ "..\..\..\common\palmversion.h"\ -!ELSEIF "$(CFG)" == "simon - Win32 (WCE MIPS) Debug" +!ELSEIF "$(CFG)" == "agos - Win32 (WCE MIPS) Debug" DEP_CPP_VERB_=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -3801,11 +3801,11 @@ DEP_CPP_VERB_=\ "..\..\..\common\stdafx.h"\ NODEP_CPP_VERB_=\ - "..\..\..\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_VERB_=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -3813,11 +3813,11 @@ DEP_CPP_VERB_=\ "..\..\..\common\stdafx.h"\ NODEP_CPP_VERB_=\ - "..\..\..\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_VERB_=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -3825,11 +3825,11 @@ DEP_CPP_VERB_=\ "..\..\..\common\stdafx.h"\ NODEP_CPP_VERB_=\ - "..\..\..\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_VERB_=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -3837,8 +3837,8 @@ DEP_CPP_VERB_=\ "..\..\..\common\stdafx.h"\ NODEP_CPP_VERB_=\ - "..\..\..\engines\simon\simon\intern.h"\ - "..\..\..\engines\simon\simon\simon.h"\ + "..\..\..\engines\agos\agos\intern.h"\ + "..\..\..\engines\agos\agos\agos.h"\ !ENDIF @@ -3846,17 +3846,17 @@ NODEP_CPP_VERB_=\ # End Source File # Begin Source File -SOURCE=..\..\..\engines\simon\vga.cpp +SOURCE=..\..\..\engines\agos\vga.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_VGA_C=\ "..\..\..\backends\ps2\fileio.h"\ @@ -3876,12 +3876,12 @@ NODEP_CPP_VGA_C=\ "..\..\..\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_VGA_C=\ "..\..\..\backends\ps2\fileio.h"\ @@ -3902,12 +3902,12 @@ DEP_CPP_VGA_C=\ "..\..\..\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"\ @@ -3919,7 +3919,7 @@ NODEP_CPP_VGA_C=\ "..\..\..\common\palmversion.h"\ -!ELSEIF "$(CFG)" == "simon - Win32 (WCE MIPS) Debug" +!ELSEIF "$(CFG)" == "agos - Win32 (WCE MIPS) Debug" DEP_CPP_VGA_C=\ "..\..\..\backends\ps2\fileio.h"\ @@ -3939,12 +3939,12 @@ NODEP_CPP_VGA_C=\ "..\..\..\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_VGA_C=\ "..\..\..\backends\ps2\fileio.h"\ @@ -3964,12 +3964,12 @@ NODEP_CPP_VGA_C=\ "..\..\..\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_VGA_C=\ "..\..\..\backends\ps2\fileio.h"\ @@ -3989,12 +3989,12 @@ NODEP_CPP_VGA_C=\ "..\..\..\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_VGA_C=\ "..\..\..\backends\ps2\fileio.h"\ @@ -4014,9 +4014,9 @@ NODEP_CPP_VGA_C=\ "..\..\..\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 @@ -4024,21 +4024,21 @@ NODEP_CPP_VGA_C=\ # End Source File # Begin Source File -SOURCE=..\..\..\engines\simon\vga.h +SOURCE=..\..\..\engines\agos\vga.h # End Source File # Begin Source File -SOURCE=..\..\..\engines\simon\window.cpp +SOURCE=..\..\..\engines\agos\window.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_WINDO=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -4046,11 +4046,11 @@ DEP_CPP_WINDO=\ "..\..\..\common\stdafx.h"\ NODEP_CPP_WINDO=\ - "..\..\..\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_WINDO=\ "..\..\..\backends\ps2\fileio.h"\ @@ -4070,12 +4070,12 @@ DEP_CPP_WINDO=\ "..\..\..\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"\ @@ -4087,7 +4087,7 @@ NODEP_CPP_WINDO=\ "..\..\..\common\palmversion.h"\ -!ELSEIF "$(CFG)" == "simon - Win32 (WCE MIPS) Debug" +!ELSEIF "$(CFG)" == "agos - Win32 (WCE MIPS) Debug" DEP_CPP_WINDO=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -4095,11 +4095,11 @@ DEP_CPP_WINDO=\ "..\..\..\common\stdafx.h"\ NODEP_CPP_WINDO=\ - "..\..\..\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_WINDO=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -4107,11 +4107,11 @@ DEP_CPP_WINDO=\ "..\..\..\common\stdafx.h"\ NODEP_CPP_WINDO=\ - "..\..\..\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_WINDO=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -4119,11 +4119,11 @@ DEP_CPP_WINDO=\ "..\..\..\common\stdafx.h"\ NODEP_CPP_WINDO=\ - "..\..\..\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_WINDO=\ "..\..\..\backends\wince\missing\unistd.h"\ @@ -4131,8 +4131,8 @@ DEP_CPP_WINDO=\ "..\..\..\common\stdafx.h"\ NODEP_CPP_WINDO=\ - "..\..\..\engines\simon\simon\intern.h"\ - "..\..\..\engines\simon\simon\simon.h"\ + "..\..\..\engines\agos\agos\intern.h"\ + "..\..\..\engines\agos\agos\agos.h"\ !ENDIF diff --git a/dists/msvc6/scummvm.dsp b/dists/msvc6/scummvm.dsp index 21000501c4..d56baf4f95 100644 --- a/dists/msvc6/scummvm.dsp +++ b/dists/msvc6/scummvm.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib simon___Release\simon.lib scumm___Release\scumm.lib sky___Release\sky.lib bs2___Release\bs2.lib queen___Release\queen.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib agos___Release\agos.lib scumm___Release\scumm.lib sky___Release\sky.lib bs2___Release\bs2.lib queen___Release\queen.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "scummvm - Win32 Debug" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib simon___Debug\simon.lib scumm___Debug\scumm.lib sky___Debug\sky.lib bs2___Debug\bs2.lib queen___Debug\queen.lib saga___Debug\saga.lib kyra___Debug\kyra.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept /fixed:no +# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib agos___Debug\agos.lib scumm___Debug\scumm.lib sky___Debug\sky.lib bs2___Debug\bs2.lib queen___Debug\queen.lib saga___Debug\saga.lib kyra___Debug\kyra.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept /fixed:no # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "scummvm - Win32 mad mp3 Debug" @@ -107,7 +107,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib wsock32.lib scumm___mad_mp3_Debug\scumm.lib simon___mad_mp3_Debug\simon.lib sky___mad_mp3_Debug\sky.lib bs2___mad_mp3_Debug\bs2.lib queen___mad_mp3_Debug\queen.lib saga___mad_mp3_Debug\saga.lib kyra___mad_mp3_Debug\kyra.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /pdbtype:sept /fixed:no +# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib wsock32.lib scumm___mad_mp3_Debug\scumm.lib agos___mad_mp3_Debug\agos.lib sky___mad_mp3_Debug\sky.lib bs2___mad_mp3_Debug\bs2.lib queen___mad_mp3_Debug\queen.lib saga___mad_mp3_Debug\saga.lib kyra___mad_mp3_Debug\kyra.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /pdbtype:sept /fixed:no # SUBTRACT LINK32 /pdb:none /map !ELSEIF "$(CFG)" == "scummvm - Win32 mad mp3 Release" @@ -134,8 +134,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib simon___Release\simon.lib scumm___Release\scumm.lib sdl.lib /nologo /subsystem:console /machine:I386 /nodefaultlib -# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib scumm___mad_mp3_Release\scumm.lib simon___mad_mp3_Release\simon.lib sky___mad_mp3_Release\sky.lib bs2___mad_mp3_Release\bs2.lib queen___mad_mp3_Release\queen.lib saga___mad_mp3_Release\saga.lib kyra___mad_mp3_Release\kyra.lib bs1___mad_mp3_Release\bs1.lib /nologo /subsystem:console /pdb:none /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib agos___Release\agos.lib scumm___Release\scumm.lib sdl.lib /nologo /subsystem:console /machine:I386 /nodefaultlib +# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib scumm___mad_mp3_Release\scumm.lib agos___mad_mp3_Release\agos.lib sky___mad_mp3_Release\sky.lib bs2___mad_mp3_Release\bs2.lib queen___mad_mp3_Release\queen.lib saga___mad_mp3_Release\saga.lib kyra___mad_mp3_Release\kyra.lib bs1___mad_mp3_Release\bs1.lib /nologo /subsystem:console /pdb:none /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" # SUBTRACT LINK32 /debug !ENDIF diff --git a/dists/msvc6/scummvm.dsw b/dists/msvc6/scummvm.dsw index da337e7dcc..3f8aa6df82 100644 --- a/dists/msvc6/scummvm.dsw +++ b/dists/msvc6/scummvm.dsw @@ -87,7 +87,7 @@ Package=<4> 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 @@ -111,7 +111,7 @@ Package=<4> ############################################################################### -Project: "simon"=".\simon.dsp" - Package Owner=<4> +Project: "agos"=".\agos.dsp" - Package Owner=<4> Package=<5> {{{ diff --git a/dists/msvc6/simon.dsp b/dists/msvc6/simon.dsp index 551dd2a0c6..45472cee3f 100644 --- a/dists/msvc6/simon.dsp +++ b/dists/msvc6/simon.dsp @@ -1,26 +1,26 @@ -# Microsoft Developer Studio Project File - Name="simon" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="agos" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=simon - Win32 mad mp3 Debug +CFG=agos - Win32 mad mp3 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.mak". +!MESSAGE NMAKE /f "agos.mak". !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.mak" CFG="simon - Win32 mad mp3 Debug" +!MESSAGE NMAKE /f "agos.mak" CFG="agos - Win32 mad mp3 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "simon - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "simon - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "simon - Win32 mad mp3 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "simon - Win32 mad mp3 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "agos - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "agos - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "agos - Win32 mad mp3 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "agos - Win32 mad mp3 Release" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -30,7 +30,7 @@ CFG=simon - Win32 mad mp3 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "simon - Win32 Release" +!IF "$(CFG)" == "agos - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -39,8 +39,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "simon___Release" -# PROP Intermediate_Dir "simon___Release" +# PROP Output_Dir "agos___Release" +# PROP Intermediate_Dir "agos___Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /I "." /I "common" /I "..\..\\" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /FD /c @@ -54,17 +54,17 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "simon - Win32 Debug" +!ELSEIF "$(CFG)" == "agos - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "simon___Win32_Debug" -# PROP BASE Intermediate_Dir "simon___Win32_Debug" +# PROP BASE Output_Dir "agos___Win32_Debug" +# PROP BASE Intermediate_Dir "agos___Win32_Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "simon___Debug" -# PROP Intermediate_Dir "simon___Debug" +# PROP Output_Dir "agos___Debug" +# PROP Intermediate_Dir "agos___Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /WX /Gm /GR /GX /ZI /Od /I "." /I "common" /I "..\..\\" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /FD /GZ /c @@ -78,17 +78,17 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "simon - Win32 mad mp3 Debug" +!ELSEIF "$(CFG)" == "agos - Win32 mad mp3 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "simon___Win32_MP3_Enabled_Debug" -# PROP BASE Intermediate_Dir "simon___Win32_MP3_Enabled_Debug" +# PROP BASE Output_Dir "agos___Win32_MP3_Enabled_Debug" +# PROP BASE Intermediate_Dir "agos___Win32_MP3_Enabled_Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "simon___mad_mp3_Debug" -# PROP Intermediate_Dir "simon___mad_mp3_Debug" +# PROP Output_Dir "agos___mad_mp3_Debug" +# PROP Intermediate_Dir "agos___mad_mp3_Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /WX /Gm /GX /ZI /Od /I "." /I "common" /I "..\..\\" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /D "MSVC6_COMPAT" /FD /GZ /c @@ -102,17 +102,17 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "simon - Win32 mad mp3 Release" +!ELSEIF "$(CFG)" == "agos - Win32 mad mp3 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "simon___Win32_MP3_Enabled_Release" -# PROP BASE Intermediate_Dir "simon___Win32_MP3_Enabled_Release" +# PROP BASE Output_Dir "agos___Win32_MP3_Enabled_Release" +# PROP BASE Intermediate_Dir "agos___Win32_MP3_Enabled_Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "simon___mad_mp3_Release" -# PROP Intermediate_Dir "simon___mad_mp3_Release" +# PROP Output_Dir "agos___mad_mp3_Release" +# PROP Intermediate_Dir "agos___mad_mp3_Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /YX /FD /c # ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /I "..\..\\" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /FD /c @@ -130,84 +130,84 @@ LIB32=link.exe -lib # Begin Target -# Name "simon - Win32 Release" -# Name "simon - Win32 Debug" -# Name "simon - Win32 mad mp3 Debug" -# Name "simon - Win32 mad mp3 Release" +# Name "agos - Win32 Release" +# Name "agos - Win32 Debug" +# Name "agos - Win32 mad mp3 Debug" +# Name "agos - Win32 mad mp3 Release" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=..\..\simon\charset.cpp +SOURCE=..\..\agos\charset.cpp # End Source File # Begin Source File -SOURCE=..\..\simon\debug.cpp +SOURCE=..\..\agos\debug.cpp # End Source File # Begin Source File -SOURCE=..\..\simon\debug.h +SOURCE=..\..\agos\debug.h # End Source File # Begin Source File -SOURCE=..\..\simon\debugger.cpp +SOURCE=..\..\agos\debugger.cpp # End Source File # Begin Source File -SOURCE=..\..\simon\debugger.h +SOURCE=..\..\agos\debugger.h # End Source File # Begin Source File -SOURCE=..\..\simon\intern.h +SOURCE=..\..\agos\intern.h # End Source File # Begin Source File -SOURCE=..\..\simon\items.cpp +SOURCE=..\..\agos\items.cpp # End Source File # Begin Source File -SOURCE=..\..\simon\midi.cpp +SOURCE=..\..\agos\midi.cpp # End Source File # Begin Source File -SOURCE=..\..\simon\midi.h +SOURCE=..\..\agos\midi.h # End Source File # Begin Source File -SOURCE=..\..\simon\midiparser_s1d.cpp +SOURCE=..\..\agos\midiparser_s1d.cpp # End Source File # Begin Source File -SOURCE=..\..\simon\res.cpp +SOURCE=..\..\agos\res.cpp # End Source File # Begin Source File -SOURCE=..\..\simon\simon.cpp +SOURCE=..\..\agos\agos.cpp # End Source File # Begin Source File -SOURCE=..\..\simon\simon.h +SOURCE=..\..\agos\agos.h # End Source File # Begin Source File -SOURCE=..\..\simon\sound.cpp +SOURCE=..\..\agos\sound.cpp # End Source File # Begin Source File -SOURCE=..\..\simon\sound.h +SOURCE=..\..\agos\sound.h # End Source File # Begin Source File -SOURCE=..\..\simon\verb.cpp +SOURCE=..\..\agos\verb.cpp # End Source File # Begin Source File -SOURCE=..\..\simon\vga.cpp +SOURCE=..\..\agos\vga.cpp # End Source File # Begin Source File -SOURCE=..\..\simon\vga.h +SOURCE=..\..\agos\vga.h # End Source File # End Group # End Target diff --git a/dists/msvc7/scummvm.sln b/dists/msvc7/scummvm.sln index 524fbeca3a..65a6b1abdc 100644 --- a/dists/msvc7/scummvm.sln +++ b/dists/msvc7/scummvm.sln @@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "queen", "queen.vcproj", "{6 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scumm", "scumm.vcproj", "{B6AFD548-63D2-40CD-A652-E87095AFCBAF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simon", "simon.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agos", "agos.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sky", "sky.vcproj", "{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}" EndProject diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj index 54142a6a07..24a8b92a6e 100644 --- a/dists/msvc7/scummvm.vcproj +++ b/dists/msvc7/scummvm.vcproj @@ -38,7 +38,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib kyra_debug/kyra.lib cine_debug/cine.lib lure_debug/lure.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib" + AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib kyra_debug/kyra.lib cine_debug/cine.lib lure_debug/lure.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib agos_debug/agos.lib sky_debug/sky.lib" OutputFile="$(OutDir)/scummvm.exe" LinkIncremental="2" IgnoreDefaultLibraryNames="libcmtd.lib" @@ -91,7 +91,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib sword1_release/sword1.lib sword2_release/sword2.lib kyra_release/kyra.lib cine_release/cine.lib lure_release/lure.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib simon_release/simon.lib sky_release/sky.lib" + AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib sword1_release/sword1.lib sword2_release/sword2.lib kyra_release/kyra.lib cine_release/cine.lib lure_release/lure.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib" OutputFile="$(OutDir)/scummvm.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" diff --git a/dists/msvc7/simon.vcproj b/dists/msvc7/simon.vcproj index 9b74c45dcf..ad0d878201 100644 --- a/dists/msvc7/simon.vcproj +++ b/dists/msvc7/simon.vcproj @@ -2,7 +2,7 @@ <VisualStudioProject ProjectType="Visual C++" Version="7.00" - Name="simon" + Name="agos" ProjectGUID="{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}" Keyword="Win32Proj"> <Platforms> @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="simon_Debug" - IntermediateDirectory="simon_Debug" + OutputDirectory="agos_Debug" + IntermediateDirectory="agos_Debug" ConfigurationType="4" CharacterSet="2"> <Tool @@ -37,7 +37,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(OutDir)/simon.lib"/> + OutputFile="$(OutDir)/agos.lib"/> <Tool Name="VCMIDLTool"/> <Tool @@ -53,8 +53,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="simon_Release" - IntermediateDirectory="simon_Release" + OutputDirectory="agos_Release" + IntermediateDirectory="agos_Release" ConfigurationType="4" ATLMinimizesCRunTimeLibraryUsage="TRUE" CharacterSet="2" @@ -80,7 +80,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(OutDir)/simon.lib"/> + OutputFile="$(OutDir)/agos.lib"/> <Tool Name="VCMIDLTool"/> <Tool @@ -97,73 +97,73 @@ </Configurations> <Files> <File - RelativePath="..\..\engines\simon\charset.cpp"> + RelativePath="..\..\engines\agos\charset.cpp"> </File> <File - RelativePath="..\..\engines\simon\cursor.cpp"> + RelativePath="..\..\engines\agos\cursor.cpp"> </File> <File - RelativePath="..\..\engines\simon\debug.cpp"> + RelativePath="..\..\engines\agos\debug.cpp"> </File> <File - RelativePath="..\..\engines\simon\debug.h"> + RelativePath="..\..\engines\agos\debug.h"> </File> <File - RelativePath="..\..\engines\simon\debugger.cpp"> + RelativePath="..\..\engines\agos\debugger.cpp"> </File> <File - RelativePath="..\..\engines\simon\debugger.h"> + RelativePath="..\..\engines\agos\debugger.h"> </File> <File - RelativePath="..\..\engines\simon\game.cpp"> + RelativePath="..\..\engines\agos\game.cpp"> </File> <File - RelativePath="..\..\engines\simon\icons.cpp"> + RelativePath="..\..\engines\agos\icons.cpp"> </File> <File - RelativePath="..\..\engines\simon\intern.h"> + RelativePath="..\..\engines\agos\intern.h"> </File> <File - RelativePath="..\..\engines\simon\items.cpp"> + RelativePath="..\..\engines\agos\items.cpp"> </File> <File - RelativePath="..\..\engines\simon\midi.cpp"> + RelativePath="..\..\engines\agos\midi.cpp"> </File> <File - RelativePath="..\..\engines\simon\midi.h"> + RelativePath="..\..\engines\agos\midi.h"> </File> <File - RelativePath="..\..\engines\simon\midiparser_s1d.cpp"> + RelativePath="..\..\engines\agos\midiparser_s1d.cpp"> </File> <File - RelativePath="..\..\engines\simon\oracle.cpp"> + RelativePath="..\..\engines\agos\oracle.cpp"> </File> <File - RelativePath="..\..\engines\simon\res.cpp"> + RelativePath="..\..\engines\agos\res.cpp"> </File> <File - RelativePath="..\..\engines\simon\saveload.cpp"> + RelativePath="..\..\engines\agos\saveload.cpp"> </File> <File - RelativePath="..\..\engines\simon\simon.cpp"> + RelativePath="..\..\engines\agos\agos.cpp"> </File> <File - RelativePath="..\..\engines\simon\simon.h"> + RelativePath="..\..\engines\agos\agos.h"> </File> <File - RelativePath="..\..\engines\simon\sound.cpp"> + RelativePath="..\..\engines\agos\sound.cpp"> </File> <File - RelativePath="..\..\engines\simon\sound.h"> + RelativePath="..\..\engines\agos\sound.h"> </File> <File - RelativePath="..\..\engines\simon\verb.cpp"> + RelativePath="..\..\engines\agos\verb.cpp"> </File> <File - RelativePath="..\..\engines\simon\vga.cpp"> + RelativePath="..\..\engines\agos\vga.cpp"> </File> <File - RelativePath="..\..\engines\simon\vga.h"> + RelativePath="..\..\engines\agos\vga.h"> </File> </Files> <Globals> diff --git a/dists/msvc71/scummvm.sln b/dists/msvc71/scummvm.sln index ad039e5293..d099703732 100644 --- a/dists/msvc71/scummvm.sln +++ b/dists/msvc71/scummvm.sln @@ -26,7 +26,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scumm", "scumm.vcproj", "{B ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simon", "simon.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agos", "agos.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj index 21c219f0a5..de8a4d1e6a 100644 --- a/dists/msvc71/scummvm.vcproj +++ b/dists/msvc71/scummvm.vcproj @@ -38,7 +38,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib agi_debug/agi.lib cine_debug/cine.lib gob_debug/gob.lib kyra_debug/kyra.lib lure_debug/lure.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib sword1_debug/sword1.lib sword2_debug/sword2.lib" + AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib agi_debug/agi.lib cine_debug/cine.lib gob_debug/gob.lib kyra_debug/kyra.lib lure_debug/lure.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib agos_debug/agos.lib sky_debug/sky.lib sword1_debug/sword1.lib sword2_debug/sword2.lib" OutputFile="$(OutDir)/scummvm.exe" LinkIncremental="2" IgnoreDefaultLibraryNames="libcmtd.lib" @@ -97,7 +97,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib agi_release/agi.lib cine_release/cine.lib gob_release/gob.lib kyra_release/kyra.lib lure_release/lure.lib queen_release/queen.lib saga_release/saga.lib scumm_release/scumm.lib simon_release/simon.lib sky_release/sky.lib sword1_release/sword1.lib sword2_release/sword2.lib" + AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib agi_release/agi.lib cine_release/cine.lib gob_release/gob.lib kyra_release/kyra.lib lure_release/lure.lib queen_release/queen.lib saga_release/saga.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib sword1_release/sword1.lib sword2_release/sword2.lib" OutputFile="$(OutDir)/scummvm.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" diff --git a/dists/msvc71/simon.vcproj b/dists/msvc71/simon.vcproj index b72f6f38eb..8d8139adf9 100644 --- a/dists/msvc71/simon.vcproj +++ b/dists/msvc71/simon.vcproj @@ -2,7 +2,7 @@ <VisualStudioProject ProjectType="Visual C++" Version="7.10" - Name="simon" + Name="agos" ProjectGUID="{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}" Keyword="Win32Proj"> <Platforms> @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="simon_Debug" - IntermediateDirectory="simon_Debug" + OutputDirectory="agos_Debug" + IntermediateDirectory="agos_Debug" ConfigurationType="4" CharacterSet="2"> <Tool @@ -37,7 +37,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(OutDir)/simon.lib"/> + OutputFile="$(OutDir)/agos.lib"/> <Tool Name="VCMIDLTool"/> <Tool @@ -59,8 +59,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="simon_Release" - IntermediateDirectory="simon_Release" + OutputDirectory="agos_Release" + IntermediateDirectory="agos_Release" ConfigurationType="4" ATLMinimizesCRunTimeLibraryUsage="TRUE" CharacterSet="2" @@ -86,7 +86,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" - OutputFile="$(OutDir)/simon.lib"/> + OutputFile="$(OutDir)/agos.lib"/> <Tool Name="VCMIDLTool"/> <Tool @@ -111,94 +111,94 @@ </References> <Files> <File - RelativePath="..\..\engines\simon\animation.cpp"> + RelativePath="..\..\engines\agos\animation.cpp"> </File> <File - RelativePath="..\..\engines\simon\animation.h"> + RelativePath="..\..\engines\agos\animation.h"> </File> <File - RelativePath="..\..\engines\simon\charset.cpp"> + RelativePath="..\..\engines\agos\charset.cpp"> </File> <File - RelativePath="..\..\engines\simon\cursor.cpp"> + RelativePath="..\..\engines\agos\cursor.cpp"> </File> <File - RelativePath="..\..\engines\simon\debug.cpp"> + RelativePath="..\..\engines\agos\debug.cpp"> </File> <File - RelativePath="..\..\engines\simon\debug.h"> + RelativePath="..\..\engines\agos\debug.h"> </File> <File - RelativePath="..\..\engines\simon\debugger.cpp"> + RelativePath="..\..\engines\agos\debugger.cpp"> </File> <File - RelativePath="..\..\engines\simon\debugger.h"> + RelativePath="..\..\engines\agos\debugger.h"> </File> <File - RelativePath="..\..\engines\simon\draw.cpp"> + RelativePath="..\..\engines\agos\draw.cpp"> </File> <File - RelativePath="..\..\engines\simon\event.cpp"> + RelativePath="..\..\engines\agos\event.cpp"> </File> <File - RelativePath="..\..\engines\simon\game.cpp"> + RelativePath="..\..\engines\agos\game.cpp"> </File> <File - RelativePath="..\..\engines\simon\icons.cpp"> + RelativePath="..\..\engines\agos\icons.cpp"> </File> <File - RelativePath="..\..\engines\simon\intern.h"> + RelativePath="..\..\engines\agos\intern.h"> </File> <File - RelativePath="..\..\engines\simon\items.cpp"> + RelativePath="..\..\engines\agos\items.cpp"> </File> <File - RelativePath="..\..\engines\simon\midi.cpp"> + RelativePath="..\..\engines\agos\midi.cpp"> </File> <File - RelativePath="..\..\engines\simon\midi.h"> + RelativePath="..\..\engines\agos\midi.h"> </File> <File - RelativePath="..\..\engines\simon\midiparser_s1d.cpp"> + RelativePath="..\..\engines\agos\midiparser_s1d.cpp"> </File> <File - RelativePath="..\..\engines\simon\oracle.cpp"> + RelativePath="..\..\engines\agos\oracle.cpp"> </File> <File - RelativePath="..\..\engines\simon\res.cpp"> + RelativePath="..\..\engines\agos\res.cpp"> </File> <File - RelativePath="..\..\engines\simon\saveload.cpp"> + RelativePath="..\..\engines\agos\saveload.cpp"> </File> <File - RelativePath="..\..\engines\simon\simon.cpp"> + RelativePath="..\..\engines\agos\agos.cpp"> </File> <File - RelativePath="..\..\engines\simon\simon.h"> + RelativePath="..\..\engines\agos\agos.h"> </File> <File - RelativePath="..\..\engines\simon\sound.cpp"> + RelativePath="..\..\engines\agos\sound.cpp"> </File> <File - RelativePath="..\..\engines\simon\sound.h"> + RelativePath="..\..\engines\agos\sound.h"> </File> <File - RelativePath="..\..\engines\simon\string.cpp"> + RelativePath="..\..\engines\agos\string.cpp"> </File> <File - RelativePath="..\..\engines\simon\subroutine.cpp"> + RelativePath="..\..\engines\agos\subroutine.cpp"> </File> <File - RelativePath="..\..\engines\simon\verb.cpp"> + RelativePath="..\..\engines\agos\verb.cpp"> </File> <File - RelativePath="..\..\engines\simon\vga.cpp"> + RelativePath="..\..\engines\agos\vga.cpp"> </File> <File - RelativePath="..\..\engines\simon\vga.h"> + RelativePath="..\..\engines\agos\vga.h"> </File> <File - RelativePath="..\..\engines\simon\window.cpp"> + RelativePath="..\..\engines\agos\window.cpp"> </File> </Files> <Globals> diff --git a/dists/msvc8/scummvm.sln b/dists/msvc8/scummvm.sln index f33a6488b4..78fcc0c2e3 100644 --- a/dists/msvc8/scummvm.sln +++ b/dists/msvc8/scummvm.sln @@ -22,7 +22,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "queen", "queen.vcproj", "{6 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scumm", "scumm.vcproj", "{B6AFD548-63D2-40CD-A652-E87095AFCBAF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simon", "simon.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agos", "agos.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sky", "sky.vcproj", "{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}" EndProject diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj index 4fe294edd6..95476f15c8 100644 --- a/dists/msvc8/scummvm.vcproj +++ b/dists/msvc8/scummvm.vcproj @@ -68,7 +68,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib" + AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib agos_debug/agos.lib sky_debug/sky.lib" OutputFile="$(OutDir)/scummvm.exe" LinkIncremental="2" IgnoreDefaultLibraryNames="libc.lib;libcmt.lib" @@ -156,7 +156,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib simon_release/simon.lib sky_release/sky.lib" + AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib" OutputFile="$(OutDir)/scummvm.exe" LinkIncremental="1" SuppressStartupBanner="true" diff --git a/dists/msvc8/simon.vcproj b/dists/msvc8/simon.vcproj index 3c49c31a03..4261957406 100644 --- a/dists/msvc8/simon.vcproj +++ b/dists/msvc8/simon.vcproj @@ -2,7 +2,7 @@ <VisualStudioProject ProjectType="Visual C++" Version="8,00" - Name="simon" + Name="agos" ProjectGUID="{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}" Keyword="Win32Proj" > @@ -16,8 +16,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="simon_Debug" - IntermediateDirectory="simon_Debug" + OutputDirectory="agos_Debug" + IntermediateDirectory="agos_Debug" ConfigurationType="4" CharacterSet="2" > @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="$(OutDir)/simon.lib" + OutputFile="$(OutDir)/agos.lib" /> <Tool Name="VCALinkTool" @@ -86,8 +86,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="simon_Release" - IntermediateDirectory="simon_Release" + OutputDirectory="agos_Release" + IntermediateDirectory="agos_Release" ConfigurationType="4" ATLMinimizesCRunTimeLibraryUsage="true" CharacterSet="2" @@ -137,7 +137,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="$(OutDir)/simon.lib" + OutputFile="$(OutDir)/agos.lib" /> <Tool Name="VCALinkTool" @@ -160,123 +160,123 @@ </References> <Files> <File - RelativePath="..\..\engines\simon\animation.cpp" + RelativePath="..\..\engines\agos\animation.cpp" > </File> <File - RelativePath="..\..\engines\simon\animation.h" + RelativePath="..\..\engines\agos\animation.h" > </File> <File - RelativePath="..\..\engines\simon\charset.cpp" + RelativePath="..\..\engines\agos\charset.cpp" > </File> <File - RelativePath="..\..\engines\simon\cursor.cpp" + RelativePath="..\..\engines\agos\cursor.cpp" > </File> <File - RelativePath="..\..\engines\simon\debug.cpp" + RelativePath="..\..\engines\agos\debug.cpp" > </File> <File - RelativePath="..\..\engines\simon\debug.h" + RelativePath="..\..\engines\agos\debug.h" > </File> <File - RelativePath="..\..\engines\simon\debugger.cpp" + RelativePath="..\..\engines\agos\debugger.cpp" > </File> <File - RelativePath="..\..\engines\simon\debugger.h" + RelativePath="..\..\engines\agos\debugger.h" > </File> <File - RelativePath="..\..\engines\simon\draw.cpp" + RelativePath="..\..\engines\agos\draw.cpp" > </File> <File - RelativePath="..\..\engines\simon\event.cpp" + RelativePath="..\..\engines\agos\event.cpp" > </File> <File - RelativePath="..\..\engines\simon\game.cpp" + RelativePath="..\..\engines\agos\game.cpp" > </File> <File - RelativePath="..\..\engines\simon\icons.cpp" + RelativePath="..\..\engines\agos\icons.cpp" > </File> <File - RelativePath="..\..\engines\simon\intern.h" + RelativePath="..\..\engines\agos\intern.h" > </File> <File - RelativePath="..\..\engines\simon\items.cpp" + RelativePath="..\..\engines\agos\items.cpp" > </File> <File - RelativePath="..\..\engines\simon\midi.cpp" + RelativePath="..\..\engines\agos\midi.cpp" > </File> <File - RelativePath="..\..\engines\simon\midi.h" + RelativePath="..\..\engines\agos\midi.h" > </File> <File - RelativePath="..\..\engines\simon\midiparser_s1d.cpp" + RelativePath="..\..\engines\agos\midiparser_s1d.cpp" > </File> <File - RelativePath="..\..\engines\simon\oracle.cpp" + RelativePath="..\..\engines\agos\oracle.cpp" > </File> <File - RelativePath="..\..\engines\simon\res.cpp" + RelativePath="..\..\engines\agos\res.cpp" > </File> <File - RelativePath="..\..\engines\simon\saveload.cpp" + RelativePath="..\..\engines\agos\saveload.cpp" > </File> <File - RelativePath="..\..\engines\simon\simon.cpp" + RelativePath="..\..\engines\agos\agos.cpp" > </File> <File - RelativePath="..\..\engines\simon\simon.h" + RelativePath="..\..\engines\agos\agos.h" > </File> <File - RelativePath="..\..\engines\simon\sound.cpp" + RelativePath="..\..\engines\agos\sound.cpp" > </File> <File - RelativePath="..\..\engines\simon\sound.h" + RelativePath="..\..\engines\agos\sound.h" > </File> <File - RelativePath="..\..\engines\simon\string.cpp" + RelativePath="..\..\engines\agos\string.cpp" > </File> <File - RelativePath="..\..\engines\simon\subroutine.cpp" + RelativePath="..\..\engines\agos\subroutine.cpp" > </File> <File - RelativePath="..\..\engines\simon\verb.cpp" + RelativePath="..\..\engines\agos\verb.cpp" > </File> <File - RelativePath="..\..\engines\simon\vga.cpp" + RelativePath="..\..\engines\agos\vga.cpp" > </File> <File - RelativePath="..\..\engines\simon\vga.h" + RelativePath="..\..\engines\agos\vga.h" > </File> <File - RelativePath="..\..\engines\simon\window.cpp" + RelativePath="..\..\engines\agos\window.cpp" > </File> </Files> diff --git a/engines/engines.mk b/engines/engines.mk index eee601b9fd..d4be1c1674 100644 --- a/engines/engines.mk +++ b/engines/engines.mk @@ -13,10 +13,10 @@ endif endif -ifdef DISABLE_SIMON -DEFINES += -DDISABLE_SIMON +ifdef DISABLE_AGOS +DEFINES += -DDISABLE_AGOS else -MODULES += engines/simon +MODULES += engines/agos endif ifdef DISABLE_SKY diff --git a/engines/simon/animation.cpp b/engines/simon/animation.cpp index 8834ee6ffc..9302055241 100644 --- a/engines/simon/animation.cpp +++ b/engines/simon/animation.cpp @@ -28,9 +28,9 @@ #include "graphics/cursorman.h" -#include "simon/animation.h" -#include "simon/intern.h" -#include "simon/simon.h" +#include "agos/animation.h" +#include "agos/intern.h" +#include "agos/agos.h" #include "sound/audiostream.h" #include "sound/wave.h" diff --git a/engines/simon/charset.cpp b/engines/simon/charset.cpp index 712ed0bc3b..f051197d4b 100644 --- a/engines/simon/charset.cpp +++ b/engines/simon/charset.cpp @@ -23,8 +23,8 @@ #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" namespace Simon { @@ -1604,7 +1604,7 @@ void SimonEngine::video_putchar_drawchar(WindowBlock *window, uint x, uint y, by #ifdef PALMOS_68K #include "scumm_globals.h" -_GINIT(Simon_Charset) +_GINIT(AGOS_Charset) _GSETPTR(Simon::russian_video_font, GBVARS_RUSSIANVIDEOFONT_INDEX, byte, GBVARS_SIMON) //_GSETPTR(Simon::polish_video_font, GBVARS_POLISHVIDEOFONT_INDEX, byte, GBVARS_SIMON) _GSETPTR(Simon::french_video_font, GBVARS_FRENCHVIDEOFONT_INDEX, byte, GBVARS_SIMON) @@ -1615,7 +1615,7 @@ _GSETPTR(Simon::spanish_video_font, GBVARS_SPANISHVIDEOFONT_INDEX, byte, GBVARS_ _GSETPTR(Simon::video_font, GBVARS_VIDEOFONT_INDEX, byte, GBVARS_SIMON) _GEND -_GRELEASE(Simon_Charset) +_GRELEASE(AGOS_Charset) _GRELEASEPTR(GBVARS_RUSSIANVIDEOFONT_INDEX, GBVARS_SIMON) //_GRELEASEPTR(GBVARS_POLISHVIDEOFONT_INDEX, GBVARS_SIMON) _GRELEASEPTR(GBVARS_FRENCHVIDEOFONT_INDEX, GBVARS_SIMON) diff --git a/engines/simon/cursor.cpp b/engines/simon/cursor.cpp index 5c7e9db6dd..fe342f635d 100644 --- a/engines/simon/cursor.cpp +++ b/engines/simon/cursor.cpp @@ -27,7 +27,7 @@ #include "graphics/cursorman.h" -#include "simon/simon.h" +#include "agos/agos.h" namespace Simon { @@ -484,11 +484,11 @@ void SimonEngine::drawMousePart(int image, byte x, byte y) { #ifdef PALMOS_68K #include "scumm_globals.h" -_GINIT(Simon_Cursor) +_GINIT(AGOS_Cursor) _GSETPTR(Simon::_simon1_cursor, GBVARS_SIMON1CURSOR_INDEX, byte, GBVARS_SIMON) _GEND -_GRELEASE(Simon_Cursor) +_GRELEASE(AGOS_Cursor) _GRELEASEPTR(GBVARS_SIMON1CURSOR_INDEX, GBVARS_SIMON) _GEND diff --git a/engines/simon/debug.cpp b/engines/simon/debug.cpp index 05f348ad31..a0e980f807 100644 --- a/engines/simon/debug.cpp +++ b/engines/simon/debug.cpp @@ -21,13 +21,13 @@ * */ -// Simon debug functions +// AGOS debug functions #include "common/stdafx.h" -#include "simon/debug.h" -#include "simon/simon.h" -#include "simon/intern.h" -#include "simon/vga.h" +#include "agos/debug.h" +#include "agos/agos.h" +#include "agos/intern.h" +#include "agos/vga.h" #include <sys/stat.h> diff --git a/engines/simon/debug.h b/engines/simon/debug.h index 51587a4f59..e6f478deee 100644 --- a/engines/simon/debug.h +++ b/engines/simon/debug.h @@ -21,8 +21,8 @@ * */ -#ifndef SIMON_DEBUG_H -#define SIMON_DEBUG_H +#ifndef AGOS_DEBUG_H +#define AGOS_DEBUG_H namespace Simon { diff --git a/engines/simon/debugger.cpp b/engines/simon/debugger.cpp index 7e2694966a..8fc4702d1e 100644 --- a/engines/simon/debugger.cpp +++ b/engines/simon/debugger.cpp @@ -25,8 +25,8 @@ #include "common/config-manager.h" -#include "simon/debugger.h" -#include "simon/simon.h" +#include "agos/debugger.h" +#include "agos/agos.h" namespace Simon { diff --git a/engines/simon/debugger.h b/engines/simon/debugger.h index 2c8e28d20e..cd43f3e1eb 100644 --- a/engines/simon/debugger.h +++ b/engines/simon/debugger.h @@ -21,8 +21,8 @@ * */ -#ifndef SIMON_DEBUGGER_H -#define SIMON_DEBUGGER_H +#ifndef AGOS_DEBUGGER_H +#define AGOS_DEBUGGER_H #include "gui/debugger.h" diff --git a/engines/simon/draw.cpp b/engines/simon/draw.cpp index a684093d4d..ab65cd0af2 100644 --- a/engines/simon/draw.cpp +++ b/engines/simon/draw.cpp @@ -25,8 +25,8 @@ #include "common/system.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" namespace Simon { diff --git a/engines/simon/event.cpp b/engines/simon/event.cpp index 1448633743..4755dea987 100644 --- a/engines/simon/event.cpp +++ b/engines/simon/event.cpp @@ -23,8 +23,8 @@ #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" namespace Simon { diff --git a/engines/simon/game.cpp b/engines/simon/game.cpp index 65754e104d..f4997520ab 100644 --- a/engines/simon/game.cpp +++ b/engines/simon/game.cpp @@ -32,7 +32,7 @@ #include "common/hashmap.h" #include "common/hash-str.h" -#include "simon/simon.h" +#include "agos/agos.h" namespace Simon { static DetectedGameList GAME_detectGames(const FSList &fslist); @@ -80,7 +80,7 @@ static const PlainGameDescriptor simonGames[] = { {NULL, NULL} }; -GameList Engine_SIMON_gameIDList() { +GameList Engine_AGOS_gameIDList() { GameList games; const PlainGameDescriptor *g = simonGames; while (g->gameid) { @@ -91,7 +91,7 @@ GameList Engine_SIMON_gameIDList() { return games; } -GameDescriptor Engine_SIMON_findGameID(const char *gameid) { +GameDescriptor Engine_AGOS_findGameID(const char *gameid) { // First search the list of supported game IDs. const PlainGameDescriptor *g = simonGames; while (g->gameid) { @@ -115,11 +115,11 @@ GameDescriptor Engine_SIMON_findGameID(const char *gameid) { return gs; } -DetectedGameList Engine_SIMON_detectGames(const FSList &fslist) { +DetectedGameList Engine_AGOS_detectGames(const FSList &fslist) { return Simon::GAME_detectGames(fslist); } -PluginError Engine_SIMON_create(OSystem *syst, Engine **engine) { +PluginError Engine_AGOS_create(OSystem *syst, Engine **engine) { assert(syst); assert(engine); const char *gameid = ConfMan.get("gameid").c_str(); @@ -147,7 +147,7 @@ PluginError Engine_SIMON_create(OSystem *syst, Engine **engine) { } // Invoke the detector - DetectedGameList detectedGames = Engine_SIMON_detectGames(fslist); + DetectedGameList detectedGames = Engine_AGOS_detectGames(fslist); for (uint i = 0; i < detectedGames.size(); i++) { if (detectedGames[i].gameid == gameid) { @@ -160,7 +160,7 @@ PluginError Engine_SIMON_create(OSystem *syst, Engine **engine) { return kNoGameDataFoundError; } -REGISTER_PLUGIN(SIMON, "Simon the Sorcerer", "Simon the Sorcerer (C) Adventure Soft"); +REGISTER_PLUGIN(AGOS, "AGOS", "AGOS (C) Adventure Soft"); namespace Simon { diff --git a/engines/simon/icons.cpp b/engines/simon/icons.cpp index c20a0758c8..2904d9024d 100644 --- a/engines/simon/icons.cpp +++ b/engines/simon/icons.cpp @@ -25,7 +25,7 @@ #include "common/file.h" -#include "simon/simon.h" +#include "agos/agos.h" namespace Simon { diff --git a/engines/simon/intern.h b/engines/simon/intern.h index 7dca106266..587eca621c 100644 --- a/engines/simon/intern.h +++ b/engines/simon/intern.h @@ -21,8 +21,8 @@ * */ -#ifndef SIMON_INTERN_H -#define SIMON_INTERN_H +#ifndef AGOS_INTERN_H +#define AGOS_INTERN_H namespace Simon { diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index 6a7aa26a88..b908d0f5ab 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -27,8 +27,8 @@ #include "common/system.h" -#include "simon/animation.h" -#include "simon/simon.h" +#include "agos/animation.h" +#include "agos/agos.h" #ifdef _WIN32_WCE extern bool isSmartphone(void); diff --git a/engines/simon/midi.cpp b/engines/simon/midi.cpp index 2d85983ad4..2ff9bbd8ad 100644 --- a/engines/simon/midi.cpp +++ b/engines/simon/midi.cpp @@ -26,9 +26,9 @@ #include "common/file.h" #include "common/system.h" -#include "simon/simon.h" +#include "agos/agos.h" -#include "sound/mixer.h" +#include "agos/agos.h" namespace Simon { diff --git a/engines/simon/midi.h b/engines/simon/midi.h index 00c8843c66..cf055bffac 100644 --- a/engines/simon/midi.h +++ b/engines/simon/midi.h @@ -21,8 +21,8 @@ * */ -#ifndef SIMON_MIDI_H -#define SIMON_MIDI_H +#ifndef AGOS_MIDI_H +#define AGOS_MIDI_H #include "sound/mididrv.h" #include "sound/midiparser.h" diff --git a/engines/simon/module.mk b/engines/simon/module.mk index 0c98b65d34..d58c545866 100644 --- a/engines/simon/module.mk +++ b/engines/simon/module.mk @@ -1,6 +1,7 @@ -MODULE := engines/simon +MODULE := engines/agos MODULE_OBJS := \ + agos.o \ animation.o \ charset.o \ cursor.o \ @@ -13,17 +14,16 @@ MODULE_OBJS := \ items.o \ midi.o \ midiparser_s1d.o \ - oracle.o \ + oracle.o \ res.o \ rooms.o \ saveload.o \ - simon.o \ sound.o \ string.o \ subroutine.o \ verb.o \ vga.o \ - window.o \ + window.o # This module can be built as a plugin ifdef BUILD_PLUGINS diff --git a/engines/simon/oracle.cpp b/engines/simon/oracle.cpp index 22fbf72375..3e6448fbae 100644 --- a/engines/simon/oracle.cpp +++ b/engines/simon/oracle.cpp @@ -25,9 +25,9 @@ #include "common/savefile.h" -#include "simon/simon.h" -#include "simon/intern.h" -#include "simon/vga.h" +#include "agos/agos.h" +#include "agos/intern.h" +#include "agos/vga.h" namespace Simon { diff --git a/engines/simon/res.cpp b/engines/simon/res.cpp index 4724353ce1..e8d4f2fd04 100644 --- a/engines/simon/res.cpp +++ b/engines/simon/res.cpp @@ -26,9 +26,9 @@ #include "common/file.h" -#include "simon/simon.h" -#include "simon/intern.h" -#include "simon/sound.h" +#include "agos/agos.h" +#include "agos/intern.h" +#include "agos/sound.h" #ifdef USE_ZLIB diff --git a/engines/simon/rooms.cpp b/engines/simon/rooms.cpp index 3752d4cf37..ca2b84e9f9 100644 --- a/engines/simon/rooms.cpp +++ b/engines/simon/rooms.cpp @@ -23,8 +23,8 @@ #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" using Common::File; diff --git a/engines/simon/saveload.cpp b/engines/simon/saveload.cpp index a0d4d6d96a..37907024b6 100644 --- a/engines/simon/saveload.cpp +++ b/engines/simon/saveload.cpp @@ -29,8 +29,8 @@ #include "gui/about.h" #include "gui/message.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" namespace Simon { diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index 1dd0a45882..4248e311ce 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -30,10 +30,10 @@ #include "gui/about.h" -#include "simon/debugger.h" -#include "simon/intern.h" -#include "simon/simon.h" -#include "simon/vga.h" +#include "agos/debugger.h" +#include "agos/intern.h" +#include "agos/agos.h" +#include "agos/vga.h" #include "sound/mididrv.h" @@ -2277,13 +2277,13 @@ void SimonEngine::set_volume(int volume) { #ifdef PALMOS_68K #include "scumm_globals.h" -_GINIT(Simon_Simon) +_GINIT(AGOS_AGOS) _GSETPTR(Simon::simon1_settings, GBVARS_SIMON1SETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON) _GSETPTR(Simon::simon2_settings, GBVARS_SIMON2SETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON) _GSETPTR(Simon::feeblefiles_settings, GBVARS_FEEBLEFILESSETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON) _GEND -_GRELEASE(Simon_Simon) +_GRELEASE(AGOS_AGOS) _GRELEASEPTR(GBVARS_SIMON1SETTINGS_INDEX, GBVARS_SIMON) _GRELEASEPTR(GBVARS_SIMON2SETTINGS_INDEX, GBVARS_SIMON) _GRELEASEPTR(GBVARS_FEEBLEFILESSETTINGS_INDEX, GBVARS_SIMON) diff --git a/engines/simon/simon.h b/engines/simon/simon.h index a945a6c55e..90f3a1506c 100644 --- a/engines/simon/simon.h +++ b/engines/simon/simon.h @@ -21,18 +21,18 @@ * */ -#ifndef SIMON_H -#define SIMON_H +#ifndef AGOS_AGOS_H +#define AGOS_AGOS_H #include "engines/engine.h" #include "common/rect.h" #include "common/util.h" -#include "simon/animation.h" -#include "simon/midi.h" -#include "simon/sound.h" -#include "simon/vga.h" +#include "agos/animation.h" +#include "agos/midi.h" +#include "agos/sound.h" +#include "agos/vga.h" namespace Simon { diff --git a/engines/simon/sound.cpp b/engines/simon/sound.cpp index 2ac4e629eb..42c2df1723 100644 --- a/engines/simon/sound.cpp +++ b/engines/simon/sound.cpp @@ -26,8 +26,8 @@ #include "common/file.h" #include "common/util.h" -#include "simon/simon.h" -#include "simon/sound.h" +#include "agos/agos.h" +#include "agos/sound.h" #include "sound/adpcm.h" #include "sound/audiostream.h" diff --git a/engines/simon/sound.h b/engines/simon/sound.h index f744e18498..ce7b655b90 100644 --- a/engines/simon/sound.h +++ b/engines/simon/sound.h @@ -21,11 +21,11 @@ * */ -#ifndef SIMON_SOUND_H -#define SIMON_SOUND_H +#ifndef AGOS_SOUND_H +#define AGOS_SOUND_H #include "sound/mixer.h" -#include "simon/intern.h" +#include "agos/intern.h" #include "common/str.h" namespace Simon { diff --git a/engines/simon/string.cpp b/engines/simon/string.cpp index ba959759da..b85eb9a9dd 100644 --- a/engines/simon/string.cpp +++ b/engines/simon/string.cpp @@ -23,8 +23,8 @@ #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" using Common::File; diff --git a/engines/simon/subroutine.cpp b/engines/simon/subroutine.cpp index eebf67cb19..b5a7c1f9f7 100644 --- a/engines/simon/subroutine.cpp +++ b/engines/simon/subroutine.cpp @@ -23,8 +23,8 @@ #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" using Common::File; diff --git a/engines/simon/verb.cpp b/engines/simon/verb.cpp index ed621d712e..014ca36df7 100644 --- a/engines/simon/verb.cpp +++ b/engines/simon/verb.cpp @@ -24,8 +24,8 @@ // Verb and hitarea handling #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" namespace Simon { diff --git a/engines/simon/vga.cpp b/engines/simon/vga.cpp index a91ce5ac4e..d7deb2fbc0 100644 --- a/engines/simon/vga.cpp +++ b/engines/simon/vga.cpp @@ -24,9 +24,9 @@ // Video script opcodes for Simon1/Simon2 #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" -#include "simon/vga.h" +#include "agos/agos.h" +#include "agos/intern.h" +#include "agos/vga.h" #include "common/system.h" diff --git a/engines/simon/vga.h b/engines/simon/vga.h index fece63bf3a..e963d0350b 100644 --- a/engines/simon/vga.h +++ b/engines/simon/vga.h @@ -21,8 +21,8 @@ * */ -#ifndef SIMON_VGA_H -#define SIMON_VGA_H +#ifndef AGOS_VGA_H +#define AGOS_VGA_H namespace Simon { diff --git a/engines/simon/window.cpp b/engines/simon/window.cpp index aa39ac0c97..c21f8ad6d2 100644 --- a/engines/simon/window.cpp +++ b/engines/simon/window.cpp @@ -23,8 +23,8 @@ #include "common/stdafx.h" -#include "simon/simon.h" -#include "simon/intern.h" +#include "agos/agos.h" +#include "agos/intern.h" namespace Simon { |