Utilisateur : Fcolin Date : 18/11/05 Heure : 11:46 Archivé dans $/Bus/IvyProbe Commentaire: (vss 10)

1 files changed, 431 insertions, 92 deletions

diff --git a/IvyProbe/IvyProbe.vcproj b/IvyProbe/IvyProbe.vcproj
index 51eb42d..542fa9f 100644
--- a/IvyProbe/IvyProbe.vcproj
+++ b/IvyProbe/IvyProbe.vcproj
@@ -1,229 +1,568 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="IvyProbe"

 	ProjectGUID="{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}"

+	RootNamespace="IvyProbe"

 	SccProjectName="&quot;$/Bus/IvyProbe&quot;, ZPBAAAAA"

-	SccAuxPath=""

 	SccLocalPath="."

 	SccProvider="MSSCCI:Microsoft Visual SourceSafe"

-	Keyword="MFCProj">

+	Keyword="MFCProj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="C:\users\fcolin\Program Files\$(ConfigurationName)"

-			IntermediateDirectory=".\Debug"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Debug/Test.tlb"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\Ivy;&quot;C:\Program Files\GnuWin32\include&quot;"

+				AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"

 				PreprocessorDefinitions="USE_ETS"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="stdafx.h"

-				PrecompiledHeaderFile=".\Debug/Test.pch"

-				AssemblerListingLocation=".\Debug/"

-				ObjectFile=".\Debug/"

-				ProgramDataBaseFileName=".\Debug/"

 				BrowseInformation="1"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"/>

+				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1036"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="ComCtl32.lib"

 				LinkIncremental="2"

-				SuppressStartupBanner="TRUE"

-				AdditionalLibraryDirectories="&quot;C:\Program Files\GnuWin32\lib&quot;"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\Debug/Test.pdb"

-				SubSystem="2"/>

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories=""

+				GenerateDebugInformation="true"

+				SubSystem="2"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

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

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="2"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

 				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="TRUE"

-				SuppressStartupBanner="TRUE"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Debug/Test.tlb"/>

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="3"

+				TypeLibraryName=".\Debug/Test.tlb"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"

+				PreprocessorDefinitions="USE_ETS"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderThrough="stdafx.h"

+				BrowseInformation="1"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

-				Culture="1036"/>

+				Culture="1036"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCLinkerTool"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories=""

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				TargetMachine="17"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="C:\users\fcolin\Program Files\$(ConfigurationName)"

 			IntermediateDirectory=".\Release"

 			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/Test.tlb"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\Ivy;&quot;C:\Program Files\GnuWin32\include&quot;"

+				AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"

 				PreprocessorDefinitions="USE_ETS"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="stdafx.h"

-				PrecompiledHeaderFile=".\Release/Test.pch"

-				AssemblerListingLocation=".\Release/"

-				ObjectFile=".\Release/"

-				ProgramDataBaseFileName=".\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"/>

+				SuppressStartupBanner="true"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_AFXDLL;NDEBUG"

+				Culture="1036"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

-				OutputFile="$(OutDir)/$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				AdditionalLibraryDirectories="&quot;C:\Program Files\GnuWin32\lib&quot;"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories=""

 				ProgramDatabaseFile=".\Release/Test.pdb"

-				SubSystem="2"/>

+				SubSystem="2"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

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

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="2"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

 				Name="VCMIDLTool"

 				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="TRUE"

-				SuppressStartupBanner="TRUE"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Release/Test.tlb"/>

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="3"

+				TypeLibraryName=".\Release/Test.tlb"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"

+				PreprocessorDefinitions="USE_ETS"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="2"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				Detect64BitPortabilityProblems="true"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_AFXDLL;NDEBUG"

-				Culture="1036"/>

+				Culture="1036"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCLinkerTool"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories=""

+				SubSystem="2"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

+		<ProjectReference

+			ReferencedProjectIdentifier="{9BD87B7A-517E-4900-B3EA-A358885CD876}"

+			RelativePathToProject=".\Ivy\Ivy.vcproj"

+		/>

 	</References>

 	<Files>

 		<Filter

 			Name="Source Files"

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

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

+			>

 			<File

-				RelativePath=".\ETSLayout.cpp">

+				RelativePath=".\ETSLayout.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\HistoryEdit.cpp">

+				RelativePath=".\HistoryEdit.cpp"

+				>

 			</File>

 			<File

-				RelativePath="IvyProbe.cpp">

+				RelativePath="IvyProbe.cpp"

+				>

 			</File>

 			<File

-				RelativePath="IvyProbeDlg.cpp">

+				RelativePath="IvyProbeDlg.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\StdAfx.cpp">

+				RelativePath=".\StdAfx.cpp"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Debug|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\TestParseCmdLine.cpp">

+				RelativePath=".\TestParseCmdLine.cpp"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl">

+			Filter="h;hpp;hxx;hm;inl"

+			>

 			<File

-				RelativePath=".\ETSLayout.h">

+				RelativePath=".\ETSLayout.h"

+				>

 			</File>

 			<File

-				RelativePath=".\HistoryEdit.h">

+				RelativePath=".\HistoryEdit.h"

+				>

 			</File>

 			<File

-				RelativePath="IvyProbe.h">

+				RelativePath="IvyProbe.h"

+				>

 			</File>

 			<File

-				RelativePath="IvyProbeDlg.h">

+				RelativePath="IvyProbeDlg.h"

+				>

 			</File>

 			<File

-				RelativePath=".\Resource.h">

+				RelativePath=".\Resource.h"

+				>

 			</File>

 			<File

-				RelativePath=".\StdAfx.h">

+				RelativePath=".\StdAfx.h"

+				>

 			</File>

 			<File

-				RelativePath=".\TestParseCmdLine.h">

+				RelativePath=".\TestParseCmdLine.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe">

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

+			>

 			<File

-				RelativePath="res\IvyProbe.ico">

+				RelativePath="res\IvyProbe.ico"

+				>

 			</File>

 			<File

-				RelativePath="res\IvyProbe.manifest">

+				RelativePath="res\IvyProbe.manifest"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="IvyProbe.rc">

+				RelativePath="IvyProbe.rc"

+				>

 			</File>

 			<File

-				RelativePath="res\IvyProbe.rc2">

+				RelativePath="res\IvyProbe.rc2"

+				>

 			</File>

 		</Filter>

 		<File

 			RelativePath=".\IvyProbe.exe.manifest"

-			DeploymentContent="TRUE">

+			DeploymentContent="true"

+			>

+			<FileConfiguration

+				Name="Debug|Win32"

+				ExcludedFromBuild="true"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug|x64"

+				ExcludedFromBuild="true"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|Win32"

+				ExcludedFromBuild="true"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|x64"

+				ExcludedFromBuild="true"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

-			RelativePath=".\ReadMe.txt">

+			RelativePath=".\ReadMe.txt"

+			>

 		</File>

 	</Files>

 	<Globals>