Skip to content

Commit a0eb905

Browse files
author
nitrocaster
committed
Common: Convert from Shared items project to Utility project.
1 parent 8c87987 commit a0eb905

File tree

5 files changed

+217
-80
lines changed

5 files changed

+217
-80
lines changed

‎src/Common/Common.vcxitems‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎src/Common/Common.vcxitems.filters‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎src/Common/Common.vcxproj‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<PropertyGroup Label="Globals">
14+
<ProjectGuid>{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}</ProjectGuid>
15+
<RootNamespace>Common</RootNamespace>
16+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
17+
</PropertyGroup>
18+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
19+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
20+
<ConfigurationType>Utility</ConfigurationType>
21+
<UseDebugLibraries>true</UseDebugLibraries>
22+
<CharacterSet>MultiByte</CharacterSet>
23+
<PlatformToolset>v140</PlatformToolset>
24+
</PropertyGroup>
25+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
26+
<ConfigurationType>Utility</ConfigurationType>
27+
<UseDebugLibraries>false</UseDebugLibraries>
28+
<PlatformToolset>v140</PlatformToolset>
29+
<WholeProgramOptimization>true</WholeProgramOptimization>
30+
<CharacterSet>MultiByte</CharacterSet>
31+
</PropertyGroup>
32+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33+
<ConfigurationType>Application</ConfigurationType>
34+
<UseDebugLibraries>true</UseDebugLibraries>
35+
<PlatformToolset>v140</PlatformToolset>
36+
<CharacterSet>MultiByte</CharacterSet>
37+
</PropertyGroup>
38+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
39+
<ConfigurationType>Application</ConfigurationType>
40+
<UseDebugLibraries>false</UseDebugLibraries>
41+
<PlatformToolset>v140</PlatformToolset>
42+
<WholeProgramOptimization>true</WholeProgramOptimization>
43+
<CharacterSet>MultiByte</CharacterSet>
44+
</PropertyGroup>
45+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46+
<ImportGroup Label="ExtensionSettings">
47+
</ImportGroup>
48+
<ImportGroup Label="Shared">
49+
</ImportGroup>
50+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
51+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
52+
<Import Project="$(SolutionDir)Common.props" />
53+
</ImportGroup>
54+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
55+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
56+
<Import Project="$(SolutionDir)Common.props" />
57+
</ImportGroup>
58+
<PropertyGroup Label="UserMacros" />
59+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
60+
<PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
61+
<PreLinkEventUseInBuild>false</PreLinkEventUseInBuild>
62+
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
63+
</PropertyGroup>
64+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
65+
<PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
66+
<PreLinkEventUseInBuild>false</PreLinkEventUseInBuild>
67+
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
68+
</PropertyGroup>
69+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
70+
<ClCompile>
71+
<WarningLevel>Level3</WarningLevel>
72+
<Optimization>Disabled</Optimization>
73+
<SDLCheck>true</SDLCheck>
74+
</ClCompile>
75+
</ItemDefinitionGroup>
76+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
77+
<ClCompile>
78+
<WarningLevel>Level3</WarningLevel>
79+
<Optimization>Disabled</Optimization>
80+
<SDLCheck>true</SDLCheck>
81+
</ClCompile>
82+
</ItemDefinitionGroup>
83+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
84+
<ClCompile>
85+
<WarningLevel>Level3</WarningLevel>
86+
<Optimization>MaxSpeed</Optimization>
87+
<FunctionLevelLinking>true</FunctionLevelLinking>
88+
<IntrinsicFunctions>true</IntrinsicFunctions>
89+
<SDLCheck>true</SDLCheck>
90+
</ClCompile>
91+
<Link>
92+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
93+
<OptimizeReferences>true</OptimizeReferences>
94+
</Link>
95+
</ItemDefinitionGroup>
96+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
97+
<ClCompile>
98+
<WarningLevel>Level3</WarningLevel>
99+
<Optimization>MaxSpeed</Optimization>
100+
<FunctionLevelLinking>true</FunctionLevelLinking>
101+
<IntrinsicFunctions>true</IntrinsicFunctions>
102+
<SDLCheck>true</SDLCheck>
103+
</ClCompile>
104+
<Link>
105+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
106+
<OptimizeReferences>true</OptimizeReferences>
107+
</Link>
108+
</ItemDefinitionGroup>
109+
<ItemGroup>
110+
<ClInclude Include="Config.hpp" />
111+
<ClInclude Include="face_smoth_flags.h" />
112+
<ClInclude Include="FSMacros.hpp" />
113+
<ClInclude Include="GUID.hpp" />
114+
<ClInclude Include="LevelGameDef.h" />
115+
<ClInclude Include="LevelStructure.hpp" />
116+
<ClInclude Include="Noncopyable.hpp" />
117+
<ClInclude Include="NvMender2003\convert.h" />
118+
<ClInclude Include="NvMender2003\mender_input_output.h" />
119+
<ClInclude Include="NvMender2003\NVMeshMender.h" />
120+
<ClInclude Include="NvMender2003\remove_isolated_verts.h" />
121+
<ClInclude Include="object_broker.h" />
122+
<ClInclude Include="object_cloner.h" />
123+
<ClInclude Include="object_comparer.h" />
124+
<ClInclude Include="object_destroyer.h" />
125+
<ClInclude Include="object_interfaces.h" />
126+
<ClInclude Include="object_loader.h" />
127+
<ClInclude Include="object_saver.h" />
128+
<ClInclude Include="object_type_traits.h" />
129+
<ClInclude Include="Util.hpp" />
130+
<ClInclude Include="_d3d_extensions.h" />
131+
</ItemGroup>
132+
<ItemGroup>
133+
<ClCompile Include="NvMender2003\NVMeshMender.cpp" />
134+
</ItemGroup>
135+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
136+
<ImportGroup Label="ExtensionTargets">
137+
</ImportGroup>
138+
</Project>

‎src/Common/Common.vcxproj.filters‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<ClInclude Include="_d3d_extensions.h" />
5+
<ClInclude Include="Config.hpp" />
6+
<ClInclude Include="face_smoth_flags.h" />
7+
<ClInclude Include="FSMacros.hpp" />
8+
<ClInclude Include="GUID.hpp" />
9+
<ClInclude Include="LevelGameDef.h" />
10+
<ClInclude Include="LevelStructure.hpp" />
11+
<ClInclude Include="Noncopyable.hpp" />
12+
<ClInclude Include="object_broker.h" />
13+
<ClInclude Include="object_cloner.h" />
14+
<ClInclude Include="object_comparer.h" />
15+
<ClInclude Include="object_destroyer.h" />
16+
<ClInclude Include="object_interfaces.h" />
17+
<ClInclude Include="object_loader.h" />
18+
<ClInclude Include="object_saver.h" />
19+
<ClInclude Include="object_type_traits.h" />
20+
<ClInclude Include="Util.hpp" />
21+
<ClInclude Include="NvMender2003\convert.h">
22+
<Filter>NvMender2003</Filter>
23+
</ClInclude>
24+
<ClInclude Include="NvMender2003\mender_input_output.h">
25+
<Filter>NvMender2003</Filter>
26+
</ClInclude>
27+
<ClInclude Include="NvMender2003\NVMeshMender.h">
28+
<Filter>NvMender2003</Filter>
29+
</ClInclude>
30+
<ClInclude Include="NvMender2003\remove_isolated_verts.h">
31+
<Filter>NvMender2003</Filter>
32+
</ClInclude>
33+
</ItemGroup>
34+
<ItemGroup>
35+
<Filter Include="NvMender2003">
36+
<UniqueIdentifier>{4a2b53ad-98a9-4338-99a6-b5ea4123d5bf}</UniqueIdentifier>
37+
</Filter>
38+
</ItemGroup>
39+
<ItemGroup>
40+
<ClCompile Include="NvMender2003\NVMeshMender.cpp">
41+
<Filter>NvMender2003</Filter>
42+
</ClCompile>
43+
</ItemGroup>
44+
</Project>

‎src/engine.sln‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPEditor", "editors\PPEdito
164164
EndProject
165165
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShaderEditor", "editors\ShaderEditor\ShaderEditor.vcxproj", "{1D137785-6E1B-4718-B800-F9380B945C9F}"
166166
EndProject
167-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxitems", "{45D41ACC-2C3C-43D2-BC10-02AA73FFC7C7}"
167+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}"
168168
EndProject
169169
Global
170170
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -2079,6 +2079,40 @@ Global
20792079
{1D137785-6E1B-4718-B800-F9380B945C9F}.Release|Win32.ActiveCfg = Release|Win32
20802080
{1D137785-6E1B-4718-B800-F9380B945C9F}.Release|Win32.Build.0 = Release|Win32
20812081
{1D137785-6E1B-4718-B800-F9380B945C9F}.Release|x64.ActiveCfg = Release|Win32
2082+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
2083+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
2084+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
2085+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
2086+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug_Dedicated|x64.ActiveCfg = Release|Win32
2087+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug_Dedicated|x64.Build.0 = Release|Win32
2088+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
2089+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
2090+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug|Win32.ActiveCfg = Debug|Win32
2091+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug|Win32.Build.0 = Debug|Win32
2092+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug|x64.ActiveCfg = Debug|Win32
2093+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
2094+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32
2095+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
2096+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
2097+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed_Dedicated|x64.ActiveCfg = Release|Win32
2098+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed_Dedicated|x64.Build.0 = Release|Win32
2099+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32
2100+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed|Mixed Platforms.Build.0 = Release|Win32
2101+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed|Win32.ActiveCfg = Release|Win32
2102+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed|Win32.Build.0 = Release|Win32
2103+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed|x64.ActiveCfg = Release|Win32
2104+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed|x64.Build.0 = Release|Win32
2105+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
2106+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
2107+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
2108+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release_Dedicated|Win32.Build.0 = Release|Win32
2109+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release_Dedicated|x64.ActiveCfg = Release|Win32
2110+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release_Dedicated|x64.Build.0 = Release|Win32
2111+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
2112+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release|Mixed Platforms.Build.0 = Release|Win32
2113+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release|Win32.ActiveCfg = Release|Win32
2114+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release|Win32.Build.0 = Release|Win32
2115+
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release|x64.ActiveCfg = Release|Win32
20822116
EndGlobalSection
20832117
GlobalSection(SolutionProperties) = preSolution
20842118
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)