Add external/eigen to VC++ include paths.

Add a pre-build check to warn the user about the missing submodule and run git submodule update -i as an automatic attempt to fix it.
codereader · Apr 10, 2021 · 5305d62 · 5305d62
1 parent fdee766
commit 5305d62
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/tools/msvc/mathlib.vcxproj b/tools/msvc/mathlib.vcxproj
@@ -84,21 +84,53 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile />
+    <PreBuildEvent>
+      <Message>
+      </Message>
+      <Command>if not exist "$(DarkRadiantRoot)\external\eigen\Eigen" (echo The external/eigen/Eigen folder is missing, please ensure you've run 'git submodule update' &amp;&amp; git submodule update -i)</Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile />
+    <PreBuildEvent>
+      <Message>
+      </Message>
+      <Command>if not exist "$(DarkRadiantRoot)\external\eigen\Eigen" (echo The external/eigen/Eigen folder is missing, please ensure you've run 'git submodule update' &amp;&amp; git submodule update -i)</Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile />
+    <PreBuildEvent>
+      <Message>
+      </Message>
+      <Command>if not exist "$(DarkRadiantRoot)\external\eigen\Eigen" (echo The external/eigen/Eigen folder is missing, please ensure you've run 'git submodule update' &amp;&amp; git submodule update -i)</Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile />
+    <PreBuildEvent>
+      <Message>
+      </Message>
+      <Command>if not exist "$(DarkRadiantRoot)\external\eigen\Eigen" (echo The external/eigen/Eigen folder is missing, please ensure you've run 'git submodule update' &amp;&amp; git submodule update -i)</Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\libs\math\AABB.cpp" />

diff --git a/tools/msvc/properties/DarkRadiant Base.props b/tools/msvc/properties/DarkRadiant Base.props
@@ -12,7 +12,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(DarkRadiantRoot)\include;$(DarkRadiantRoot)\libs;$(W32DepsDir)libsigc++\include;$(DarkRadiantRoot)\libs\libfmt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(DarkRadiantRoot)\include;$(DarkRadiantRoot)\libs;$(W32DepsDir)libsigc++\include;$(DarkRadiantRoot)\libs\libfmt;$(DarkRadiantRoot)\external\eigen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;FMT_HEADER_ONLY;FMT_USE_WINDOWS_H=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>