First pahse of renaming simon engine to agos. Internal renames. Compilation

is broken

svn-id: r24008

3 files changed, 55 insertions, 55 deletions

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