Skip to content

Commit

Permalink
Common: Convert from Shared items project to Utility project.
Browse files Browse the repository at this point in the history
  • Loading branch information
nitrocaster committed Jan 17, 2016
1 parent 8c87987 commit a0eb905
Show file tree
Hide file tree
Showing 5 changed files with 217 additions and 80 deletions.
46 changes: 0 additions & 46 deletions src/Common/Common.vcxitems

This file was deleted.

33 changes: 0 additions & 33 deletions src/Common/Common.vcxitems.filters

This file was deleted.

138 changes: 138 additions & 0 deletions src/Common/Common.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.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>{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}</ProjectGuid>
<RootNamespace>Common</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(SolutionDir)Common.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(SolutionDir)Common.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
<PreLinkEventUseInBuild>false</PreLinkEventUseInBuild>
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
<PreLinkEventUseInBuild>false</PreLinkEventUseInBuild>
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="Config.hpp" />
<ClInclude Include="face_smoth_flags.h" />
<ClInclude Include="FSMacros.hpp" />
<ClInclude Include="GUID.hpp" />
<ClInclude Include="LevelGameDef.h" />
<ClInclude Include="LevelStructure.hpp" />
<ClInclude Include="Noncopyable.hpp" />
<ClInclude Include="NvMender2003\convert.h" />
<ClInclude Include="NvMender2003\mender_input_output.h" />
<ClInclude Include="NvMender2003\NVMeshMender.h" />
<ClInclude Include="NvMender2003\remove_isolated_verts.h" />
<ClInclude Include="object_broker.h" />
<ClInclude Include="object_cloner.h" />
<ClInclude Include="object_comparer.h" />
<ClInclude Include="object_destroyer.h" />
<ClInclude Include="object_interfaces.h" />
<ClInclude Include="object_loader.h" />
<ClInclude Include="object_saver.h" />
<ClInclude Include="object_type_traits.h" />
<ClInclude Include="Util.hpp" />
<ClInclude Include="_d3d_extensions.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="NvMender2003\NVMeshMender.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
44 changes: 44 additions & 0 deletions src/Common/Common.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="_d3d_extensions.h" />
<ClInclude Include="Config.hpp" />
<ClInclude Include="face_smoth_flags.h" />
<ClInclude Include="FSMacros.hpp" />
<ClInclude Include="GUID.hpp" />
<ClInclude Include="LevelGameDef.h" />
<ClInclude Include="LevelStructure.hpp" />
<ClInclude Include="Noncopyable.hpp" />
<ClInclude Include="object_broker.h" />
<ClInclude Include="object_cloner.h" />
<ClInclude Include="object_comparer.h" />
<ClInclude Include="object_destroyer.h" />
<ClInclude Include="object_interfaces.h" />
<ClInclude Include="object_loader.h" />
<ClInclude Include="object_saver.h" />
<ClInclude Include="object_type_traits.h" />
<ClInclude Include="Util.hpp" />
<ClInclude Include="NvMender2003\convert.h">
<Filter>NvMender2003</Filter>
</ClInclude>
<ClInclude Include="NvMender2003\mender_input_output.h">
<Filter>NvMender2003</Filter>
</ClInclude>
<ClInclude Include="NvMender2003\NVMeshMender.h">
<Filter>NvMender2003</Filter>
</ClInclude>
<ClInclude Include="NvMender2003\remove_isolated_verts.h">
<Filter>NvMender2003</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="NvMender2003">
<UniqueIdentifier>{4a2b53ad-98a9-4338-99a6-b5ea4123d5bf}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="NvMender2003\NVMeshMender.cpp">
<Filter>NvMender2003</Filter>
</ClCompile>
</ItemGroup>
</Project>
36 changes: 35 additions & 1 deletion src/engine.sln
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPEditor", "editors\PPEdito
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShaderEditor", "editors\ShaderEditor\ShaderEditor.vcxproj", "{1D137785-6E1B-4718-B800-F9380B945C9F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxitems", "{45D41ACC-2C3C-43D2-BC10-02AA73FFC7C7}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -2079,6 +2079,40 @@ Global
{1D137785-6E1B-4718-B800-F9380B945C9F}.Release|Win32.ActiveCfg = Release|Win32
{1D137785-6E1B-4718-B800-F9380B945C9F}.Release|Win32.Build.0 = Release|Win32
{1D137785-6E1B-4718-B800-F9380B945C9F}.Release|x64.ActiveCfg = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug_Dedicated|x64.ActiveCfg = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug_Dedicated|x64.Build.0 = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug|Win32.ActiveCfg = Debug|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug|Win32.Build.0 = Debug|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Debug|x64.ActiveCfg = Debug|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed_Dedicated|x64.ActiveCfg = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed_Dedicated|x64.Build.0 = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed|Mixed Platforms.Build.0 = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed|Win32.ActiveCfg = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed|Win32.Build.0 = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed|x64.ActiveCfg = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Mixed|x64.Build.0 = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release_Dedicated|Win32.Build.0 = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release_Dedicated|x64.ActiveCfg = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release_Dedicated|x64.Build.0 = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release|Mixed Platforms.Build.0 = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release|Win32.ActiveCfg = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release|Win32.Build.0 = Release|Win32
{EDB0DFAF-5D6F-4D74-AE66-0DDADE12A7F6}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit a0eb905

Please sign in to comment.