Upgrading to MS Visual Studio 2005

2 files changed, 116 insertions, 59 deletions

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