Move compiled serialisation objects into the dedicated directory for consistency.

(Also tidy the filters.)

[ci skip]
This commit is contained in:
Wedge009 2019-01-24 12:22:09 +11:00
parent 0551246e3b
commit 8c7b3a583b
2 changed files with 59 additions and 25 deletions

View file

@ -152,14 +152,28 @@
<ClCompile Include="..\..\src\log.cpp" />
<ClCompile Include="..\..\src\log_windows.cpp" />
<ClCompile Include="..\..\src\random.cpp" />
<ClCompile Include="..\..\src\serialization\base64.cpp" />
<ClCompile Include="..\..\src\serialization\base64.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Serialization\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\serialization\binary_or_text.cpp">
<DisableSpecificWarnings>4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Serialization\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\serialization\parser.cpp">
<DisableSpecificWarnings>4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Serialization\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\serialization\preprocessor.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Serialization\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\serialization\preprocessor.cpp" />
<ClCompile Include="..\..\src\serialization\schema\key.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Serialization\Schema\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Serialization\Schema\</ObjectFileName>
@ -175,11 +189,31 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Serialization\Schema\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Serialization\Schema\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\serialization\schema_validator.cpp" />
<ClCompile Include="..\..\src\serialization\string_utils.cpp" />
<ClCompile Include="..\..\src\serialization\tokenizer.cpp" />
<ClCompile Include="..\..\src\serialization\unicode.cpp" />
<ClCompile Include="..\..\src\serialization\validator.cpp" />
<ClCompile Include="..\..\src\serialization\schema_validator.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Serialization\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\serialization\string_utils.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Serialization\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\serialization\tokenizer.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Serialization\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\serialization\unicode.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Serialization\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\serialization\validator.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Serialization\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Serialization\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\src\tstring.cpp" />
</ItemGroup>
<ItemGroup>

View file

@ -55,6 +55,15 @@
<ClCompile Include="..\..\src\serialization\validator.cpp">
<Filter>Serialization</Filter>
</ClCompile>
<ClCompile Include="..\..\src\serialization\schema\key.cpp">
<Filter>Serialization\Schema</Filter>
</ClCompile>
<ClCompile Include="..\..\src\serialization\schema\tag.cpp">
<Filter>Serialization\Schema</Filter>
</ClCompile>
<ClCompile Include="..\..\src\serialization\schema\type.cpp">
<Filter>Serialization\Schema</Filter>
</ClCompile>
<ClCompile Include="..\..\src\color.cpp" />
<ClCompile Include="..\..\src\color_range.cpp" />
<ClCompile Include="..\..\src\config.cpp" />
@ -77,15 +86,6 @@
<ClCompile Include="..\..\src\formula\string_utils.cpp">
<Filter>Formula</Filter>
</ClCompile>
<ClCompile Include="..\..\src\serialization\schema\key.cpp">
<Filter>Serialization\Schema</Filter>
</ClCompile>
<ClCompile Include="..\..\src\serialization\schema\tag.cpp">
<Filter>Serialization\Schema</Filter>
</ClCompile>
<ClCompile Include="..\..\src\serialization\schema\type.cpp">
<Filter>Serialization\Schema</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\serialization\base64.hpp">
@ -118,6 +118,15 @@
<ClInclude Include="..\..\src\serialization\validator.hpp">
<Filter>Serialization</Filter>
</ClInclude>
<ClInclude Include="..\..\src\serialization\schema\key.hpp">
<Filter>Serialization\Schema</Filter>
</ClInclude>
<ClInclude Include="..\..\src\serialization\schema\tag.hpp">
<Filter>Serialization\Schema</Filter>
</ClInclude>
<ClInclude Include="..\..\src\serialization\schema\type.hpp">
<Filter>Serialization\Schema</Filter>
</ClInclude>
<ClInclude Include="..\..\src\color.hpp" />
<ClInclude Include="..\..\src\color_range.hpp" />
<ClInclude Include="..\..\src\config.hpp" />
@ -176,14 +185,5 @@
<ClInclude Include="..\..\src\utils\type_trait_aliases.hpp">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\serialization\schema\key.hpp">
<Filter>Serialization\Schema</Filter>
</ClInclude>
<ClInclude Include="..\..\src\serialization\schema\tag.hpp">
<Filter>Serialization\Schema</Filter>
</ClInclude>
<ClInclude Include="..\..\src\serialization\schema\type.hpp">
<Filter>Serialization\Schema</Filter>
</ClInclude>
</ItemGroup>
</Project>