Skip to content

Commit

Permalink
Merge pull request #1330 from indy91/VSFix
Browse files Browse the repository at this point in the history
Make Flag VS project buildable in Visual Studio 2017 (it was created using 2019)
  • Loading branch information
indy91 authored Jan 16, 2025
2 parents a861c25 + c6148e9 commit 0daf56e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 24 deletions.
6 changes: 3 additions & 3 deletions Orbitersdk/samples/ProjectApollo/Build/VC2017/Flag.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{D3D8D4F0-3779-49A6-AE7D-2813609D0B65}</ProjectGuid>
<RootNamespace>Flag</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down
21 changes: 2 additions & 19 deletions Orbitersdk/samples/ProjectApollo/Build/VC2017/Flag.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -1,26 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{74d14021-9bc8-410f-98d3-fbc47fe0368a}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{9d3d0403-909e-458d-8102-f9f94070e7b6}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{7b93cb56-5861-4931-b7e6-ce7a11fd1d61}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
<ClCompile Include="..\..\src_moon\Flag.cpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src_moon\Flag.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src_moon\Flag.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src_moon\Flag.h" />
</ItemGroup>
</Project>
10 changes: 8 additions & 2 deletions Orbitersdk/samples/ProjectApollo/ProjectApollo2017.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 Version 17
VisualStudioVersion = 17.8.34525.116
# Visual Studio 15
VisualStudioVersion = 15.0.35431.46
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASTP", "Build\VC2017\ASTP.vcxproj", "{BAE34D87-5EAE-491C-AE6D-73B6B1E487D2}"
EndProject
Expand Down Expand Up @@ -306,6 +306,12 @@ Global
{123BD935-CDF4-440C-B113-DB3448B08DE8}.Release|Win32.Build.0 = Release|Win32
{123BD935-CDF4-440C-B113-DB3448B08DE8}.Release|x64.ActiveCfg = Release|x64
{123BD935-CDF4-440C-B113-DB3448B08DE8}.Release|x64.Build.0 = Release|x64
{D3D8D4F0-3779-49A6-AE7D-2813609D0B65}.Debug|Win32.ActiveCfg = Debug|Win32
{D3D8D4F0-3779-49A6-AE7D-2813609D0B65}.Debug|Win32.Build.0 = Debug|Win32
{D3D8D4F0-3779-49A6-AE7D-2813609D0B65}.Debug|x64.ActiveCfg = Debug|Win32
{D3D8D4F0-3779-49A6-AE7D-2813609D0B65}.Release|Win32.ActiveCfg = Release|Win32
{D3D8D4F0-3779-49A6-AE7D-2813609D0B65}.Release|Win32.Build.0 = Release|Win32
{D3D8D4F0-3779-49A6-AE7D-2813609D0B65}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit 0daf56e

Please sign in to comment.