Merge pull request #3796 from pleroy/Shared

Use Shared Items Projects to gather the .cpp files exported by each project
mockingbirdnest · Nov 18, 2023 · 12b0cf3 · 12b0cf3
2 parents 6b07516 + a53ff78
commit 12b0cf3
Show file tree

Hide file tree

Showing 33 changed files with 244 additions and 337 deletions.
diff --git a/Principia.sln b/Principia.sln
@@ -172,6 +172,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflows", "Workflows", "{
 		.github\workflows\remove-before-flight.yml = .github\workflows\remove-before-flight.yml
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared Items Projects", "Shared Items Projects", "{6722AD00-0A85-4156-B912-38E99A12AE75}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astronomy", "shared\astronomy.vcxitems", "{582350F1-F2A6-4663-BB67-AD9EE13B3464}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "shared\base.vcxitems", "{A82CB04C-42E1-4EBE-9816-6FC033A9C2B5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "geometry", "shared\geometry.vcxitems", "{4687C5DA-576F-4D9C-B024-9F2F9CD76F48}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "journal", "shared\journal.vcxitems", "{388CBEA7-7BC1-4146-8813-66B951E63A96}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "numerics", "shared\numerics.vcxitems", "{C59F84DA-2F82-43DD-BBA4-5A469B32557C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testing_utilities", "shared\testing_utilities.vcxitems", "{2E39517A-4713-455F-8C78-610DDFD8EA99}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -485,8 +499,59 @@ Global
 		{A0E67E1B-E5A6-45A0-B42C-4330A6643CD7} = {B0F47E49-0EDF-4D58-AB27-F99CCCE4253A}
 		{28F20764-FBF8-40CF-A930-1562D1562B83} = {B0F47E49-0EDF-4D58-AB27-F99CCCE4253A}
 		{3B6E70E8-9FC3-4DC3-97B6-1A51B6DEB009} = {B0F47E49-0EDF-4D58-AB27-F99CCCE4253A}
+		{582350F1-F2A6-4663-BB67-AD9EE13B3464} = {6722AD00-0A85-4156-B912-38E99A12AE75}
+		{A82CB04C-42E1-4EBE-9816-6FC033A9C2B5} = {6722AD00-0A85-4156-B912-38E99A12AE75}
+		{4687C5DA-576F-4D9C-B024-9F2F9CD76F48} = {6722AD00-0A85-4156-B912-38E99A12AE75}
+		{388CBEA7-7BC1-4146-8813-66B951E63A96} = {6722AD00-0A85-4156-B912-38E99A12AE75}
+		{C59F84DA-2F82-43DD-BBA4-5A469B32557C} = {6722AD00-0A85-4156-B912-38E99A12AE75}
+		{2E39517A-4713-455F-8C78-610DDFD8EA99} = {6722AD00-0A85-4156-B912-38E99A12AE75}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {332981CB-A6C7-4BD0-9EE0-8E8C6FB4E01A}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		shared\base.vcxitems*{0fd08cdf-228c-48c6-8690-cf0a72cf6c69}*SharedItemsImports = 4
+		shared\base.vcxitems*{273987f9-5e73-43e6-868e-e9d3c137f01a}*SharedItemsImports = 4
+		shared\numerics.vcxitems*{273987f9-5e73-43e6-868e-e9d3c137f01a}*SharedItemsImports = 4
+		shared\base.vcxitems*{2e28828e-8364-4962-a9ff-c20a72eb884c}*SharedItemsImports = 4
+		shared\geometry.vcxitems*{2e28828e-8364-4962-a9ff-c20a72eb884c}*SharedItemsImports = 4
+		shared\numerics.vcxitems*{2e28828e-8364-4962-a9ff-c20a72eb884c}*SharedItemsImports = 4
+		shared\testing_utilities.vcxitems*{2e39517a-4713-455f-8c78-610ddfd8ea99}*SharedItemsImports = 9
+		shared\journal.vcxitems*{388cbea7-7bc1-4146-8813-66b951e63a96}*SharedItemsImports = 9
+		shared\base.vcxitems*{41332e9a-729c-45c4-bde1-a567608dadf2}*SharedItemsImports = 4
+		shared\geometry.vcxitems*{41332e9a-729c-45c4-bde1-a567608dadf2}*SharedItemsImports = 4
+		shared\numerics.vcxitems*{41332e9a-729c-45c4-bde1-a567608dadf2}*SharedItemsImports = 4
+		shared\geometry.vcxitems*{4687c5da-576f-4d9c-b024-9f2f9cd76f48}*SharedItemsImports = 9
+		shared\astronomy.vcxitems*{582350f1-f2a6-4663-bb67-ad9ee13b3464}*SharedItemsImports = 9
+		shared\base.vcxitems*{5eea5210-0fa9-4b44-8466-c40b22d24e8e}*SharedItemsImports = 4
+		shared\geometry.vcxitems*{5eea5210-0fa9-4b44-8466-c40b22d24e8e}*SharedItemsImports = 4
+		shared\numerics.vcxitems*{5eea5210-0fa9-4b44-8466-c40b22d24e8e}*SharedItemsImports = 4
+		shared\astronomy.vcxitems*{7b174b21-0837-4bee-864e-08ad3c74046a}*SharedItemsImports = 4
+		shared\base.vcxitems*{7b174b21-0837-4bee-864e-08ad3c74046a}*SharedItemsImports = 4
+		shared\geometry.vcxitems*{7b174b21-0837-4bee-864e-08ad3c74046a}*SharedItemsImports = 4
+		shared\numerics.vcxitems*{7b174b21-0837-4bee-864e-08ad3c74046a}*SharedItemsImports = 4
+		shared\testing_utilities.vcxitems*{7b174b21-0837-4bee-864e-08ad3c74046a}*SharedItemsImports = 4
+		shared\base.vcxitems*{83a31da7-3f62-464d-9f6b-09cce07a865a}*SharedItemsImports = 4
+		shared\geometry.vcxitems*{83a31da7-3f62-464d-9f6b-09cce07a865a}*SharedItemsImports = 4
+		shared\numerics.vcxitems*{83a31da7-3f62-464d-9f6b-09cce07a865a}*SharedItemsImports = 4
+		shared\base.vcxitems*{86aff67d-38cd-487e-b4c1-b93984a9ed0d}*SharedItemsImports = 4
+		shared\geometry.vcxitems*{86aff67d-38cd-487e-b4c1-b93984a9ed0d}*SharedItemsImports = 4
+		shared\base.vcxitems*{873680b3-2406-4a30-9ee7-569e9b9da661}*SharedItemsImports = 4
+		shared\numerics.vcxitems*{873680b3-2406-4a30-9ee7-569e9b9da661}*SharedItemsImports = 4
+		shared\base.vcxitems*{972e4e09-3b2c-4a23-9338-74d97d589207}*SharedItemsImports = 4
+		shared\base.vcxitems*{9e0ae155-47b1-4090-af00-038af87a876d}*SharedItemsImports = 4
+		shared\geometry.vcxitems*{9e0ae155-47b1-4090-af00-038af87a876d}*SharedItemsImports = 4
+		shared\testing_utilities.vcxitems*{9e0ae155-47b1-4090-af00-038af87a876d}*SharedItemsImports = 4
+		shared\base.vcxitems*{a3f94607-2666-408f-af98-0e47d61c98bb}*SharedItemsImports = 4
+		shared\geometry.vcxitems*{a3f94607-2666-408f-af98-0e47d61c98bb}*SharedItemsImports = 4
+		shared\journal.vcxitems*{a3f94607-2666-408f-af98-0e47d61c98bb}*SharedItemsImports = 4
+		shared\numerics.vcxitems*{a3f94607-2666-408f-af98-0e47d61c98bb}*SharedItemsImports = 4
+		shared\base.vcxitems*{a82cb04c-42e1-4ebe-9816-6fc033a9c2b5}*SharedItemsImports = 9
+		shared\astronomy.vcxitems*{a942adf0-62f4-435c-85b2-934d5b666db8}*SharedItemsImports = 4
+		shared\base.vcxitems*{a942adf0-62f4-435c-85b2-934d5b666db8}*SharedItemsImports = 4
+		shared\geometry.vcxitems*{a942adf0-62f4-435c-85b2-934d5b666db8}*SharedItemsImports = 4
+		shared\journal.vcxitems*{a942adf0-62f4-435c-85b2-934d5b666db8}*SharedItemsImports = 4
+		shared\numerics.vcxitems*{a942adf0-62f4-435c-85b2-934d5b666db8}*SharedItemsImports = 4
+		shared\numerics.vcxitems*{c59f84da-2f82-43dd-bba4-5a469b32557c}*SharedItemsImports = 9
+	EndGlobalSection
 EndGlobal
diff --git a/astronomy/astronomy.vcxproj b/astronomy/astronomy.vcxproj
@@ -5,14 +5,10 @@
     <RootNamespace>astronomy</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 Label="Shared">
+    <Import Project="..\shared\base.vcxitems" Label="Shared" />
+    <Import Project="..\shared\numerics.vcxitems" Label="Shared" />
+    <Import Project="..\shared\geometry.vcxitems" Label="Shared" />
   </ImportGroup>
   <ItemGroup>
     <None Include="eop_c04.awk" />
@@ -103,11 +99,6 @@
     <ClInclude Include="mercury_orbiter.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\base\bundle.cpp" />
-    <ClCompile Include="..\base\cpuid.cpp" />
-    <ClCompile Include="..\geometry\instant.cpp" />
-    <ClCompile Include="..\numerics\cbrt.cpp" />
-    <ClCompile Include="..\physics\protector.cpp" />
     <ClCompile Include="date_time_test.cpp" />
     <ClCompile Include="ksp_fingerprint_test.cpp" />
     <ClCompile Include="ksp_resonance_test.cpp" />

diff --git a/astronomy/astronomy.vcxproj.filters b/astronomy/astronomy.vcxproj.filters
@@ -299,15 +299,9 @@
     <ClCompile Include="ksp_fingerprint_test.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\numerics\cbrt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="trappist_dynamics_test.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\base\bundle.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="geodesy_test.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
@@ -320,9 +314,6 @@
     <ClCompile Include="standard_product_3_test.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\physics\protector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="orbit_recurrence_test.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
@@ -332,14 +323,8 @@
     <ClCompile Include="orbit_analysis_test.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\base\cpuid.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="лидов_古在_test.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\geometry\instant.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/benchmarks/benchmarks.vcxproj b/benchmarks/benchmarks.vcxproj
@@ -5,25 +5,15 @@
     <RootNamespace>benchmarks</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 Label="Shared">
+    <Import Project="..\shared\base.vcxitems" Label="Shared" />
+    <Import Project="..\shared\geometry.vcxitems" Label="Shared" />
+    <Import Project="..\shared\numerics.vcxitems" Label="Shared" />
+    <Import Project="..\shared\testing_utilities.vcxitems" Label="Shared" />
+    <Import Project="..\shared\astronomy.vcxitems" Label="Shared" />
   </ImportGroup>
   <ItemGroup>
-    <ClCompile Include="..\astronomy\standard_product_3.cpp" />
-    <ClCompile Include="..\base\cpuid.cpp" />
-    <ClCompile Include="..\geometry\instant.cpp" />
     <ClCompile Include="..\ksp_plugin\planetarium.cpp" />
-    <ClCompile Include="..\numerics\cbrt.cpp" />
-    <ClCompile Include="..\numerics\elliptic_integrals.cpp" />
-    <ClCompile Include="..\numerics\elliptic_functions.cpp" />
-    <ClCompile Include="..\numerics\fast_sin_cos_2π.cpp" />
-    <ClCompile Include="..\testing_utilities\optimization_test_functions.cpp" />
     <ClCompile Include="apsides_benchmark.cpp" />
     <ClCompile Include="checkpointer_benchmark.cpp" />
     <ClCompile Include="discrete_trajectory_benchmark.cpp" />

diff --git a/benchmarks/benchmarks.vcxproj.filters b/benchmarks/benchmarks.vcxproj.filters
@@ -47,15 +47,9 @@
     <ClCompile Include="planetarium_benchmark.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\numerics\cbrt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="fast_sin_cos_2π_benchmark.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\numerics\fast_sin_cos_2π.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="geopotential_benchmark.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -65,27 +59,15 @@
     <ClCompile Include="encoder_benchmark.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\numerics\elliptic_integrals.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="elliptic_integrals_benchmark.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="elliptic_functions_benchmark.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\numerics\elliptic_functions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="apsides_benchmark.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\astronomy\standard_product_3.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\base\cpuid.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="discrete_trajectory_benchmark.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -98,15 +80,9 @@
     <ClCompile Include="global_optimization_benchmark.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\testing_utilities\optimization_test_functions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="orbital_elements_benchmark.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\geometry\instant.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="lagrange_equipotentials_benchmark.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/geometry/geometry.vcxproj b/geometry/geometry.vcxproj
@@ -4,6 +4,7 @@
     <ProjectGuid>{0FD08CDF-228C-48C6-8690-CF0A72CF6C69}</ProjectGuid>
     <RootNamespace>geometry</RootNamespace>
   </PropertyGroup>
+  <Import Project="..\shared\base.vcxitems" Label="Shared" />
   <Import Project="$(SolutionDir)principia.props" />
   <ItemGroup>
     <ClInclude Include="affine_map.hpp" />
@@ -65,10 +66,9 @@
     <ClInclude Include="symmetric_bilinear_form.hpp" />
     <ClInclude Include="symmetric_bilinear_form_body.hpp" />
     <ClInclude Include="traits.hpp" />
-    <ClInclude Include="\\Carpaccio\c$\Users\phl\Projects\GitHub\Principia\Principia\geometry\homothecy_body.hpp" />
+    <ClInclude Include="homothecy_body.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\base\cpuid.cpp" />
     <ClCompile Include="barycentre_calculator_test.cpp" />
     <ClCompile Include="complexification_test.cpp" />
     <ClCompile Include="conformal_map_test.cpp" />

diff --git a/geometry/geometry.vcxproj.filters b/geometry/geometry.vcxproj.filters
@@ -176,9 +176,6 @@
     <ClInclude Include="homothecy.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="\\Carpaccio\c$\Users\phl\Projects\GitHub\Principia\Principia\geometry\homothecy_body.hpp">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClInclude Include="conformal_map.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -194,6 +191,9 @@
     <ClInclude Include="space_transformations.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="homothecy_body.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="sign_test.cpp">
@@ -259,9 +259,6 @@
     <ClCompile Include="traits_test.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\base\cpuid.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="plane_test.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>

diff --git a/integrators/integrators.vcxproj b/integrators/integrators.vcxproj
@@ -5,14 +5,9 @@
     <RootNamespace>integrators</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 Label="Shared">
+    <Import Project="..\shared\base.vcxitems" Label="Shared" />
+    <Import Project="..\shared\geometry.vcxitems" Label="Shared" />
   </ImportGroup>
   <ItemGroup>
     <ClInclude Include="adams_moulton_integrator.hpp" />
@@ -45,8 +40,6 @@
     <ClInclude Include="symplectic_runge_kutta_nyström_integrator.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\base\cpuid.cpp" />
-    <ClCompile Include="..\geometry\instant.cpp" />
     <ClCompile Include="embedded_explicit_generalized_runge_kutta_nyström_integrator_test.cpp" />
     <ClCompile Include="embedded_explicit_runge_kutta_integrator_test.cpp" />
     <ClCompile Include="embedded_explicit_runge_kutta_nyström_integrator_test.cpp" />

diff --git a/integrators/integrators.vcxproj.filters b/integrators/integrators.vcxproj.filters
@@ -112,9 +112,6 @@
     <ClCompile Include="embedded_explicit_generalized_runge_kutta_nyström_integrator_test.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\base\cpuid.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="embedded_explicit_runge_kutta_integrator_test.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
@@ -124,8 +121,5 @@
     <ClCompile Include="explicit_linear_multistep_integrator_test.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\geometry\instant.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/journal/journal.vcxproj b/journal/journal.vcxproj
@@ -5,14 +5,8 @@
     <RootNamespace>journal</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 Label="Shared">
+    <Import Project="..\shared\base.vcxitems" Label="Shared" />
   </ImportGroup>
   <ItemGroup>
     <ClInclude Include="method.hpp" />
@@ -26,8 +20,6 @@
     <ClInclude Include="recorder.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\base\cpuid.cpp" />
-    <ClCompile Include="..\base\version.generated.cc" />
     <ClCompile Include="player.cpp" />
     <ClCompile Include="player.generated.cc">
       <ExcludedFromBuild>true</ExcludedFromBuild>

diff --git a/journal/journal.vcxproj.filters b/journal/journal.vcxproj.filters
@@ -58,11 +58,5 @@
     <ClCompile Include="player.generated.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\base\version.generated.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\base\cpuid.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>