Comparer le texte

Trouver la différence entre deux fichiers texte

Éditeur live

Cacher identiques

Sans retour à la ligne

Vue

Niveau de précision

Coloration syntaxique

Diffchecker Desktop La façon la plus sécurisée d'utiliser Diffchecker. Obtenez l'application Diffchecker Desktop : vos diffs ne quittent jamais votre ordinateur !Obtenir Desktop

Untitled diff

Créé il y a 11 ansLe diff n'expire jamais

6 suppressions

Lignes
Total
Supprimé

Caractères
Total
Supprimé

Pour continuer à utiliser cette fonctionnalité, passez à Diffchecker Pro Voir les prix

129 lignes

6 ajouts

Lignes
Total
Ajouté

Caractères
Total
Ajouté

Pour continuer à utiliser cette fonctionnalité, passez à Diffchecker Pro Voir les prix

129 lignes

<?xml version="1.0" encoding="utf-8"?>

<Configuration>Debug</Configuration>

</ProjectConfiguration>

<Configuration>Release</Configuration>

</ProjectConfiguration>

</ItemGroup>

<RootNamespace>cppcgdk</RootNamespace>

</PropertyGroup>

<ConfigurationType>Application</ConfigurationType>

<CharacterSet>Unicode</CharacterSet>

</PropertyGroup>

<ConfigurationType>Application</ConfigurationType>

<CharacterSet>Unicode</CharacterSet>

</PropertyGroup>

</ImportGroup>

</ImportGroup>

</ImportGroup>

<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>

<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>

<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

</PropertyGroup>

<Optimization>Disabled</Optimization>

<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

</PrecompiledHeader>

<WarningLevel>Level4</WarningLevel>

<DebugInformationFormat>EditAndContinue</DebugInformationFormat>

</ClCompile>

<Link>

<AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

<SubSystem>Console</SubSystem>

<TargetMachine>MachineX86</TargetMachine>

<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>

</Link>

</ItemDefinitionGroup>

<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;ONLINE_JUDGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

</PrecompiledHeader>

<WarningLevel>Level4</WarningLevel>

<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

</ClCompile>

<Link>

<AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

<SubSystem>Console</SubSystem>

<TargetMachine>MachineX86</TargetMachine>

</Link>

</ItemDefinitionGroup>

</ItemGroup>

</ItemGroup>

</ImportGroup>

</Project>

Différences enregistrées

Texte d'origine

Ouvrir un fichier

<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{717342D9-54DB-4D44-AC57-E269649EA753}</ProjectGuid>
    <RootNamespace>cppcgdk</RootNamespace>
    <Keyword>Win32Proj</Keyword>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization>true</WholeProgramOptimization>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level4</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    </ClCompile>
    <Link>
      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;ONLINE_JUDGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level4</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="MyStrategy.cpp" />
    <ClCompile Include="RemoteProcessClient.cpp" />
    <ClCompile Include="Runner.cpp" />
    <ClCompile Include="Strategy.cpp" />
    <ClCompile Include="csimplesocket\ActiveSocket.cpp" />
    <ClCompile Include="csimplesocket\HTTPActiveSocket.cpp" />
    <ClCompile Include="csimplesocket\PassiveSocket.cpp" />
    <ClCompile Include="csimplesocket\SimpleSocket.cpp" />
    <ClCompile Include="model\Game.cpp" />
    <ClCompile Include="model\Hockeyist.cpp" />
    <ClCompile Include="model\Move.cpp" />
    <ClCompile Include="model\Player.cpp" />
    <ClCompile Include="model\PlayerContext.cpp" />
    <ClCompile Include="model\Puck.cpp" />
    <ClCompile Include="model\Unit.cpp" />
    <ClCompile Include="model\World.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="MyStrategy.h" />
    <ClInclude Include="RemoteProcessClient.h" />
    <ClInclude Include="Runner.h" />
    <ClInclude Include="Strategy.h" />
    <ClInclude Include="model\ActionType.h" />
    <ClInclude Include="model\Game.h" />
    <ClInclude Include="model\Hockeyist.h" />
    <ClInclude Include="model\HockeyistState.h" />
    <ClInclude Include="model\HockeyistType.h" />
    <ClInclude Include="model\Move.h" />
    <ClInclude Include="model\Player.h" />
    <ClInclude Include="model\PlayerContext.h" />
    <ClInclude Include="model\Puck.h" />
    <ClInclude Include="model\Unit.h" />
    <ClInclude Include="model\World.h" />
    <ClInclude Include="csimplesocket\ActiveSocket.h" />
    <ClInclude Include="csimplesocket\Host.h" />
    <ClInclude Include="csimplesocket\HTTPActiveSocket.h" />
    <ClInclude Include="csimplesocket\PassiveSocket.h" />
    <ClInclude Include="csimplesocket\SimpleSocket.h" />
    <ClInclude Include="csimplesocket\StatTimer.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
</Project>

Texte modifié

Ouvrir un fichier

<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{717342D9-54DB-4D44-AC57-E269649EA753}</ProjectGuid>
    <RootNamespace>cppcgdk</RootNamespace>
    <Keyword>Win32Proj</Keyword>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization>true</WholeProgramOptimization>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level4</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    </ClCompile>
    <Link>
      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;ONLINE_JUDGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level4</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="model\Bonus.cpp" />
    <ClCompile Include="model\Car.cpp" />
    <ClCompile Include="model\CircularUnit.cpp" />
    <ClCompile Include="model\OilSlick.cpp" />
    <ClCompile Include="model\Projectile.cpp" />
    <ClCompile Include="model\RectangularUnit.cpp" />
    <ClCompile Include="MyStrategy.cpp" />
    <ClCompile Include="RemoteProcessClient.cpp" />
    <ClCompile Include="Runner.cpp" />
    <ClCompile Include="Strategy.cpp" />
    <ClCompile Include="csimplesocket\ActiveSocket.cpp" />
    <ClCompile Include="csimplesocket\HTTPActiveSocket.cpp" />
    <ClCompile Include="csimplesocket\PassiveSocket.cpp" />
    <ClCompile Include="csimplesocket\SimpleSocket.cpp" />
    <ClCompile Include="model\Game.cpp" />
    <ClCompile Include="model\Move.cpp" />
    <ClCompile Include="model\Player.cpp" />
    <ClCompile Include="model\PlayerContext.cpp" />
    <ClCompile Include="model\Unit.cpp" />
    <ClCompile Include="model\World.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="MyStrategy.h" />
    <ClInclude Include="RemoteProcessClient.h" />
    <ClInclude Include="Runner.h" />
    <ClInclude Include="Strategy.h" />
    <ClInclude Include="model\ActionType.h" />
    <ClInclude Include="model\Game.h" />
    <ClInclude Include="model\Move.h" />
    <ClInclude Include="model\Player.h" />
    <ClInclude Include="model\PlayerContext.h" />
    <ClInclude Include="model\Unit.h" />
    <ClInclude Include="model\World.h" />
    <ClInclude Include="csimplesocket\ActiveSocket.h" />
    <ClInclude Include="csimplesocket\Host.h" />
    <ClInclude Include="csimplesocket\HTTPActiveSocket.h" />
    <ClInclude Include="csimplesocket\PassiveSocket.h" />
    <ClInclude Include="csimplesocket\SimpleSocket.h" />
    <ClInclude Include="csimplesocket\StatTimer.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
</Project>