Upgrading to MS Visual Studio 2005

8 files changed, 1132 insertions, 580 deletions

diff --git a/MSVC/Baltisot - generic/Baltisot - generic.vcproj b/MSVC/Baltisot - generic/Baltisot - generic.vcproj
index fb1ace4..11afd5e 100644
--- a/MSVC/Baltisot - generic/Baltisot - generic.vcproj
+++ b/MSVC/Baltisot - generic/Baltisot - generic.vcproj
@@ -1,21 +1,41 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="Baltisot - generic"

 	ProjectGUID="{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}"

-	Keyword="Win32Proj">

+	Keyword="Win32Proj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="4"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -23,42 +43,64 @@
 				PreprocessorDefinitions="_WINDOWS;ZLIB_DLL;READLINE_STATIC;READLINE_LIBRARY;STDC_HEADERS"

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/Baltisot - generic.lib"

-				IgnoreAllDefaultLibraries="FALSE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="$(OutDir)/Baltisot - generic.lib"

+				IgnoreAllDefaultLibraries="FALSE"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="4"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

@@ -67,36 +109,42 @@
 				AdditionalIncludeDirectories="..\..\generic\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\includes;..\..\generic\lib\lua\include;..\dirent;..\regex"

 				PreprocessorDefinitions="_WINDOWS;ZLIB_DLL;READLINE_STATIC;READLINE_LIBRARY;STDC_HEADERS"

 				StringPooling="TRUE"

-				RuntimeLibrary="4"

+				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="TRUE"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/Baltisot - generic.lib"

-				IgnoreAllDefaultLibraries="FALSE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="$(OutDir)/Baltisot - generic.lib"

+				IgnoreAllDefaultLibraries="FALSE"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -104,653 +152,838 @@
 	<Files>

 		<Filter

 			Name="Base class"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\generic\lib\Exceptions.cc">

+				RelativePath="..\..\generic\lib\Exceptions.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\include\Exceptions.h">

+				RelativePath="..\..\generic\include\Exceptions.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\lib\generic.cc">

+				RelativePath="..\..\generic\lib\generic.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\include\generic.h">

+				RelativePath="..\..\generic\include\generic.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="String class"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\generic\include\BString.h">

+				RelativePath="..\..\generic\include\BString.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\lib\checkargs.c">

+				RelativePath="..\..\generic\lib\checkargs.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\lib\datecalc.c">

+				RelativePath="..\..\generic\lib\datecalc.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\lib\String.cc">

+				RelativePath="..\..\generic\lib\String.cc"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Handle class"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\generic\lib\Handle.cc">

+				RelativePath="..\..\generic\lib\Handle.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\include\Handle.h">

+				RelativePath="..\..\generic\include\Handle.h"

+				>

 			</File>

 			<Filter

 				Name="Input class"

-				Filter="">

+				>

 				<File

-					RelativePath="..\..\generic\lib\Input.cc">

+					RelativePath="..\..\generic\lib\Input.cc"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\include\Input.h">

+					RelativePath="..\..\generic\include\Input.h"

+					>

 				</File>

 			</Filter>

 			<Filter

 				Name="Output class"

-				Filter="">

+				>

 				<File

-					RelativePath="..\..\generic\lib\Output.cc">

+					RelativePath="..\..\generic\lib\Output.cc"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\include\Output.h">

+					RelativePath="..\..\generic\include\Output.h"

+					>

 				</File>

 			</Filter>

 			<Filter

 				Name="Buffer class"

-				Filter="">

+				>

 				<File

-					RelativePath="..\..\generic\lib\Buffer.cc">

+					RelativePath="..\..\generic\lib\Buffer.cc"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\include\Buffer.h">

+					RelativePath="..\..\generic\include\Buffer.h"

+					>

 				</File>

 			</Filter>

 		</Filter>

 		<Filter

 			Name="BLua class"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\generic\lib\BLua.cc">

+				RelativePath="..\..\generic\lib\BLua.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\include\BLua.h">

+				RelativePath="..\..\generic\include\BLua.h"

+				>

 			</File>

 			<Filter

 				Name="LuaHandle"

-				Filter="">

+				>

 				<File

-					RelativePath="..\..\generic\lib\LuaHandle.cc">

+					RelativePath="..\..\generic\lib\LuaHandle.cc"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\include\LuaHandle.h">

+					RelativePath="..\..\generic\include\LuaHandle.h"

+					>

 				</File>

 			</Filter>

 		</Filter>

 		<Filter

 			Name="Main class"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\generic\lib\Main.cc">

+				RelativePath="..\..\generic\lib\Main.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\include\Main.h">

+				RelativePath="..\..\generic\include\Main.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Regex class"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\generic\include\BRegex.h">

+				RelativePath="..\..\generic\include\BRegex.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\lib\Regex.cc">

+				RelativePath="..\..\generic\lib\Regex.cc"

+				>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>

+						ObjectFile="$(IntDir)/$(InputName)1.obj"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="ConfigFile class"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\generic\lib\ConfigFile.cc">

+				RelativePath="..\..\generic\lib\ConfigFile.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\include\ConfigFile.h">

+				RelativePath="..\..\generic\include\ConfigFile.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Documentation"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\generic\doc\API">

+				RelativePath="..\..\generic\doc\API"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\doc\README">

+				RelativePath="..\..\generic\doc\README"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\doc\rfc1866.txt">

+				RelativePath="..\..\generic\doc\rfc1866.txt"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\doc\rfc2616.txt">

+				RelativePath="..\..\generic\doc\rfc2616.txt"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\doc\rfc2812.txt">

+				RelativePath="..\..\generic\doc\rfc2812.txt"

+				>

 			</File>

 			<File

-				RelativePath="..\..\generic\doc\rfc959.txt">

+				RelativePath="..\..\generic\doc\rfc959.txt"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Regex (external)"

-			Filter="">

+			>

 			<File

-				RelativePath="..\regex\regex.c">

+				RelativePath="..\regex\msvc-regex.c"

+				>

 			</File>

 			<File

-				RelativePath="..\regex\regex.h">

+				RelativePath="..\regex\regex.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Dirent (external)"

-			Filter="">

+			>

 			<File

-				RelativePath="..\dirent\_mingw.h">

+				RelativePath="..\dirent\_mingw.h"

+				>

 			</File>

 			<File

-				RelativePath="..\dirent\dirent.c">

+				RelativePath="..\dirent\dirent.c"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>

+						ObjectFile="$(IntDir)/$(InputName)1.obj"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>

+						ObjectFile="$(IntDir)/$(InputName)1.obj"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\dirent\dirent.h">

+				RelativePath="..\dirent\dirent.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Lua (external)"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\generic\lib\lua\src\luacomp.c">

+				RelativePath="..\..\generic\lib\lua\src\luacomp.c"

+				>

 			</File>

 			<Filter

 				Name="LuaSrc"

-				Filter="">

+				>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\lapi.c">

+					RelativePath="..\..\generic\lib\lua\src\lapi.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\lcode.c">

+					RelativePath="..\..\generic\lib\lua\src\lcode.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\ldebug.c">

+					RelativePath="..\..\generic\lib\lua\src\ldebug.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\ldo.c">

+					RelativePath="..\..\generic\lib\lua\src\ldo.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\ldump.c">

+					RelativePath="..\..\generic\lib\lua\src\ldump.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\lfunc.c">

+					RelativePath="..\..\generic\lib\lua\src\lfunc.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\lgc.c">

+					RelativePath="..\..\generic\lib\lua\src\lgc.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\llex.c">

+					RelativePath="..\..\generic\lib\lua\src\llex.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\lmem.c">

+					RelativePath="..\..\generic\lib\lua\src\lmem.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\lobject.c">

+					RelativePath="..\..\generic\lib\lua\src\lobject.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\lopcodes.c">

+					RelativePath="..\..\generic\lib\lua\src\lopcodes.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\lparser.c">

+					RelativePath="..\..\generic\lib\lua\src\lparser.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\lstate.c">

+					RelativePath="..\..\generic\lib\lua\src\lstate.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\lstring.c">

+					RelativePath="..\..\generic\lib\lua\src\lstring.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\ltable.c">

+					RelativePath="..\..\generic\lib\lua\src\ltable.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\ltests.c">

+					RelativePath="..\..\generic\lib\lua\src\ltests.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\ltm.c">

+					RelativePath="..\..\generic\lib\lua\src\ltm.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\lundump.c">

+					RelativePath="..\..\generic\lib\lua\src\lundump.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\lvm.c">

+					RelativePath="..\..\generic\lib\lua\src\lvm.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\lzio.c">

+					RelativePath="..\..\generic\lib\lua\src\lzio.c"

+					>

 				</File>

 			</Filter>

 			<Filter

 				Name="LuaIncludes"

-				Filter="">

+				>

 				<File

-					RelativePath="..\..\generic\lib\lua\include\lauxlib.h">

+					RelativePath="..\..\generic\lib\lua\include\lauxlib.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\include\lua.h">

+					RelativePath="..\..\generic\lib\lua\include\lua.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\include\lualib.h">

+					RelativePath="..\..\generic\lib\lua\include\lualib.h"

+					>

 				</File>

 			</Filter>

 			<Filter

 				Name="LuaLib"

-				Filter="">

+				>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\LuaLib\lauxlib.c">

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\lauxlib.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\LuaLib\lbaselib.c">

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\lbaselib.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\LuaLib\ldblib.c">

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\ldblib.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\LuaLib\ldirlib.c">

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\ldirlib.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\LuaLib\liolib.c">

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\liolib.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\LuaLib\lmathlib.c">

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\lmathlib.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\LuaLib\loadlib.c">

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\loadlib.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\LuaLib\lstrlib.c">

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\lstrlib.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\src\LuaLib\ltablib.c">

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\ltablib.c"

+					>

 				</File>

 			</Filter>

 			<Filter

 				Name="LuaHeaders"

-				Filter="">

+				>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\lapi.h">

+					RelativePath="..\..\generic\lib\lua\includes\lapi.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\lcode.h">

+					RelativePath="..\..\generic\lib\lua\includes\lcode.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\ldebug.h">

+					RelativePath="..\..\generic\lib\lua\includes\ldebug.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\ldo.h">

+					RelativePath="..\..\generic\lib\lua\includes\ldo.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\lfunc.h">

+					RelativePath="..\..\generic\lib\lua\includes\lfunc.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\lgc.h">

+					RelativePath="..\..\generic\lib\lua\includes\lgc.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\llex.h">

+					RelativePath="..\..\generic\lib\lua\includes\llex.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\llimits.h">

+					RelativePath="..\..\generic\lib\lua\includes\llimits.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\lmem.h">

+					RelativePath="..\..\generic\lib\lua\includes\lmem.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\lobject.h">

+					RelativePath="..\..\generic\lib\lua\includes\lobject.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\lopcodes.h">

+					RelativePath="..\..\generic\lib\lua\includes\lopcodes.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\lparser.h">

+					RelativePath="..\..\generic\lib\lua\includes\lparser.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\lstate.h">

+					RelativePath="..\..\generic\lib\lua\includes\lstate.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\lstring.h">

+					RelativePath="..\..\generic\lib\lua\includes\lstring.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\ltable.h">

+					RelativePath="..\..\generic\lib\lua\includes\ltable.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\ltm.h">

+					RelativePath="..\..\generic\lib\lua\includes\ltm.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\lundump.h">

+					RelativePath="..\..\generic\lib\lua\includes\lundump.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\lvm.h">

+					RelativePath="..\..\generic\lib\lua\includes\lvm.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\lua\includes\lzio.h">

+					RelativePath="..\..\generic\lib\lua\includes\lzio.h"

+					>

 				</File>

 			</Filter>

 		</Filter>

 		<Filter

 			Name="GetOpt (external)"

-			Filter="">

+			>

 			<File

-				RelativePath="..\getopt\getopt.c">

+				RelativePath="..\getopt\getopt.c"

+				>

 			</File>

 			<File

-				RelativePath="..\getopt\getopt.h">

+				RelativePath="..\getopt\getopt.h"

+				>

 			</File>

 			<File

-				RelativePath="..\getopt\getopt1.c">

+				RelativePath="..\getopt\getopt1.c"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Zlib (external)"

-			Filter="">

+			>

 			<Filter

 				Name="Src"

-				Filter="">

+				>

 				<File

-					RelativePath="..\..\generic\lib\zlib\src\adler32.c">

+					RelativePath="..\..\generic\lib\zlib\src\adler32.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\src\compress.c">

+					RelativePath="..\..\generic\lib\zlib\src\compress.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\src\crc32.c">

+					RelativePath="..\..\generic\lib\zlib\src\crc32.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\src\deflate.c">

+					RelativePath="..\..\generic\lib\zlib\src\deflate.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\src\gzio.c">

+					RelativePath="..\..\generic\lib\zlib\src\gzio.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\src\infblock.c">

+					RelativePath="..\..\generic\lib\zlib\src\infblock.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\src\infcodes.c">

+					RelativePath="..\..\generic\lib\zlib\src\infcodes.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\src\inffast.c">

+					RelativePath="..\..\generic\lib\zlib\src\inffast.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\src\inflate.c">

+					RelativePath="..\..\generic\lib\zlib\src\inflate.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\src\inftrees.c">

+					RelativePath="..\..\generic\lib\zlib\src\inftrees.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\src\infutil.c">

+					RelativePath="..\..\generic\lib\zlib\src\infutil.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\src\trees.c">

+					RelativePath="..\..\generic\lib\zlib\src\trees.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\src\uncompr.c">

+					RelativePath="..\..\generic\lib\zlib\src\uncompr.c"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\src\zutil.c">

+					RelativePath="..\..\generic\lib\zlib\src\zutil.c"

+					>

 				</File>

 			</Filter>

 			<Filter

 				Name="Includes"

-				Filter="">

+				>

 				<File

-					RelativePath="..\..\generic\lib\zlib\include\deflate.h">

+					RelativePath="..\..\generic\lib\zlib\include\deflate.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\include\infblock.h">

+					RelativePath="..\..\generic\lib\zlib\include\infblock.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\include\infcodes.h">

+					RelativePath="..\..\generic\lib\zlib\include\infcodes.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\include\inffast.h">

+					RelativePath="..\..\generic\lib\zlib\include\inffast.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\include\inffixed.h">

+					RelativePath="..\..\generic\lib\zlib\include\inffixed.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\include\inftrees.h">

+					RelativePath="..\..\generic\lib\zlib\include\inftrees.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\include\infutil.h">

+					RelativePath="..\..\generic\lib\zlib\include\infutil.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\include\trees.h">

+					RelativePath="..\..\generic\lib\zlib\include\trees.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\include\zconf.h">

+					RelativePath="..\..\generic\lib\zlib\include\zconf.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\include\zlib.h">

+					RelativePath="..\..\generic\lib\zlib\include\zlib.h"

+					>

 				</File>

 				<File

-					RelativePath="..\..\generic\lib\zlib\include\zutil.h">

+					RelativePath="..\..\generic\lib\zlib\include\zutil.h"

+					>

 				</File>

 			</Filter>

 		</Filter>

 		<Filter

 			Name="Readline (external)"

-			Filter="">

+			>

 			<File

-				RelativePath="..\readline\ansi_stdlib.h">

+				RelativePath="..\readline\ansi_stdlib.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\bind.c">

+				RelativePath="..\readline\bind.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\callback.c">

+				RelativePath="..\readline\callback.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\chardefs.h">

+				RelativePath="..\readline\chardefs.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\compat.c">

+				RelativePath="..\readline\compat.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\complete.c">

+				RelativePath="..\readline\complete.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\config.h">

+				RelativePath="..\readline\config.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\dirent.c">

+				RelativePath="..\readline\dirent.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\dirent.h">

+				RelativePath="..\readline\dirent.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\display.c">

+				RelativePath="..\readline\display.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\funmap.c">

+				RelativePath="..\readline\funmap.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\histexpand.c">

+				RelativePath="..\readline\histexpand.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\histfile.c">

+				RelativePath="..\readline\histfile.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\histlib.h">

+				RelativePath="..\readline\histlib.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\history.c">

+				RelativePath="..\readline\history.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\history.h">

+				RelativePath="..\readline\history.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\histsearch.c">

+				RelativePath="..\readline\histsearch.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\input.c">

+				RelativePath="..\readline\input.c"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>

+						ObjectFile="$(IntDir)/$(InputName)1.obj"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>

+						ObjectFile="$(IntDir)/$(InputName)1.obj"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\readline\isearch.c">

+				RelativePath="..\readline\isearch.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\keymaps.c">

+				RelativePath="..\readline\keymaps.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\keymaps.h">

+				RelativePath="..\readline\keymaps.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\kill.c">

+				RelativePath="..\readline\kill.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\macro.c">

+				RelativePath="..\readline\macro.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\mbutil.c">

+				RelativePath="..\readline\mbutil.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\misc.c">

+				RelativePath="..\readline\misc.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\nls.c">

+				RelativePath="..\readline\nls.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\parens.c">

+				RelativePath="..\readline\parens.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\posixdir.h">

+				RelativePath="..\readline\posixdir.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\posixjmp.h">

+				RelativePath="..\readline\posixjmp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\posixstat.h">

+				RelativePath="..\readline\posixstat.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\readline.c">

+				RelativePath="..\readline\readline.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\readline.h">

+				RelativePath="..\readline\readline.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\rlconf.h">

+				RelativePath="..\readline\rlconf.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\rldefs.h">

+				RelativePath="..\readline\rldefs.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\rldynlink.h">

+				RelativePath="..\readline\rldynlink.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\rlmbutil.h">

+				RelativePath="..\readline\rlmbutil.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\rlprivate.h">

+				RelativePath="..\readline\rlprivate.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\rlshell.h">

+				RelativePath="..\readline\rlshell.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\rlstdc.h">

+				RelativePath="..\readline\rlstdc.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\rltty.c">

+				RelativePath="..\readline\rltty.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\rltty.h">

+				RelativePath="..\readline\rltty.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\rltypedefs.h">

+				RelativePath="..\readline\rltypedefs.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\rlwinsize.h">

+				RelativePath="..\readline\rlwinsize.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\savestring.c">

+				RelativePath="..\readline\savestring.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\search.c">

+				RelativePath="..\readline\search.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\shell.c">

+				RelativePath="..\readline\shell.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\signals.c">

+				RelativePath="..\readline\signals.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\tcap.h">

+				RelativePath="..\readline\tcap.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\terminal.c">

+				RelativePath="..\readline\terminal.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\text.c">

+				RelativePath="..\readline\text.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\tilde.c">

+				RelativePath="..\readline\tilde.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\tilde.h">

+				RelativePath="..\readline\tilde.h"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\undo.c">

+				RelativePath="..\readline\undo.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\util.c">

+				RelativePath="..\readline\util.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\vi_keymap.c">

+				RelativePath="..\readline\vi_keymap.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\vi_mode.c">

+				RelativePath="..\readline\vi_mode.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\xmalloc.c">

+				RelativePath="..\readline\xmalloc.c"

+				>

 			</File>

 			<File

-				RelativePath="..\readline\xmalloc.h">

+				RelativePath="..\readline\xmalloc.h"

+				>

 			</File>

 		</Filter>

 	</Files>

diff --git a/MSVC/CD-Tool/CD-Tool.vcproj b/MSVC/CD-Tool/CD-Tool.vcproj
index 30a2813..ef2c42c 100644
--- a/MSVC/CD-Tool/CD-Tool.vcproj
+++ b/MSVC/CD-Tool/CD-Tool.vcproj
@@ -1,21 +1,41 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="CD-Tool"

 	ProjectGUID="{1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}"

-	Keyword="Win32Proj">

+	Keyword="Win32Proj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="1"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -23,13 +43,21 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)/CD-Tool.exe"

@@ -38,45 +66,71 @@
 				ProgramDatabaseFile="$(OutDir)/CD-Tool.pdb"

 				SubSystem="1"

 				StackReserveSize="0"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="1"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\getopt;..\..\generic\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\include;..\..\includes;..\..\psxdev;..\"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

+				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)/CD-Tool.exe"

@@ -86,27 +140,29 @@
 				StackReserveSize="0"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -115,22 +171,24 @@
 		<Filter

 			Name="Source Files"

 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

 			<File

-				RelativePath="..\..\cd-tool.cpp">

+				RelativePath="..\..\cd-tool.cpp"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

 			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

 		</Filter>

 		<Filter

 			Name="Resource Files"

 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

 		</Filter>

 	</Files>

-	<Globals>

-	</Globals>

 </VisualStudioProject>

diff --git a/MSVC/Dalos/Dalos.vcproj b/MSVC/Dalos/Dalos.vcproj
index ef4f9fa..57186c5 100644
--- a/MSVC/Dalos/Dalos.vcproj
+++ b/MSVC/Dalos/Dalos.vcproj
@@ -1,21 +1,41 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="Dalos"

 	ProjectGUID="{22F8F8CD-B256-446D-9B42-09CE83F74885}"

-	Keyword="Win32Proj">

+	Keyword="Win32Proj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="1"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -23,13 +43,21 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;READLINE_LIBRARY;READLINE_STATIC"

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/FORCE:MULTIPLE"

@@ -40,34 +68,52 @@
 				GenerateDebugInformation="TRUE"

 				ProgramDatabaseFile="$(OutDir)/Dalos.pdb"

 				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="1"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

@@ -76,14 +122,22 @@
 				AdditionalIncludeDirectories="..\..\generic\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\include;..\..\mogltk\include;&quot;..\..\..\SDL-1.2.7\include&quot;;..\..\MSVC;..\..\;..\..\includes;..\..\psxdev;..\..\Dalos"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;READLINE_LIBRARY;READLINE_STATIC"

 				StringPooling="TRUE"

-				RuntimeLibrary="4"

+				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="TRUE"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/FORCE:MULTIPLE"

@@ -95,42 +149,45 @@
 				SubSystem="1"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

 	</References>

 	<Files>

 		<File

-			RelativePath="..\..\Dalos\Console.cc">

+			RelativePath="..\..\Dalos\Console.cc"

+			>

 		</File>

 		<File

-			RelativePath="..\..\Dalos\Console.h">

+			RelativePath="..\..\Dalos\Console.h"

+			>

 		</File>

 		<File

-			RelativePath="..\..\Dalos\Dalos.cc">

+			RelativePath="..\..\Dalos\Dalos.cc"

+			>

 		</File>

 	</Files>

-	<Globals>

-	</Globals>

 </VisualStudioProject>

diff --git a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj
index bae4ecf..0a749d6 100644
--- a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj
+++ b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj
@@ -1,21 +1,41 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="PSX-Bundle - library"

 	ProjectGUID="{0A2CD193-F270-4F2B-943C-F8BDF792D25C}"

-	Keyword="Win32Proj">

+	Keyword="Win32Proj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="4"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -23,41 +43,63 @@
 				PreprocessorDefinitions="_WINDOWS;ZLIB_DLL"

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/PSX-Bundle - library.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="$(OutDir)/PSX-Bundle - library.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="4"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

@@ -66,35 +108,41 @@
 				AdditionalIncludeDirectories="..\..\generic\lib\lua\includes;..\..\generic\lib\lua\include;..\..\generic\include;..\..\includes;..\..\generic\lib\zlib\include;..\..\psxdev"

 				PreprocessorDefinitions="_WINDOWS;ZLIB_DLL"

 				StringPooling="TRUE"

-				RuntimeLibrary="4"

+				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="TRUE"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/PSX-Bundle - library.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="$(OutDir)/PSX-Bundle - library.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -102,126 +150,155 @@
 	<Files>

 		<Filter

 			Name="Lzss class"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\lib\lzss.cpp">

+				RelativePath="..\..\lib\lzss.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\includes\lzss.h">

+				RelativePath="..\..\includes\lzss.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="CD classes"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\lib\cdabstract.cpp">

+				RelativePath="..\..\lib\cdabstract.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\includes\cdabstract.h">

+				RelativePath="..\..\includes\cdabstract.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\lib\cdreader.cpp">

+				RelativePath="..\..\lib\cdreader.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\includes\cdreader.h">

+				RelativePath="..\..\includes\cdreader.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\lib\cdutils.cpp">

+				RelativePath="..\..\lib\cdutils.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\includes\cdutils.h">

+				RelativePath="..\..\includes\cdutils.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\lib\isobuilder.cpp">

+				RelativePath="..\..\lib\isobuilder.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\includes\isobuilder.h">

+				RelativePath="..\..\includes\isobuilder.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\lib\luacd.cpp">

+				RelativePath="..\..\lib\luacd.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\includes\luacd.h">

+				RelativePath="..\..\includes\luacd.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\lib\yazedc.cpp">

+				RelativePath="..\..\lib\yazedc.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\includes\yazedc.h">

+				RelativePath="..\..\includes\yazedc.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Misc classes"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\lib\luapsx.cpp">

+				RelativePath="..\..\lib\luapsx.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\includes\luapsx.h">

+				RelativePath="..\..\includes\luapsx.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="psxdev.de code"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\psxdev\bs.c">

+				RelativePath="..\..\psxdev\bs.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\psxdev\bs.h">

+				RelativePath="..\..\psxdev\bs.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\psxdev\common.h">

+				RelativePath="..\..\psxdev\common.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\psxdev\idctfst.c">

+				RelativePath="..\..\psxdev\idctfst.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\psxdev\jfdctint.c">

+				RelativePath="..\..\psxdev\jfdctint.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\psxdev\table.h">

+				RelativePath="..\..\psxdev\table.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\psxdev\vlc.c">

+				RelativePath="..\..\psxdev\vlc.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\psxdev\xadecode.c">

+				RelativePath="..\..\psxdev\xadecode.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\psxdev\xadecode.h">

+				RelativePath="..\..\psxdev\xadecode.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Documentation"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\FAQ.txt">

+				RelativePath="..\..\FAQ.txt"

+				>

 			</File>

 			<Filter

 				Name="English"

-				Filter="">

+				>

 				<File

-					RelativePath="..\..\FAQ-cd.txt">

+					RelativePath="..\..\FAQ-cd.txt"

+					>

 				</File>

 				<File

-					RelativePath="..\..\FAQ-lzss.txt">

+					RelativePath="..\..\FAQ-lzss.txt"

+					>

 				</File>

 				<File

-					RelativePath="..\..\FAQ-psx.txt">

+					RelativePath="..\..\FAQ-psx.txt"

+					>

 				</File>

 			</Filter>

 			<Filter

 				Name="French"

-				Filter="">

+				>

 				<File

-					RelativePath="..\..\EmuPatch-FAQ.txt">

+					RelativePath="..\..\EmuPatch-FAQ.txt"

+					>

 				</File>

 				<File

-					RelativePath="..\..\FAQ-cd-fr.txt">

+					RelativePath="..\..\FAQ-cd-fr.txt"

+					>

 				</File>

 			</Filter>

 		</Filter>

 	</Files>

-	<Globals>

-	</Globals>

 </VisualStudioProject>

diff --git a/MSVC/PSX-Bundle.sln b/MSVC/PSX-Bundle.sln
index 048868b..25bd3ec 100644
--- a/MSVC/PSX-Bundle.sln
+++ b/MSVC/PSX-Bundle.sln
@@ -1,4 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tools", "Tools\Tools.vcproj", "{6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}"

 	ProjectSection(ProjectDependencies) = postProject

 		{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927} = {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}

@@ -18,8 +19,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dalos", "Dalos\Dalos.vcproj
 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Baltisot - generic", "Baltisot - generic\Baltisot - generic.vcproj", "{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PSX-Bundle - library", "PSX-Bundle - library\PSX-Bundle - library.vcproj", "{0A2CD193-F270-4F2B-943C-F8BDF792D25C}"

 	ProjectSection(ProjectDependencies) = postProject

@@ -33,38 +32,37 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CD-Tool", "CD-Tool\CD-Tool.
 	EndProjectSection

 EndProject

 Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Release = Release

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Debug.ActiveCfg = Debug|Win32

-		{6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Debug.Build.0 = Debug|Win32

-		{6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Release.ActiveCfg = Release|Win32

-		{6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Release.Build.0 = Release|Win32

-		{34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Debug.ActiveCfg = Debug|Win32

-		{34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Debug.Build.0 = Debug|Win32

-		{34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Release.ActiveCfg = Release|Win32

-		{34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Release.Build.0 = Release|Win32

-		{22F8F8CD-B256-446D-9B42-09CE83F74885}.Debug.ActiveCfg = Debug|Win32

-		{22F8F8CD-B256-446D-9B42-09CE83F74885}.Debug.Build.0 = Debug|Win32

-		{22F8F8CD-B256-446D-9B42-09CE83F74885}.Release.ActiveCfg = Release|Win32

-		{22F8F8CD-B256-446D-9B42-09CE83F74885}.Release.Build.0 = Release|Win32

-		{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Debug.ActiveCfg = Debug|Win32

-		{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Debug.Build.0 = Debug|Win32

-		{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Release.ActiveCfg = Release|Win32

-		{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Release.Build.0 = Release|Win32

-		{0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Debug.ActiveCfg = Debug|Win32

-		{0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Debug.Build.0 = Debug|Win32

-		{0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Release.ActiveCfg = Release|Win32

-		{0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Release.Build.0 = Release|Win32

-		{1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Debug.ActiveCfg = Debug|Win32

-		{1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Debug.Build.0 = Debug|Win32

-		{1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Release.ActiveCfg = Release|Win32

-		{1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Release.Build.0 = Release|Win32

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Release|Win32 = Release|Win32

 	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Debug|Win32.Build.0 = Debug|Win32

+		{6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Release|Win32.ActiveCfg = Release|Win32

+		{6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Release|Win32.Build.0 = Release|Win32

+		{34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Debug|Win32.ActiveCfg = Debug|Win32

+		{34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Debug|Win32.Build.0 = Debug|Win32

+		{34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Release|Win32.ActiveCfg = Release|Win32

+		{34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Release|Win32.Build.0 = Release|Win32

+		{22F8F8CD-B256-446D-9B42-09CE83F74885}.Debug|Win32.ActiveCfg = Debug|Win32

+		{22F8F8CD-B256-446D-9B42-09CE83F74885}.Debug|Win32.Build.0 = Debug|Win32

+		{22F8F8CD-B256-446D-9B42-09CE83F74885}.Release|Win32.ActiveCfg = Release|Win32

+		{22F8F8CD-B256-446D-9B42-09CE83F74885}.Release|Win32.Build.0 = Release|Win32

+		{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Debug|Win32.ActiveCfg = Debug|Win32

+		{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Debug|Win32.Build.0 = Debug|Win32

+		{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Release|Win32.ActiveCfg = Release|Win32

+		{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Release|Win32.Build.0 = Release|Win32

+		{0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Debug|Win32.ActiveCfg = Debug|Win32

+		{0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Debug|Win32.Build.0 = Debug|Win32

+		{0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Release|Win32.ActiveCfg = Release|Win32

+		{0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Release|Win32.Build.0 = Release|Win32

+		{1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Debug|Win32.ActiveCfg = Debug|Win32

+		{1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Debug|Win32.Build.0 = Debug|Win32

+		{1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Release|Win32.ActiveCfg = Release|Win32

+		{1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Release|Win32.Build.0 = Release|Win32

 	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

 	EndGlobalSection

 EndGlobal

diff --git a/MSVC/Tools/Tools.vcproj b/MSVC/Tools/Tools.vcproj
index 55de511..2789e3b 100644
--- a/MSVC/Tools/Tools.vcproj
+++ b/MSVC/Tools/Tools.vcproj
@@ -1,36 +1,50 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="Tools"

 	ProjectGUID="{6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}"

-	Keyword="MakeFileProj">

+	Keyword="MakeFileProj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

-			ConfigurationType="0">

+			ConfigurationType="0"

+			>

 			<Tool

 				Name="VCNMakeTool"

 				BuildCommandLine="nmake debugall"

 				ReBuildCommandLine="nmake debugrebuild"

-				CleanCommandLine="nmake clean"/>

+				CleanCommandLine="nmake clean"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

-			ConfigurationType="0">

+			ConfigurationType="0"

+			>

 			<Tool

 				Name="VCNMakeTool"

 				BuildCommandLine="nmake all"

 				ReBuildCommandLine="nmake rebuild"

-				CleanCommandLine="nmake clean"/>

+				CleanCommandLine="nmake clean"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -38,154 +52,197 @@
 	<Files>

 		<Filter

 			Name="Common tools"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			>

 			<File

-				RelativePath="..\..\bgrep.cpp">

+				RelativePath="..\..\bgrep.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\cd-tool.cpp">

+				RelativePath="..\..\cd-tool.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\cd-tool.lua">

+				RelativePath="..\..\cd-tool.lua"

+				>

 			</File>

 			<File

-				RelativePath="..\..\crypto-search.cpp">

+				RelativePath="..\..\crypto-search.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\luapatch-languages.h">

+				RelativePath="..\..\luapatch-languages.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\luapatch-res.h">

+				RelativePath="..\..\luapatch-res.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\luapatch.cpp">

+				RelativePath="..\..\luapatch.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\luapatch.rc">

+				RelativePath="..\..\luapatch.rc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\lzss-main.cpp">

+				RelativePath="..\..\lzss-main.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\testlua.lua">

+				RelativePath="..\..\testlua.lua"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Xenogears tools"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\Xenogears\compil.lex">

+				RelativePath="..\..\Xenogears\compil.lex"

+				>

 			</File>

 			<File

-				RelativePath="..\..\Xenogears\Decrypt.cpp">

+				RelativePath="..\..\Xenogears\Decrypt.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\Xenogears\main_dump.cpp">

+				RelativePath="..\..\Xenogears\main_dump.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\Xenogears\nmakefile">

+				RelativePath="..\..\Xenogears\nmakefile"

+				>

 			</File>

 			<File

-				RelativePath="..\..\Xenogears\reinsert.cpp">

+				RelativePath="..\..\Xenogears\reinsert.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\Xenogears\script-comp.cpp">

+				RelativePath="..\..\Xenogears\script-comp.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\Xenogears\script-dec.cpp">

+				RelativePath="..\..\Xenogears\script-dec.cpp"

+				>

 			</File>

 			<Filter

 				Name="Helpers"

-				Filter="">

+				>

 				<File

-					RelativePath="..\..\Xenogears\map2sqr">

+					RelativePath="..\..\Xenogears\map2sqr"

+					>

 				</File>

 				<File

-					RelativePath="..\..\Xenogears\XenoCD1.map">

+					RelativePath="..\..\Xenogears\XenoCD1.map"

+					>

 				</File>

 				<File

-					RelativePath="..\..\Xenogears\XenoCD2.map">

+					RelativePath="..\..\Xenogears\XenoCD2.map"

+					>

 				</File>

 			</Filter>

 		</Filter>

 		<Filter

-			Name="Global Makefiles">

+			Name="Global Makefiles"

+			>

 			<File

-				RelativePath="makefile">

+				RelativePath="makefile"

+				>

 			</File>

 			<File

-				RelativePath="MakInDir.bat">

+				RelativePath="MakInDir.bat"

+				>

 			</File>

 			<File

-				RelativePath="master.mak">

+				RelativePath="master.mak"

+				>

 			</File>

 			<File

-				RelativePath="..\..\nmakefile">

+				RelativePath="..\..\nmakefile"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Parasite Eve tools"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\PE\Aya.bmp">

+				RelativePath="..\..\PE\Aya.bmp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\aya.ico">

+				RelativePath="..\..\PE\aya.ico"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\compil.lex">

+				RelativePath="..\..\PE\compil.lex"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\compilall.cpp">

+				RelativePath="..\..\PE\compilall.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\extract-rooms.cpp">

+				RelativePath="..\..\PE\extract-rooms.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\extract-various.cpp">

+				RelativePath="..\..\PE\extract-various.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\extract.cpp">

+				RelativePath="..\..\PE\extract.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\nmakefile">

+				RelativePath="..\..\PE\nmakefile"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\pe-hack.lua">

+				RelativePath="..\..\PE\pe-hack.lua"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\pepatch-res.h">

+				RelativePath="..\..\PE\pepatch-res.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\pepatch.cpp">

+				RelativePath="..\..\PE\pepatch.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\pepatch.rc">

+				RelativePath="..\..\PE\pepatch.rc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\reinsert-res.h">

+				RelativePath="..\..\PE\reinsert-res.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\reinsert.cpp">

+				RelativePath="..\..\PE\reinsert.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\reinsert.h">

+				RelativePath="..\..\PE\reinsert.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\reinsert.rc">

+				RelativePath="..\..\PE\reinsert.rc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\PE\table.h">

+				RelativePath="..\..\PE\table.h"

+				>

 			</File>

 		</Filter>

 		<File

-			RelativePath="..\..\cdrom.ico">

+			RelativePath="..\..\cdrom.ico"

+			>

 		</File>

 		<File

 			RelativePath="Links.htm"

-			DeploymentContent="TRUE">

+			DeploymentContent="TRUE"

+			>

 		</File>

 	</Files>

-	<Globals>

-	</Globals>

 </VisualStudioProject>

diff --git a/MSVC/Tools/master.mak b/MSVC/Tools/master.mak
index 583f1eb..986dfe7 100644
--- a/MSVC/Tools/master.mak
+++ b/MSVC/Tools/master.mak
@@ -48,9 +48,9 @@ _XSD=xsd.exe
 
 #define our basic link line for managed code
 !IFDEF DEBUG
-_LINK=link.exe /INCREMENTAL /NOLOGO /DEBUG /MACHINE:I386 /NODEFAULTLIB:LIBC /DEFAULTLIB:AdvAPI32
+_LINK=link.exe /INCREMENTAL /NOLOGO /DEBUG /MACHINE:I386 /NODEFAULTLIB:LIBC /NODEFAULTLIB:LIBCMT /DEFAULTLIB:AdvAPI32
 !ELSE
-_LINK=link.exe /INCREMENTAL /NOLOGO /MACHINE:I386 /NODEFAULTLIB:LIBCD /DEFAULTLIB:AdvAPI32
+_LINK=link.exe /INCREMENTAL /NOLOGO /MACHINE:I386 /NODEFAULTLIB:LIBCD /NODEFAULTLIB:LIBCMTD /DEFAULTLIB:AdvAPI32
 !ENDIF
 
 #this is used for compiling C# samples
diff --git a/MSVC/mogltk/mogltk.vcproj b/MSVC/mogltk/mogltk.vcproj
index c7a7d35..c0ef368 100644
--- a/MSVC/mogltk/mogltk.vcproj
+++ b/MSVC/mogltk/mogltk.vcproj
@@ -1,21 +1,41 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="mogltk"

 	ProjectGUID="{34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}"

-	Keyword="Win32Proj">

+	Keyword="Win32Proj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="4"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -23,41 +43,63 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/mogltk.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="$(OutDir)/mogltk.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="4"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

@@ -66,35 +108,41 @@
 				AdditionalIncludeDirectories="..\..\mogltk\include;..\..\generic\include;&quot;..\..\..\SDL-1.2.7\include&quot;;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				StringPooling="TRUE"

-				RuntimeLibrary="4"

+				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="TRUE"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/mogltk.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="$(OutDir)/mogltk.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -102,115 +150,139 @@
 	<Files>

 		<Filter

 			Name="base"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\mogltk\lib\base.cc">

+				RelativePath="..\..\mogltk\lib\base.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\include\base.h">

+				RelativePath="..\..\mogltk\include\base.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\lib\glbase.cc">

+				RelativePath="..\..\mogltk\lib\glbase.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\include\glbase.h">

+				RelativePath="..\..\mogltk\include\glbase.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="engine"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\mogltk\lib\engine.cc">

+				RelativePath="..\..\mogltk\lib\engine.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\include\engine.h">

+				RelativePath="..\..\mogltk\include\engine.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="font"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\mogltk\lib\font.cc">

+				RelativePath="..\..\mogltk\lib\font.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\include\font.h">

+				RelativePath="..\..\mogltk\include\font.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\lib\glfont.cc">

+				RelativePath="..\..\mogltk\lib\glfont.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\include\glfont.h">

+				RelativePath="..\..\mogltk\include\glfont.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="mcolor"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\mogltk\lib\mcolor.cc">

+				RelativePath="..\..\mogltk\lib\mcolor.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\include\mcolor.h">

+				RelativePath="..\..\mogltk\include\mcolor.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="shape"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\mogltk\lib\glshape.cc">

+				RelativePath="..\..\mogltk\lib\glshape.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\include\glshape.h">

+				RelativePath="..\..\mogltk\include\glshape.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\lib\shape.cc">

+				RelativePath="..\..\mogltk\lib\shape.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\include\shape.h">

+				RelativePath="..\..\mogltk\include\shape.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="sprite"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\mogltk\lib\glsprite.cc">

+				RelativePath="..\..\mogltk\lib\glsprite.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\include\glsprite.h">

+				RelativePath="..\..\mogltk\include\glsprite.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\lib\sprite.cc">

+				RelativePath="..\..\mogltk\lib\sprite.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\include\sprite.h">

+				RelativePath="..\..\mogltk\include\sprite.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="texture"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\mogltk\lib\texture.cc">

+				RelativePath="..\..\mogltk\lib\texture.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\include\texture.h">

+				RelativePath="..\..\mogltk\include\texture.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="widgets"

-			Filter="">

+			>

 			<File

-				RelativePath="..\..\mogltk\lib\glwidgets.cc">

+				RelativePath="..\..\mogltk\lib\glwidgets.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\include\glwidgets.h">

+				RelativePath="..\..\mogltk\include\glwidgets.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\lib\widgets.cc">

+				RelativePath="..\..\mogltk\lib\widgets.cc"

+				>

 			</File>

 			<File

-				RelativePath="..\..\mogltk\include\widgets.h">

+				RelativePath="..\..\mogltk\include\widgets.h"

+				>

 			</File>

 		</Filter>

 	</Files>

-	<Globals>

-	</Globals>

 </VisualStudioProject>