Skip to content

Commit

Permalink
Merge branch 'standalone-builds'
Browse files Browse the repository at this point in the history
  • Loading branch information
loinesg committed Apr 29, 2018
2 parents 7967806 + 8bb08ed commit 3e3de63
Show file tree
Hide file tree
Showing 11 changed files with 627 additions and 145 deletions.
28 changes: 27 additions & 1 deletion Engine.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2009
VisualStudioVersion = 15.0.27004.2002
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game", "Game.vcxproj", "{7BC8F47D-DE5C-40C2-A5D7-82923BE4003F}"
EndProject
Expand All @@ -21,32 +21,58 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Release|x64 = Release|x64
Standalone|x64 = Standalone|x64
StandaloneDebug|x64 = StandaloneDebug|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7BC8F47D-DE5C-40C2-A5D7-82923BE4003F}.Debug|x64.ActiveCfg = Debug|x64
{7BC8F47D-DE5C-40C2-A5D7-82923BE4003F}.Debug|x64.Build.0 = Debug|x64
{7BC8F47D-DE5C-40C2-A5D7-82923BE4003F}.Release|x64.ActiveCfg = Release|x64
{7BC8F47D-DE5C-40C2-A5D7-82923BE4003F}.Release|x64.Build.0 = Release|x64
{7BC8F47D-DE5C-40C2-A5D7-82923BE4003F}.Standalone|x64.ActiveCfg = Standalone|x64
{7BC8F47D-DE5C-40C2-A5D7-82923BE4003F}.Standalone|x64.Build.0 = Standalone|x64
{7BC8F47D-DE5C-40C2-A5D7-82923BE4003F}.StandaloneDebug|x64.ActiveCfg = StandaloneDebug|x64
{7BC8F47D-DE5C-40C2-A5D7-82923BE4003F}.StandaloneDebug|x64.Build.0 = StandaloneDebug|x64
{9A420477-E72C-45DE-8C56-669B2760829A}.Debug|x64.ActiveCfg = Debug|x64
{9A420477-E72C-45DE-8C56-669B2760829A}.Debug|x64.Build.0 = Debug|x64
{9A420477-E72C-45DE-8C56-669B2760829A}.Release|x64.ActiveCfg = Release|x64
{9A420477-E72C-45DE-8C56-669B2760829A}.Release|x64.Build.0 = Release|x64
{9A420477-E72C-45DE-8C56-669B2760829A}.Standalone|x64.ActiveCfg = Standalone|x64
{9A420477-E72C-45DE-8C56-669B2760829A}.Standalone|x64.Build.0 = Standalone|x64
{9A420477-E72C-45DE-8C56-669B2760829A}.StandaloneDebug|x64.ActiveCfg = StandaloneDebug|x64
{9A420477-E72C-45DE-8C56-669B2760829A}.StandaloneDebug|x64.Build.0 = StandaloneDebug|x64
{C1E8F337-8DAC-4EE4-992B-6BAB2FEF3D1A}.Debug|x64.ActiveCfg = Debug|x64
{C1E8F337-8DAC-4EE4-992B-6BAB2FEF3D1A}.Debug|x64.Build.0 = Debug|x64
{C1E8F337-8DAC-4EE4-992B-6BAB2FEF3D1A}.Release|x64.ActiveCfg = Release|x64
{C1E8F337-8DAC-4EE4-992B-6BAB2FEF3D1A}.Release|x64.Build.0 = Release|x64
{C1E8F337-8DAC-4EE4-992B-6BAB2FEF3D1A}.Standalone|x64.ActiveCfg = Standalone|x64
{C1E8F337-8DAC-4EE4-992B-6BAB2FEF3D1A}.Standalone|x64.Build.0 = Standalone|x64
{C1E8F337-8DAC-4EE4-992B-6BAB2FEF3D1A}.StandaloneDebug|x64.ActiveCfg = StandaloneDebug|x64
{C1E8F337-8DAC-4EE4-992B-6BAB2FEF3D1A}.StandaloneDebug|x64.Build.0 = StandaloneDebug|x64
{CF2E70E8-7133-4D96-92C7-68BB406C0664}.Debug|x64.ActiveCfg = Debug|x64
{CF2E70E8-7133-4D96-92C7-68BB406C0664}.Debug|x64.Build.0 = Debug|x64
{CF2E70E8-7133-4D96-92C7-68BB406C0664}.Release|x64.ActiveCfg = Release|x64
{CF2E70E8-7133-4D96-92C7-68BB406C0664}.Release|x64.Build.0 = Release|x64
{CF2E70E8-7133-4D96-92C7-68BB406C0664}.Standalone|x64.ActiveCfg = Standalone|x64
{CF2E70E8-7133-4D96-92C7-68BB406C0664}.Standalone|x64.Build.0 = Standalone|x64
{CF2E70E8-7133-4D96-92C7-68BB406C0664}.StandaloneDebug|x64.ActiveCfg = StandaloneDebug|x64
{CF2E70E8-7133-4D96-92C7-68BB406C0664}.StandaloneDebug|x64.Build.0 = StandaloneDebug|x64
{E1FB8FA3-337A-4F39-971F-8948575CB35F}.Debug|x64.ActiveCfg = Debug|x64
{E1FB8FA3-337A-4F39-971F-8948575CB35F}.Debug|x64.Build.0 = Debug|x64
{E1FB8FA3-337A-4F39-971F-8948575CB35F}.Release|x64.ActiveCfg = Release|x64
{E1FB8FA3-337A-4F39-971F-8948575CB35F}.Release|x64.Build.0 = Release|x64
{E1FB8FA3-337A-4F39-971F-8948575CB35F}.Standalone|x64.ActiveCfg = Standalone|x64
{E1FB8FA3-337A-4F39-971F-8948575CB35F}.Standalone|x64.Build.0 = Standalone|x64
{E1FB8FA3-337A-4F39-971F-8948575CB35F}.StandaloneDebug|x64.ActiveCfg = StandaloneDebug|x64
{E1FB8FA3-337A-4F39-971F-8948575CB35F}.StandaloneDebug|x64.Build.0 = StandaloneDebug|x64
{937A010E-3824-4831-B56D-97AAAC7D851C}.Debug|x64.ActiveCfg = Debug|x64
{937A010E-3824-4831-B56D-97AAAC7D851C}.Debug|x64.Build.0 = Debug|x64
{937A010E-3824-4831-B56D-97AAAC7D851C}.Release|x64.ActiveCfg = Release|x64
{937A010E-3824-4831-B56D-97AAAC7D851C}.Release|x64.Build.0 = Release|x64
{937A010E-3824-4831-B56D-97AAAC7D851C}.Standalone|x64.ActiveCfg = Standalone|x64
{937A010E-3824-4831-B56D-97AAAC7D851C}.Standalone|x64.Build.0 = Standalone|x64
{937A010E-3824-4831-B56D-97AAAC7D851C}.StandaloneDebug|x64.ActiveCfg = StandaloneDebug|x64
{937A010E-3824-4831-B56D-97AAAC7D851C}.StandaloneDebug|x64.Build.0 = StandaloneDebug|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
69 changes: 69 additions & 0 deletions Engine.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="StandaloneDebug|x64">
<Configuration>StandaloneDebug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Standalone|x64">
<Configuration>Standalone</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Source\Editor\EditableObject.h" />
Expand Down Expand Up @@ -190,13 +198,26 @@
<PlatformToolset>v141</PlatformToolset>
<ConfigurationType>StaticLibrary</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='StandaloneDebug|x64'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
<ConfigurationType>StaticLibrary</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
<ConfigurationType>StaticLibrary</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Standalone|x64'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
<ConfigurationType>StaticLibrary</ConfigurationType>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
Expand All @@ -205,20 +226,36 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='StandaloneDebug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Standalone|x64'" 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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='StandaloneDebug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Standalone|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
Expand All @@ -233,6 +270,20 @@
<SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='StandaloneDebug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;STANDALONE;%(PreprocessorDefinitions);NOMINMAX;GL_GLEXT_PROTOTYPES</PreprocessorDefinitions>
<AdditionalIncludeDirectories>Source/;Vendor/;Vendor/imgui/;Vendor/gl3w/;Vendor/openvr/headers/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level4</WarningLevel>
Expand All @@ -251,6 +302,24 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Standalone|x64'">
<ClCompile>
<WarningLevel>Level4</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;STANDALONE;%(PreprocessorDefinitions);NOMINMAX;GL_GLEXT_PROTOTYPES</PreprocessorDefinitions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>Source/;Vendor/;Vendor/imgui/;Vendor/gl3w/;Vendor/openvr/headers/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
73 changes: 73 additions & 0 deletions EngineTests.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="StandaloneDebug|x64">
<Configuration>StandaloneDebug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Standalone|x64">
<Configuration>Standalone</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion>
Expand All @@ -26,6 +34,13 @@
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='StandaloneDebug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
Expand All @@ -34,6 +49,14 @@
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Standalone|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
Expand All @@ -42,20 +65,36 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='StandaloneDebug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Standalone|x64'" 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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='StandaloneDebug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Standalone|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</OutDir>
<IntDir>$(SolutionDir)\Build\$(Platform)$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
Expand All @@ -71,6 +110,21 @@
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='StandaloneDebug|x64'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>Source/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand All @@ -90,6 +144,25 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Standalone|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>Source/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="Engine.vcxproj">
<Project>{9a420477-e72c-45de-8c56-669b2760829a}</Project>
Expand Down
Loading

0 comments on commit 3e3de63

Please sign in to comment.