TCF Agent: added support of 64-bit Windows.

1 files changed, 354 insertions, 22 deletions

diff --git a/agent/agent.vcproj b/agent/agent.vcproj
index f941d680..f13dd7c6 100644
--- a/agent/agent.vcproj
+++ b/agent/agent.vcproj
@@ -4,20 +4,24 @@
 	Version="9.00"

 	Name="agent"

 	ProjectGUID="{A1341B90-F807-4D1F-A48E-C42BE62D9C57}"

+	RootNamespace="agent"

 	TargetFrameworkVersion="0"

 	>

 	<Platforms>

 		<Platform

 			Name="Win32"

 		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

 	<ToolFiles>

 	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)\obj\MSVC\$(ConfigurationName)"

-			IntermediateDirectory="$(SolutionDir)\obj\MSVC\$(ConfigurationName)"

+			OutputDirectory="$(SolutionDir)\obj\MSVC\$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(SolutionDir)\obj\MSVC\$(PlatformName)\$(ConfigurationName)"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

@@ -37,7 +41,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\obj\MSVC\Release/agent.tlb"

+				TypeLibraryName="$(OutDir)\agent.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -46,14 +50,14 @@
 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories=".;system/Windows;machine/x86_64"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				PreprocessorDefinitions="NDEBUG;_CONSOLE"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\obj\MSVC\Release/agent.pch"

-				AssemblerListingLocation=".\obj\MSVC\Release/"

-				ObjectFile=".\obj\MSVC\Release/"

-				ProgramDataBaseFileName=".\obj\MSVC\Release/"

+				PrecompiledHeaderFile="$(OutDir)\agent.pch"

+				AssemblerListingLocation="$(OutDir)\"

+				ObjectFile="$(OutDir)\"

+				ProgramDataBaseFileName="$(OutDir)\"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="1"

@@ -72,10 +76,10 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="WS2_32.lib Iphlpapi.lib version.lib"

-				OutputFile=".\obj\MSVC\Release/agent.exe"

+				OutputFile="$(OutDir)\agent.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				ProgramDatabaseFile=".\obj\MSVC\Release/agent.pdb"

+				ProgramDatabaseFile="$(OutDir)\agent.pdb"

 				SubSystem="1"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="2"

@@ -93,7 +97,99 @@
 			<Tool

 				Name="VCBscMakeTool"

 				SuppressStartupBanner="true"

-				OutputFile=".\obj\MSVC\Release/agent.bsc"

+				OutputFile="$(OutDir)\agent.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(SolutionDir)\obj\MSVC\$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(SolutionDir)\obj\MSVC\$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName="$(OutDir)\agent.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalOptions="/Oy-"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories=".;system/Windows;machine/x86_64"

+				PreprocessorDefinitions="NDEBUG;_CONSOLE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				PrecompiledHeaderFile="$(OutDir)\agent.pch"

+				AssemblerListingLocation="$(OutDir)\"

+				ObjectFile="$(OutDir)\"

+				ProgramDataBaseFileName="$(OutDir)\"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="1"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="WS2_32.lib Iphlpapi.lib version.lib"

+				OutputFile="$(OutDir)\agent.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile="$(OutDir)\agent.pdb"

+				SubSystem="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="2"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile="$(OutDir)\agent.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -107,8 +203,8 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)\obj\MSVC\$(ConfigurationName)"

-			IntermediateDirectory="$(SolutionDir)\obj\MSVC\$(ConfigurationName)"

+			OutputDirectory="$(SolutionDir)\obj\MSVC\$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(SolutionDir)\obj\MSVC\$(PlatformName)\$(ConfigurationName)"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

@@ -128,20 +224,20 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\obj\MSVC\Debug/agent.tlb"

+				TypeLibraryName="$(OutDir)\agent.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".;system/Windows;machine/x86_64"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				PreprocessorDefinitions="_DEBUG;_CONSOLE"

 				MinimalRebuild="true"

 				RuntimeLibrary="1"

-				PrecompiledHeaderFile=".\obj\MSVC\Debug/agent.pch"

-				AssemblerListingLocation=".\obj\MSVC\Debug/"

-				ObjectFile=".\obj\MSVC\Debug/"

-				ProgramDataBaseFileName=".\obj\MSVC\Debug/"

+				PrecompiledHeaderFile="$(OutDir)\agent.pch"

+				AssemblerListingLocation="$(OutDir)\"

+				ObjectFile="$(OutDir)\"

+				ProgramDataBaseFileName="$(OutDir)\"

 				WarningLevel="4"

 				SuppressStartupBanner="true"

 				Detect64BitPortabilityProblems="false"

@@ -162,11 +258,11 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="WS2_32.lib Iphlpapi.lib version.lib"

-				OutputFile=".\obj\MSVC\Debug/agent.exe"

+				OutputFile="$(OutDir)\agent.exe"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\obj\MSVC\Debug/agent.pdb"

+				ProgramDatabaseFile="$(OutDir)\agent.pdb"

 				SubSystem="1"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="2"

@@ -184,7 +280,99 @@
 			<Tool

 				Name="VCBscMakeTool"

 				SuppressStartupBanner="true"

-				OutputFile=".\obj\MSVC\Debug/agent.bsc"

+				OutputFile="$(OutDir)\agent.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(SolutionDir)\obj\MSVC\$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(SolutionDir)\obj\MSVC\$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+				TypeLibraryName="$(OutDir)\agent.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".;system/Windows;machine/x86_64"

+				PreprocessorDefinitions="_DEBUG;_CONSOLE"

+				MinimalRebuild="true"

+				RuntimeLibrary="1"

+				PrecompiledHeaderFile="$(OutDir)\agent.pch"

+				AssemblerListingLocation="$(OutDir)\"

+				ObjectFile="$(OutDir)\"

+				ProgramDataBaseFileName="$(OutDir)\"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+				CompileAs="1"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="WS2_32.lib Iphlpapi.lib version.lib"

+				OutputFile="$(OutDir)\agent.exe"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)\agent.pdb"

+				SubSystem="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="2"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile="$(OutDir)\agent.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -695,6 +883,14 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

+					Name="Release|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Debug|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -702,6 +898,14 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\tcf\main\main_log.c"

@@ -715,6 +919,14 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

+					Name="Release|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Debug|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -722,6 +934,14 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\tcf\main\main_lua.c"

@@ -735,6 +955,14 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

+					Name="Release|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Debug|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -742,6 +970,14 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\tcf\main\main_reg.c"

@@ -755,6 +991,14 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

+					Name="Release|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Debug|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -762,6 +1006,14 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\tcf\main\main_va.c"

@@ -775,6 +1027,14 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

+					Name="Release|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Debug|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -782,6 +1042,14 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\tcf\main\server.c"

@@ -865,6 +1133,14 @@
 							/>

 						</FileConfiguration>

 						<FileConfiguration

+							Name="Release|x64"

+							ExcludedFromBuild="true"

+							>

+							<Tool

+								Name="VCCLCompilerTool"

+							/>

+						</FileConfiguration>

+						<FileConfiguration

 							Name="Debug|Win32"

 							ExcludedFromBuild="true"

 							>

@@ -872,6 +1148,14 @@
 								Name="VCCLCompilerTool"

 							/>

 						</FileConfiguration>

+						<FileConfiguration

+							Name="Debug|x64"

+							ExcludedFromBuild="true"

+							>

+							<Tool

+								Name="VCCLCompilerTool"

+							/>

+						</FileConfiguration>

 					</File>

 					<File

 						RelativePath=".\system\GNU\Linux\tcf\regset.h"

@@ -894,6 +1178,14 @@
 						/>

 					</FileConfiguration>

 					<FileConfiguration

+						Name="Release|x64"

+						ExcludedFromBuild="true"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+						/>

+					</FileConfiguration>

+					<FileConfiguration

 						Name="Debug|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -901,6 +1193,14 @@
 							Name="VCCLCompilerTool"

 						/>

 					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug|x64"

+						ExcludedFromBuild="true"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+						/>

+					</FileConfiguration>

 				</File>

 				<File

 					RelativePath=".\system\Darwin\tcf\regset.h"

@@ -922,6 +1222,14 @@
 						/>

 					</FileConfiguration>

 					<FileConfiguration

+						Name="Release|x64"

+						ExcludedFromBuild="true"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+						/>

+					</FileConfiguration>

+					<FileConfiguration

 						Name="Debug|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -929,6 +1237,14 @@
 							Name="VCCLCompilerTool"

 						/>

 					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug|x64"

+						ExcludedFromBuild="true"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+						/>

+					</FileConfiguration>

 				</File>

 				<File

 					RelativePath=".\system\FreeBSD\tcf\regset.h"

@@ -950,6 +1266,14 @@
 						/>

 					</FileConfiguration>

 					<FileConfiguration

+						Name="Release|x64"

+						ExcludedFromBuild="true"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+						/>

+					</FileConfiguration>

+					<FileConfiguration

 						Name="Debug|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -957,6 +1281,14 @@
 							Name="VCCLCompilerTool"

 						/>

 					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug|x64"

+						ExcludedFromBuild="true"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+						/>

+					</FileConfiguration>

 				</File>

 				<File

 					RelativePath=".\system\VxWorks\tcf\context-vxworks.h"