Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4436361680c9
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 874e4dbc8585
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Aug 21, 2021

  1. Copy the full SHA
    c8bab15 View commit details
  2. Cleanup.

    pleroy committed Aug 21, 2021
    Copy the full SHA
    fcf4223 View commit details
  3. After egg's review.

    pleroy committed Aug 21, 2021
    Copy the full SHA
    bb0bcb3 View commit details
  4. Merge pull request #3107 from pleroy/Tools

    Move the code generation to a post-build event of the tools project
    pleroy authored Aug 21, 2021
    Copy the full SHA
    874e4db View commit details
Showing with 11 additions and 20 deletions.
  1. +2 −2 Principia.sln
  2. +0 −9 ksp_plugin/ksp_plugin.vcxproj
  3. +9 −9 tools/tools.vcxproj
4 changes: 2 additions & 2 deletions Principia.sln
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Legal", "Legal", "{4B25658F
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ksp_plugin_adapter", "ksp_plugin_adapter\ksp_plugin_adapter.csproj", "{E75B3F05-D64F-4AFE-9493-2F94A9B37510}"
ProjectSection(ProjectDependencies) = postProject
{A3F94607-2666-408F-AF98-0E47D61C98BB} = {A3F94607-2666-408F-AF98-0E47D61C98BB}
{873680B3-2406-4A30-9EE7-569E9B9DA661} = {873680B3-2406-4A30-9EE7-569E9B9DA661}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ksp_plugin", "ksp_plugin\ksp_plugin.vcxproj", "{A3F94607-2666-408F-AF98-0E47D61C98BB}"
@@ -72,7 +72,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ksp_plugin", "ksp_plugin\ks
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ksp_plugin_test", "ksp_plugin_test\ksp_plugin_test.vcxproj", "{A942ADF0-62F4-435C-85B2-934D5B666DB8}"
ProjectSection(ProjectDependencies) = postProject
{A3F94607-2666-408F-AF98-0E47D61C98BB} = {A3F94607-2666-408F-AF98-0E47D61C98BB}
{873680B3-2406-4A30-9EE7-569E9B9DA661} = {873680B3-2406-4A30-9EE7-569E9B9DA661}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "base\base.vcxproj", "{7E7CC89A-FC65-409C-A975-9C3A6A50786B}"
9 changes: 0 additions & 9 deletions ksp_plugin/ksp_plugin.vcxproj
Original file line number Diff line number Diff line change
@@ -97,15 +97,6 @@
<ClCompile Include="renderer.cpp" />
<ClCompile Include="vessel.cpp" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\serialization\journal.proto">
<FileType>Document</FileType>
<AdditionalInputs>$(PrincipiaGenerateProfiles)</AdditionalInputs>
<Command>$(PrincipiaGenerateProfilesCommand)</Command>
<Message>$([System.String]::Format($(PrincipiaGenerateProfilesMessage), %(FullPath)))</Message>
<Outputs>$(PrincipiaGenerateProfilesOutputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<Manifest Include="principia.manifest" />
</ItemGroup>
18 changes: 9 additions & 9 deletions tools/tools.vcxproj
Original file line number Diff line number Diff line change
@@ -5,15 +5,15 @@
<RootNamespace>tools</RootNamespace>
</PropertyGroup>
<Import Project="$(SolutionDir)principia.props" />
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="..\third_party_zfp.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_LLVM|x64'">
<Import Project="..\third_party_zfp.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="..\third_party_zfp.props" />
</ImportGroup>
<Import Project="..\third_party_zfp.props" />
<ItemDefinitionGroup>
<CustomBuildStep>
<Command>$(PrincipiaGenerateProfilesCommand)</Command>
<Message>$([System.String]::Format($(PrincipiaGenerateProfilesMessage), $(SolutionDir)))</Message>
<Outputs>$(PrincipiaGenerateProfilesOutputs)</Outputs>
<Inputs>$(PrincipiaGenerateProfiles)</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\base\cpuid.cpp" />
<ClCompile Include="..\numerics\cbrt.cpp" />