diff options
Diffstat (limited to 'backends/platform/symbian')
5 files changed, 28 insertions, 28 deletions
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 " |