mirror of
				https://github.com/vcmi/vcmi.git
				synced 2025-10-31 00:07:39 +02:00 
			
		
		
		
	Update VS files to 2019, partially fix test project
This commit is contained in:
		| @@ -21,7 +21,7 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{C0300513-E845-43B4-9A4F-E8817EAEF57C}</ProjectGuid> | ||||
|     <RootNamespace>BattleAI</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> | ||||
|     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| @@ -41,7 +41,7 @@ | ||||
|     <UseDebugLibraries>false</UseDebugLibraries> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <CharacterSet>MultiByte</CharacterSet> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
| @@ -114,6 +114,7 @@ | ||||
|       <PrecompiledHeader>Use</PrecompiledHeader> | ||||
|       <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile> | ||||
|       <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||||
|       <Optimization>MaxSpeed</Optimization> | ||||
|     </ClCompile> | ||||
|     <Link> | ||||
|       <AdditionalDependencies>VCMI_lib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||
|   | ||||
| @@ -35,7 +35,7 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{C41C4EB6-6F74-4F37-9FB0-9FA6BF377837}</ProjectGuid> | ||||
|     <RootNamespace>EmptyAI</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> | ||||
|     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| @@ -55,7 +55,7 @@ | ||||
|     <UseDebugLibraries>false</UseDebugLibraries> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <CharacterSet>MultiByte</CharacterSet> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
|   | ||||
| @@ -21,7 +21,7 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{15DABC90-234A-4B6B-9EEB-777C4768B82B}</ProjectGuid> | ||||
|     <RootNamespace>StupidAI</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> | ||||
|     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| @@ -41,7 +41,7 @@ | ||||
|     <UseDebugLibraries>false</UseDebugLibraries> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <CharacterSet>MultiByte</CharacterSet> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
|   | ||||
| @@ -21,7 +21,7 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{276C3DB0-7A6B-4417-8E5C-322B08633AAC}</ProjectGuid> | ||||
|     <RootNamespace>StupidAI</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> | ||||
|     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| @@ -41,7 +41,7 @@ | ||||
|     <UseDebugLibraries>false</UseDebugLibraries> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <CharacterSet>MultiByte</CharacterSet> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
| @@ -117,7 +117,7 @@ | ||||
|       <PrecompiledHeader>Use</PrecompiledHeader> | ||||
|       <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile> | ||||
|       <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||||
|       <Optimization>MaxSpeed</Optimization> | ||||
|       <Optimization>Disabled</Optimization> | ||||
|     </ClCompile> | ||||
|     <Link> | ||||
|       <AdditionalDependencies>VCMI_lib.lib;FuzzyLite.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||
|   | ||||
| @@ -21,14 +21,14 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{8355EBA8-65C2-44A4-BC2D-78053E1BF2D6}</ProjectGuid> | ||||
|     <RootNamespace>VCMI_client</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> | ||||
|     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'" Label="Configuration"> | ||||
|     <ConfigurationType>Application</ConfigurationType> | ||||
|     <CharacterSet>Unicode</CharacterSet> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>Application</ConfigurationType> | ||||
| @@ -146,6 +146,7 @@ | ||||
|       </AdditionalOptions> | ||||
|       <AdditionalIncludeDirectories>$(FFMPEGDIR);$(SDLDIR);$(BOOSTDIR);$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
|       <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||||
|       <Optimization>Disabled</Optimization> | ||||
|     </ClCompile> | ||||
|     <Link> | ||||
|       <AdditionalDependencies>avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;postproc.lib;swresample.lib;swscale.lib;zlib.lib;SDL2.lib;SDL2main.lib;VCMI_lib.lib;SDL2_mixer.lib;SDL2_image.lib;SDL2_ttf.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||
| @@ -158,6 +159,7 @@ | ||||
|       <OptimizeReferences>true</OptimizeReferences> | ||||
|       <ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput> | ||||
|       <AdditionalOptions>/LTCG /d2:-notypeopt %(AdditionalOptions)</AdditionalOptions> | ||||
|       <Profile>true</Profile> | ||||
|     </Link> | ||||
|     <CustomBuildStep> | ||||
|       <Command> | ||||
| @@ -176,6 +178,7 @@ | ||||
|       <LinkTimeCodeGeneration> | ||||
|       </LinkTimeCodeGeneration> | ||||
|       <ShowProgress>NotSet</ShowProgress> | ||||
|       <Profile>true</Profile> | ||||
|     </Link> | ||||
|   </ItemDefinitionGroup> | ||||
|   <ItemGroup> | ||||
|   | ||||
| @@ -14,19 +14,19 @@ | ||||
|     <ProjectGuid>{5B6946C8-A24F-4223-8415-5E16A238ACED}</ProjectGuid> | ||||
|     <Keyword>Win32Proj</Keyword> | ||||
|     <RootNamespace>VCMI_launcher</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> | ||||
|     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
|     <ConfigurationType>Application</ConfigurationType> | ||||
|     <UseDebugLibraries>true</UseDebugLibraries> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|     <CharacterSet>Unicode</CharacterSet> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'" Label="Configuration"> | ||||
|     <ConfigurationType>Application</ConfigurationType> | ||||
|     <UseDebugLibraries>false</UseDebugLibraries> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <CharacterSet>Unicode</CharacterSet> | ||||
|   </PropertyGroup> | ||||
|   | ||||
| @@ -21,14 +21,14 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{B952FFC5-3039-4DE1-9F08-90ACDA483D8F}</ProjectGuid> | ||||
|     <RootNamespace>VCMI_lib</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> | ||||
|     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
|     <CharacterSet>Unicode</CharacterSet> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
|   | ||||
| @@ -32,32 +32,32 @@ | ||||
|     <ProjectGuid>{AA3CC588-9D08-4178-A1E8-C71561E99723}</ProjectGuid> | ||||
|     <Keyword>Win32Proj</Keyword> | ||||
|     <RootNamespace>minizip</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> | ||||
|     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
|     <UseDebugLibraries>true</UseDebugLibraries> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|     <CharacterSet>Unicode</CharacterSet> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
|     <UseDebugLibraries>true</UseDebugLibraries> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|     <CharacterSet>Unicode</CharacterSet> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
|     <UseDebugLibraries>false</UseDebugLibraries> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <CharacterSet>Unicode</CharacterSet> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
|     <UseDebugLibraries>false</UseDebugLibraries> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <CharacterSet>Unicode</CharacterSet> | ||||
|   </PropertyGroup> | ||||
|   | ||||
| @@ -21,34 +21,34 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{8F202F43-106D-4F63-AD9D-B1D43E803E8C}</ProjectGuid> | ||||
|     <RootNamespace>ERM</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> | ||||
|     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
|     <UseDebugLibraries>true</UseDebugLibraries> | ||||
|     <CharacterSet>MultiByte</CharacterSet> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
|     <UseDebugLibraries>true</UseDebugLibraries> | ||||
|     <CharacterSet>MultiByte</CharacterSet> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
|     <UseDebugLibraries>false</UseDebugLibraries> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <CharacterSet>MultiByte</CharacterSet> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
|     <UseDebugLibraries>false</UseDebugLibraries> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <CharacterSet>MultiByte</CharacterSet> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||||
|   <ImportGroup Label="ExtensionSettings"> | ||||
|   | ||||
| @@ -21,14 +21,14 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{8AF697C3-465E-4910-B31B-576A9ECDB309}</ProjectGuid> | ||||
|     <RootNamespace>VCMI_server</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> | ||||
|     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'" Label="Configuration"> | ||||
|     <ConfigurationType>Application</ConfigurationType> | ||||
|     <CharacterSet>MultiByte</CharacterSet> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>Application</ConfigurationType> | ||||
|   | ||||
| @@ -21,14 +21,14 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{BA25F3F0-EB87-4164-AAB9-073C50A3557A}</ProjectGuid> | ||||
|     <RootNamespace>VCMI_client</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> | ||||
|     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'" Label="Configuration"> | ||||
|     <ConfigurationType>Application</ConfigurationType> | ||||
|     <CharacterSet>Unicode</CharacterSet> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <PlatformToolset>v141</PlatformToolset> | ||||
|     <PlatformToolset>v142</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>Application</ConfigurationType> | ||||
| @@ -93,6 +93,9 @@ | ||||
|     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='RD|Win32'" /> | ||||
|     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='RD|x64'" /> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'"> | ||||
|     <IncludePath>$(SolutionDir)\AI\FuzzyLite\fuzzylite;$(SolutionDir)\test\googletest\googlemock\include;$(SolutionDir)\test\googletest\googletest\include;$(IncludePath)</IncludePath> | ||||
|   </PropertyGroup> | ||||
|   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||||
|     <ClCompile> | ||||
|       <Optimization> | ||||
| @@ -139,7 +142,7 @@ | ||||
|       <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||||
|     </ClCompile> | ||||
|     <Link> | ||||
|       <AdditionalDependencies>VCMI_lib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||
|       <AdditionalDependencies>VCMI_lib.lib;VCAI.lib;FuzzyLite.lib;gmock.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||
|       <Driver>NotSet</Driver> | ||||
|       <LinkTimeCodeGeneration> | ||||
|       </LinkTimeCodeGeneration> | ||||
| @@ -168,19 +171,80 @@ | ||||
|     </ProjectReference> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <ClCompile Include="Battlefield.cpp" /> | ||||
|     <ClCompile Include="CMapEditManagerTest.cpp" /> | ||||
|     <ClCompile Include="battle\BattleHexTest.cpp" /> | ||||
|     <ClCompile Include="battle\battle_UnitTest.cpp" /> | ||||
|     <ClCompile Include="battle\CBattleInfoCallbackTest.cpp" /> | ||||
|     <ClCompile Include="battle\CHealthTest.cpp" /> | ||||
|     <ClCompile Include="battle\CUnitStateMagicTest.cpp" /> | ||||
|     <ClCompile Include="battle\CUnitStateTest.cpp" /> | ||||
|     <ClCompile Include="CMemoryBufferTest.cpp" /> | ||||
|     <ClCompile Include="CVcmiTestConfig.cpp" /> | ||||
|     <ClCompile Include="game\CGameStateTest.cpp" /> | ||||
|     <ClCompile Include="JsonComparer.cpp" /> | ||||
|     <ClCompile Include="map\CMapEditManagerTest.cpp" /> | ||||
|     <ClCompile Include="map\CMapFormatTest.cpp" /> | ||||
|     <ClCompile Include="map\MapComparer.cpp" /> | ||||
|     <ClCompile Include="mock\mock_BonusBearer.cpp" /> | ||||
|     <ClCompile Include="mock\mock_CPSICallback.cpp" /> | ||||
|     <ClCompile Include="mock\mock_IGameCallback.cpp" /> | ||||
|     <ClCompile Include="mock\mock_MapService.cpp" /> | ||||
|     <ClCompile Include="spells\AbilityCasterTest.cpp" /> | ||||
|     <ClCompile Include="spells\effects\CatapultTest.cpp" /> | ||||
|     <ClCompile Include="spells\effects\CloneTest.cpp" /> | ||||
|     <ClCompile Include="spells\effects\DamageTest.cpp" /> | ||||
|     <ClCompile Include="spells\effects\DispelTest.cpp" /> | ||||
|     <ClCompile Include="spells\effects\EffectFixture.cpp" /> | ||||
|     <ClCompile Include="spells\effects\HealTest.cpp" /> | ||||
|     <ClCompile Include="spells\effects\SacrificeTest.cpp" /> | ||||
|     <ClCompile Include="spells\effects\SummonTest.cpp" /> | ||||
|     <ClCompile Include="spells\effects\TeleportTest.cpp" /> | ||||
|     <ClCompile Include="spells\effects\TimedTest.cpp" /> | ||||
|     <ClCompile Include="spells\targetConditions\AbsoluteLevelConditionTest.cpp" /> | ||||
|     <ClCompile Include="spells\targetConditions\AbsoluteSpellConditionTest.cpp" /> | ||||
|     <ClCompile Include="spells\targetConditions\BonusConditionTest.cpp" /> | ||||
|     <ClCompile Include="spells\targetConditions\CreatureConditionTest.cpp" /> | ||||
|     <ClCompile Include="spells\targetConditions\ElementalConditionTest.cpp" /> | ||||
|     <ClCompile Include="spells\targetConditions\HealthValueConditionTest.cpp" /> | ||||
|     <ClCompile Include="spells\targetConditions\ImmunityNegationConditionTest.cpp" /> | ||||
|     <ClCompile Include="spells\targetConditions\NormalLevelConditionTest.cpp" /> | ||||
|     <ClCompile Include="spells\targetConditions\NormalSpellConditionTest.cpp" /> | ||||
|     <ClCompile Include="spells\targetConditions\ReceptiveFeatureConditionTest.cpp" /> | ||||
|     <ClCompile Include="spells\targetConditions\SpellEffectConditionTest.cpp" /> | ||||
|     <ClCompile Include="spells\targetConditions\TargetConditionItemFixture.cpp" /> | ||||
|     <ClCompile Include="spells\TargetConditionTest.cpp" /> | ||||
|     <ClCompile Include="StdInc.cpp"> | ||||
|       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> | ||||
|       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">Create</PrecompiledHeader> | ||||
|       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> | ||||
|       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='RD|x64'">Create</PrecompiledHeader> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="vcai\mock_ResourceManager.cpp" /> | ||||
|     <ClCompile Include="vcai\mock_VCAI.cpp" /> | ||||
|     <ClCompile Include="vcai\ResurceManagerTest.cpp" /> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <ClInclude Include="CVcmiTestConfig.h" /> | ||||
|     <ClInclude Include="JsonComparer.h" /> | ||||
|     <ClInclude Include="map\MapComparer.h" /> | ||||
|     <ClInclude Include="mock\mock_battle_IBattleState.h" /> | ||||
|     <ClInclude Include="mock\mock_battle_Unit.h" /> | ||||
|     <ClInclude Include="mock\mock_BonusBearer.h" /> | ||||
|     <ClInclude Include="mock\mock_CPSICallback.h" /> | ||||
|     <ClInclude Include="mock\mock_IGameCallback.h" /> | ||||
|     <ClInclude Include="mock\mock_MapService.h" /> | ||||
|     <ClInclude Include="mock\mock_spells_Mechanics.h" /> | ||||
|     <ClInclude Include="mock\mock_spells_Problem.h" /> | ||||
|     <ClInclude Include="mock\mock_spells_Spell.h" /> | ||||
|     <ClInclude Include="mock\mock_UnitEnvironment.h" /> | ||||
|     <ClInclude Include="mock\mock_UnitInfo.h" /> | ||||
|     <ClInclude Include="mock\mock_vstd_RNG.h" /> | ||||
|     <ClInclude Include="spells\effects\EffectFixture.h" /> | ||||
|     <ClInclude Include="spells\targetConditions\TargetConditionItemFixture.h" /> | ||||
|     <ClInclude Include="StdInc.h" /> | ||||
|     <ClInclude Include="vcai\mock_ResourceManager.h" /> | ||||
|     <ClInclude Include="vcai\mock_VCAI.h" /> | ||||
|     <ClInclude Include="vcai\mock_VCAI_CGoal.h" /> | ||||
|     <ClInclude Include="vcai\ResourceManagerTest.h" /> | ||||
|   </ItemGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||||
|   <ImportGroup Label="ExtensionTargets"> | ||||
|   | ||||
| @@ -1,13 +1,220 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||||
|   <ItemGroup> | ||||
|     <ClCompile Include="CMapEditManagerTest.cpp" /> | ||||
|     <ClCompile Include="CVcmiTestConfig.cpp" /> | ||||
|     <ClCompile Include="StdInc.cpp" /> | ||||
|     <ClCompile Include="Battlefield.cpp" /> | ||||
|     <ClCompile Include="CMemoryBufferTest.cpp" /> | ||||
|     <ClCompile Include="JsonComparer.cpp" /> | ||||
|     <ClCompile Include="map\CMapEditManagerTest.cpp"> | ||||
|       <Filter>map</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="map\CMapFormatTest.cpp"> | ||||
|       <Filter>map</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="map\MapComparer.cpp"> | ||||
|       <Filter>map</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="battle\battle_UnitTest.cpp"> | ||||
|       <Filter>battle</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="battle\BattleHexTest.cpp"> | ||||
|       <Filter>battle</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="battle\CBattleInfoCallbackTest.cpp"> | ||||
|       <Filter>battle</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="battle\CHealthTest.cpp"> | ||||
|       <Filter>battle</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="battle\CUnitStateMagicTest.cpp"> | ||||
|       <Filter>battle</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="battle\CUnitStateTest.cpp"> | ||||
|       <Filter>battle</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="game\CGameStateTest.cpp"> | ||||
|       <Filter>game</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\effects\CatapultTest.cpp"> | ||||
|       <Filter>spells\effects</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\effects\CloneTest.cpp"> | ||||
|       <Filter>spells\effects</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\effects\DamageTest.cpp"> | ||||
|       <Filter>spells\effects</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\effects\DispelTest.cpp"> | ||||
|       <Filter>spells\effects</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\effects\EffectFixture.cpp"> | ||||
|       <Filter>spells\effects</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\effects\HealTest.cpp"> | ||||
|       <Filter>spells\effects</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\effects\SacrificeTest.cpp"> | ||||
|       <Filter>spells\effects</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\effects\SummonTest.cpp"> | ||||
|       <Filter>spells\effects</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\effects\TeleportTest.cpp"> | ||||
|       <Filter>spells\effects</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\effects\TimedTest.cpp"> | ||||
|       <Filter>spells\effects</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\targetConditions\AbsoluteLevelConditionTest.cpp"> | ||||
|       <Filter>spells\targetConditions</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\targetConditions\AbsoluteSpellConditionTest.cpp"> | ||||
|       <Filter>spells\targetConditions</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\targetConditions\BonusConditionTest.cpp"> | ||||
|       <Filter>spells\targetConditions</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\targetConditions\CreatureConditionTest.cpp"> | ||||
|       <Filter>spells\targetConditions</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\targetConditions\ElementalConditionTest.cpp"> | ||||
|       <Filter>spells\targetConditions</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\targetConditions\HealthValueConditionTest.cpp"> | ||||
|       <Filter>spells\targetConditions</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\targetConditions\ImmunityNegationConditionTest.cpp"> | ||||
|       <Filter>spells\targetConditions</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\targetConditions\NormalLevelConditionTest.cpp"> | ||||
|       <Filter>spells\targetConditions</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\targetConditions\NormalSpellConditionTest.cpp"> | ||||
|       <Filter>spells\targetConditions</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\targetConditions\ReceptiveFeatureConditionTest.cpp"> | ||||
|       <Filter>spells\targetConditions</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\targetConditions\SpellEffectConditionTest.cpp"> | ||||
|       <Filter>spells\targetConditions</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\targetConditions\TargetConditionItemFixture.cpp"> | ||||
|       <Filter>spells\targetConditions</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\AbilityCasterTest.cpp"> | ||||
|       <Filter>spells</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="spells\TargetConditionTest.cpp"> | ||||
|       <Filter>spells</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="vcai\mock_ResourceManager.cpp"> | ||||
|       <Filter>vcai</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="vcai\mock_VCAI.cpp"> | ||||
|       <Filter>vcai</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="vcai\ResurceManagerTest.cpp"> | ||||
|       <Filter>vcai</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="mock\mock_BonusBearer.cpp"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="mock\mock_CPSICallback.cpp"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="mock\mock_IGameCallback.cpp"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClCompile> | ||||
|     <ClCompile Include="mock\mock_MapService.cpp"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClCompile> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <ClInclude Include="CVcmiTestConfig.h" /> | ||||
|     <ClInclude Include="StdInc.h" /> | ||||
|     <ClInclude Include="JsonComparer.h" /> | ||||
|     <ClInclude Include="map\MapComparer.h"> | ||||
|       <Filter>map</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="spells\effects\EffectFixture.h"> | ||||
|       <Filter>spells\effects</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="spells\targetConditions\TargetConditionItemFixture.h"> | ||||
|       <Filter>spells\targetConditions</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="vcai\mock_ResourceManager.h"> | ||||
|       <Filter>vcai</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="vcai\mock_VCAI.h"> | ||||
|       <Filter>vcai</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="vcai\mock_VCAI_CGoal.h"> | ||||
|       <Filter>vcai</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="vcai\ResourceManagerTest.h"> | ||||
|       <Filter>vcai</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="mock\mock_battle_IBattleState.h"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="mock\mock_battle_Unit.h"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="mock\mock_BonusBearer.h"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="mock\mock_CPSICallback.h"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="mock\mock_IGameCallback.h"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="mock\mock_MapService.h"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="mock\mock_spells_Mechanics.h"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="mock\mock_spells_Problem.h"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="mock\mock_spells_Spell.h"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="mock\mock_UnitEnvironment.h"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="mock\mock_UnitInfo.h"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="mock\mock_vstd_RNG.h"> | ||||
|       <Filter>mock</Filter> | ||||
|     </ClInclude> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <Filter Include="map"> | ||||
|       <UniqueIdentifier>{418ff473-dca6-4c43-bba7-d575536c5791}</UniqueIdentifier> | ||||
|     </Filter> | ||||
|     <Filter Include="battle"> | ||||
|       <UniqueIdentifier>{01a5ea57-0094-4f54-94a5-10184cb7518c}</UniqueIdentifier> | ||||
|     </Filter> | ||||
|     <Filter Include="game"> | ||||
|       <UniqueIdentifier>{db53f45d-1e4d-4e6b-9bc1-fa0e15f1def2}</UniqueIdentifier> | ||||
|     </Filter> | ||||
|     <Filter Include="spells"> | ||||
|       <UniqueIdentifier>{9b00f38e-f370-413e-ad10-644a21be00b4}</UniqueIdentifier> | ||||
|     </Filter> | ||||
|     <Filter Include="spells\effects"> | ||||
|       <UniqueIdentifier>{dc596868-45d4-4ee4-8191-34c2f76b47fc}</UniqueIdentifier> | ||||
|     </Filter> | ||||
|     <Filter Include="spells\targetConditions"> | ||||
|       <UniqueIdentifier>{ac23eabd-5463-468f-862e-38a0934b866e}</UniqueIdentifier> | ||||
|     </Filter> | ||||
|     <Filter Include="vcai"> | ||||
|       <UniqueIdentifier>{f7e35d1b-7e06-4c22-a3a3-6f7d1357e028}</UniqueIdentifier> | ||||
|     </Filter> | ||||
|     <Filter Include="mock"> | ||||
|       <UniqueIdentifier>{53399b0b-1a51-43f7-91cc-4fc47dfbad84}</UniqueIdentifier> | ||||
|     </Filter> | ||||
|   </ItemGroup> | ||||
| </Project> | ||||
		Reference in New Issue
	
	Block a user