Remove external/eigen folder and update VC++ projects to include Eige…

…n from the w32deps folder
codereader · Apr 12, 2021 · 65d5693 · 65d5693
1 parent 02fa264
commit 65d5693
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/external/eigen b/external/eigen
diff --git a/tools/msvc/mathlib.vcxproj b/tools/msvc/mathlib.vcxproj
@@ -87,7 +87,8 @@
     <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>
+      <Command>
+      </Command>
     </PreBuildEvent>
     <ClCompile>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -101,7 +102,8 @@
     <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>
+      <Command>
+      </Command>
     </PreBuildEvent>
     <ClCompile>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -112,7 +114,8 @@
     <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>
+      <Command>
+      </Command>
     </PreBuildEvent>
     <ClCompile>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -126,7 +129,8 @@
     <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>
+      <Command>
+      </Command>
     </PreBuildEvent>
     <ClCompile>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

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;$(DarkRadiantRoot)\external\eigen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(DarkRadiantRoot)\include;$(DarkRadiantRoot)\libs;$(W32DepsDir)libsigc++\include;$(DarkRadiantRoot)\libs\libfmt;$(W32DepsDir)libeigen;%(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>