Utilisateur : Fcolin Date : 19/12/05 Heure : 14:56 Archivé dans $/Bus/Horloge Commentaire: (vss 10)

1 files changed, 388 insertions, 105 deletions

diff --git a/Horloge/Horloge.vcproj b/Horloge/Horloge.vcproj
index e708c80..3a5bcb1 100644
--- a/Horloge/Horloge.vcproj
+++ b/Horloge/Horloge.vcproj
@@ -1,28 +1,56 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="Horloge"

 	ProjectGUID="{79A52956-E5E0-46FF-9EB7-112ED0CD5315}"

 	RootNamespace="Horloge"

 	SccProjectName="&quot;$/Bus/Horloge&quot;, JIEAAAAA"

-	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=".\Debug"

-			IntermediateDirectory=".\Debug"

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

+			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="1"

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

 			UseOfMFC="2"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<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/Horloge.tlb"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -30,223 +58,478 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="stdafx.h"

-				PrecompiledHeaderFile=".\Debug/Horloge.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="_AFXDLL;_DEBUG"

+				Culture="1036"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				OutputFile="c:\users\fcolin\Program Files\Debug\Horloge.exe"

 				LinkIncremental="2"

-				SuppressStartupBanner="TRUE"

-				GenerateDebugInformation="TRUE"

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

-				SubSystem="2"/>

+				SuppressStartupBanner="true"

+				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"

+			CharacterSet="1"

+			>

+			<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/Horloge.tlb"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="3"

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

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				Optimization="0"

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

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"

+				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="_AFXDLL;_DEBUG"

-				Culture="1036"/>

+				Culture="1036"

+				AdditionalIncludeDirectories="$(IntDir)/"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

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

+			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="1"

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

 			UseOfMFC="2"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<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/Horloge.tlb"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

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

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="stdafx.h"

-				PrecompiledHeaderFile=".\Release/Horloge.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=".\Release/Horloge.exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				ProgramDatabaseFile=".\Release/Horloge.pdb"

-				SubSystem="2"/>

+				SuppressStartupBanner="true"

+				SubSystem="2"

+			/>

 			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="TRUE"

-				SuppressStartupBanner="TRUE"

-				TargetEnvironment="1"

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

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="copy &quot;$(TargetPath)&quot; &quot;C:\users\fcolin\Program Files\$(OutDir)&quot;"/>

+				CommandLine="rem copy &quot;$(TargetPath)&quot; &quot;C:\users\fcolin\Program Files\$(OutDir)&quot;"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

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

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

+			ConfigurationType="1"

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

+			UseOfMFC="2"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="3"

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

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

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

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderThrough="stdafx.h"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_AFXDLL;NDEBUG"

-				Culture="1036"/>

+				Culture="1036"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				SubSystem="2"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="rem copy &quot;$(TargetPath)&quot; &quot;C:\users\fcolin\Program Files\$(OutDir)&quot;"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

+		<ProjectReference

+			ReferencedProjectIdentifier="{84E0039A-6721-4B18-9792-E9AE4274AC0E}"

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

+		/>

+		<ProjectReference

+			ReferencedProjectIdentifier="{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}"

+			RelativePathToProject="..\..\..\pcre\pcre.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=".\Curvefit.cpp">

+				RelativePath=".\Curvefit.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\Digistring.cpp">

+				RelativePath=".\Digistring.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\Horloge.cpp">

+				RelativePath=".\Horloge.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\Horloge.rc">

+				RelativePath=".\HorlogeDlg.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\HorlogeDlg.cpp">

+				RelativePath=".\HorlogeParseCmdLine.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\HorlogeParseCmdLine.cpp">

-			</File>

-			<File

-				RelativePath=".\StdAfx.cpp">

+				RelativePath=".\StdAfx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|x64"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

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

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

+			>

 			<File

-				RelativePath=".\Curvefit.h">

+				RelativePath=".\Curvefit.h"

+				>

 			</File>

 			<File

-				RelativePath=".\Digistring.h">

+				RelativePath=".\Digistring.h"

+				>

 			</File>

 			<File

-				RelativePath=".\Horloge.h">

+				RelativePath=".\Horloge.h"

+				>

 			</File>

 			<File

-				RelativePath=".\HorlogeDlg.h">

+				RelativePath=".\HorlogeDlg.h"

+				>

 			</File>

 			<File

-				RelativePath=".\HorlogeParseCmdLine.h">

+				RelativePath=".\HorlogeParseCmdLine.h"

+				>

 			</File>

 			<File

-				RelativePath=".\MemDC.h">

+				RelativePath=".\MemDC.h"

+				>

 			</File>

 			<File

-				RelativePath=".\Resource.h">

+				RelativePath=".\Resource.h"

+				>

 			</File>

 			<File

-				RelativePath=".\Rgbcolor.h">

+				RelativePath=".\Rgbcolor.h"

+				>

 			</File>

 			<File

-				RelativePath=".\StdAfx.h">

+				RelativePath=".\StdAfx.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

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

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

+			>

 			<File

-				RelativePath="Horloge.exe.manifest"

-				DeploymentContent="TRUE">

+				RelativePath=".\res\Horloge.ico"

+				>

 			</File>

 			<File

-				RelativePath=".\res\Horloge.ico">

+				RelativePath=".\Horloge.rc"

+				>

 			</File>

 			<File

-				RelativePath=".\res\Horloge.rc2">

+				RelativePath=".\res\Horloge.rc2"

+				>

 			</File>

 			<File

-				RelativePath=".\res\ico00001.ico">

+				RelativePath=".\res\ico00001.ico"

+				>

 			</File>

 			<File

-				RelativePath=".\res\ico00002.ico">

+				RelativePath=".\res\ico00002.ico"

+				>

 			</File>

 			<File

-				RelativePath=".\res\ico00003.ico">

+				RelativePath=".\res\ico00003.ico"

+				>

 			</File>

 			<File

-				RelativePath=".\res\ico00004.ico">

+				RelativePath=".\res\ico00004.ico"

+				>

 			</File>

 			<File

-				RelativePath=".\res\icon1.ico">

+				RelativePath=".\res\icon1.ico"

+				>

 			</File>

 		</Filter>

 		<File

-			RelativePath=".\ReadMe.txt">

+			RelativePath=".\ReadMe.txt"

+			>

 		</File>

 	</Files>

 	<Globals>

+		<Global

+			Name="RESOURCE_FILE"

+			Value="Horloge.rc"

+		/>

 	</Globals>

 </VisualStudioProject>