Update Project files to match the dependencies

1. Also introduced new Project dependency: "SuiteSparse_config" 2. Reduce unnecessary coverage - 2
embotech · Jul 7, 2017 · 66ed0b6 · 66ed0b6
1 parent 0b46f6b
commit 66ed0b6
Show file tree

Hide file tree

Showing 13 changed files with 279 additions and 66 deletions.
diff --git a/external/amd/_Include/amd.h → external/amd/Include/amd.h b/external/amd/_Include/amd.h → external/amd/Include/amd.h
diff --git a/external/amd/_Include/amd_internal.h → external/amd/Include/amd_internal.h b/external/amd/_Include/amd_internal.h → external/amd/Include/amd_internal.h
diff --git a/external/ldl/_Include/ldl.h → external/ldl/Include/ldl.h b/external/ldl/_Include/ldl.h → external/ldl/Include/ldl.h
diff --git a/vstudio/AMD/AMD.vcxproj b/vstudio/AMD/AMD.vcxproj
@@ -72,7 +72,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\amd\Include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OpenMPSupport>false</OpenMPSupport>
       <PreprocessorDefinitions>NPRINT;DLONG;ZLONG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>NDEBUG;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
@@ -81,25 +81,33 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <NoEntryPoint>true</NoEntryPoint>
     </Link>
+    <Lib>
+      <AdditionalDependencies>SuiteSparse_config.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\amd\Include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OpenMPSupport>false</OpenMPSupport>
       <PreprocessorDefinitions>NPRINT;NDEBUG;DLONG;ZLONG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <NoEntryPoint>true</NoEntryPoint>
     </Link>
+    <Lib>
+      <AdditionalDependencies>SuiteSparse_config.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\amd\Include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OpenMPSupport>false</OpenMPSupport>
       <PreprocessorDefinitions>NPRINT;DLONG;ZLONG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>NDEBUG;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
@@ -108,40 +116,48 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <NoEntryPoint>true</NoEntryPoint>
     </Link>
+    <Lib>
+      <AdditionalDependencies>SuiteSparse_config.lib</AdditionalDependencies>
+    </Lib>
+    <Lib>
+      <AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\amd\Include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OpenMPSupport>false</OpenMPSupport>
       <PreprocessorDefinitions>NPRINT;NDEBUG;DLONG;ZLONG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <NoEntryPoint>true</NoEntryPoint>
     </Link>
+    <Lib>
+      <AdditionalDependencies>SuiteSparse_config.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\external\amd\include\amd.h" />
-    <ClInclude Include="..\..\external\amd\include\amd_internal.h" />
-    <ClInclude Include="..\..\external\suitesparse_config\SuiteSparse_config.h" />
+    <ClInclude Include="..\..\external\amd\Include\amd.h" />
+    <ClInclude Include="..\..\external\amd\Include\amd_internal.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\external\amd\src\amd_1.c" />
-    <ClCompile Include="..\..\external\amd\src\amd_2.c" />
-    <ClCompile Include="..\..\external\amd\src\amd_aat.c" />
-    <ClCompile Include="..\..\external\amd\src\amd_control.c" />
-    <ClCompile Include="..\..\external\amd\src\amd_defaults.c" />
-    <ClCompile Include="..\..\external\amd\src\amd_dump.c" />
-    <ClCompile Include="..\..\external\amd\src\amd_global.c" />
-    <ClCompile Include="..\..\external\amd\src\amd_info.c" />
-    <ClCompile Include="..\..\external\amd\src\amd_order.c" />
-    <ClCompile Include="..\..\external\amd\src\amd_postorder.c" />
-    <ClCompile Include="..\..\external\amd\src\amd_post_tree.c" />
-    <ClCompile Include="..\..\external\amd\src\amd_preprocess.c" />
-    <ClCompile Include="..\..\external\amd\src\amd_valid.c" />
-    <ClCompile Include="..\..\external\SuiteSparse_config\SuiteSparse_config.c" />
+    <ClCompile Include="..\..\external\amd\Source\amd_1.c" />
+    <ClCompile Include="..\..\external\amd\Source\amd_2.c" />
+    <ClCompile Include="..\..\external\amd\Source\amd_aat.c" />
+    <ClCompile Include="..\..\external\amd\Source\amd_control.c" />
+    <ClCompile Include="..\..\external\amd\Source\amd_defaults.c" />
+    <ClCompile Include="..\..\external\amd\Source\amd_dump.c" />
+    <ClCompile Include="..\..\external\amd\Source\amd_global.c" />
+    <ClCompile Include="..\..\external\amd\Source\amd_info.c" />
+    <ClCompile Include="..\..\external\amd\Source\amd_order.c" />
+    <ClCompile Include="..\..\external\amd\Source\amd_postorder.c" />
+    <ClCompile Include="..\..\external\amd\Source\amd_post_tree.c" />
+    <ClCompile Include="..\..\external\amd\Source\amd_preprocess.c" />
+    <ClCompile Include="..\..\external\amd\Source\amd_valid.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/vstudio/AMD/AMD.vcxproj.filters b/vstudio/AMD/AMD.vcxproj.filters
@@ -11,57 +11,51 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\external\amd\include\amd.h">
+    <ClInclude Include="..\..\external\amd\Include\amd_internal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\external\amd\include\amd_internal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\suitesparse_config\SuiteSparse_config.h">
+    <ClInclude Include="..\..\external\amd\Include\amd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\external\amd\src\amd_1.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\amd\src\amd_2.c">
+    <ClCompile Include="..\..\external\amd\Source\amd_defaults.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\external\amd\src\amd_aat.c">
+    <ClCompile Include="..\..\external\amd\Source\amd_dump.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\external\amd\src\amd_control.c">
+    <ClCompile Include="..\..\external\amd\Source\amd_global.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\external\amd\src\amd_defaults.c">
+    <ClCompile Include="..\..\external\amd\Source\amd_info.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\external\amd\src\amd_dump.c">
+    <ClCompile Include="..\..\external\amd\Source\amd_order.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\external\amd\src\amd_global.c">
+    <ClCompile Include="..\..\external\amd\Source\amd_post_tree.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\external\amd\src\amd_info.c">
+    <ClCompile Include="..\..\external\amd\Source\amd_postorder.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\external\amd\src\amd_order.c">
+    <ClCompile Include="..\..\external\amd\Source\amd_preprocess.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\external\amd\src\amd_post_tree.c">
+    <ClCompile Include="..\..\external\amd\Source\amd_valid.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\external\amd\src\amd_postorder.c">
+    <ClCompile Include="..\..\external\amd\Source\amd_1.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\external\amd\src\amd_preprocess.c">
+    <ClCompile Include="..\..\external\amd\Source\amd_2.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\external\amd\src\amd_valid.c">
+    <ClCompile Include="..\..\external\amd\Source\amd_aat.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\external\SuiteSparse_config\SuiteSparse_config.c">
+    <ClCompile Include="..\..\external\amd\Source\amd_control.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/vstudio/ECOS.sln b/vstudio/ECOS.sln
@@ -4,18 +4,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 15.0.26430.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMD", "AMD\AMD.vcxproj", "{530A3224-506F-4C26-853B-475E069FDDD6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LDL", "LDL\LDL.vcxproj", "{724D412D-5DA9-4FB0-A5C9-AD28AC037305}"
 	ProjectSection(ProjectDependencies) = postProject
-		{530A3224-506F-4C26-853B-475E069FDDD6} = {530A3224-506F-4C26-853B-475E069FDDD6}
+		{CA776687-65F0-47CA-8578-45160B8D9AA6} = {CA776687-65F0-47CA-8578-45160B8D9AA6}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LDL", "LDL\LDL.vcxproj", "{724D412D-5DA9-4FB0-A5C9-AD28AC037305}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ECOS", "ECOS\ECOS.vcxproj", "{BD19D8A4-021F-440D-9C95-5CB13F20CBD9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RUNECOS", "RUNECOS\RUNECOS.vcxproj", "{8DAB4734-3693-4430-848F-68AA005565B3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RUNECOSEXP", "RUNECOSEXP\RUNECOSEXP.vcxproj", "{2AB26548-4B88-4D0C-83DC-C4F3C1B0417A}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SuiteSparse_config", "SuiteSparse_config\SuiteSparse_config.vcxproj", "{CA776687-65F0-47CA-8578-45160B8D9AA6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -64,6 +66,14 @@ Global
 		{2AB26548-4B88-4D0C-83DC-C4F3C1B0417A}.Release|Win32.Build.0 = Release|Win32
 		{2AB26548-4B88-4D0C-83DC-C4F3C1B0417A}.Release|x64.ActiveCfg = Release|x64
 		{2AB26548-4B88-4D0C-83DC-C4F3C1B0417A}.Release|x64.Build.0 = Release|x64
+		{CA776687-65F0-47CA-8578-45160B8D9AA6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CA776687-65F0-47CA-8578-45160B8D9AA6}.Debug|Win32.Build.0 = Debug|Win32
+		{CA776687-65F0-47CA-8578-45160B8D9AA6}.Debug|x64.ActiveCfg = Debug|x64
+		{CA776687-65F0-47CA-8578-45160B8D9AA6}.Debug|x64.Build.0 = Debug|x64
+		{CA776687-65F0-47CA-8578-45160B8D9AA6}.Release|Win32.ActiveCfg = Release|Win32
+		{CA776687-65F0-47CA-8578-45160B8D9AA6}.Release|Win32.Build.0 = Release|Win32
+		{CA776687-65F0-47CA-8578-45160B8D9AA6}.Release|x64.ActiveCfg = Release|x64
+		{CA776687-65F0-47CA-8578-45160B8D9AA6}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/vstudio/ECOS/ECOS.vcxproj b/vstudio/ECOS/ECOS.vcxproj
@@ -78,7 +78,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\Include;$(ProjectDir)\..\..\external\amd\Include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
@@ -93,7 +93,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\Include;$(ProjectDir)\..\..\external\amd\Include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
@@ -108,7 +108,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\Include;$(ProjectDir)\..\..\external\amd\Include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -122,7 +122,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\Include;$(ProjectDir)\..\..\external\amd\Include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/vstudio/LDL/LDL.vcxproj b/vstudio/LDL/LDL.vcxproj
@@ -72,7 +72,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\ldl\Include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LDL_LONG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -83,7 +83,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\ldl\Include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LDL_LONG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -94,7 +94,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\ldl\Include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LDL_LONG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -105,19 +105,19 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\external\ldl\Include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LDL_LONG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\external\ldl\include\ldl.h" />
+    <ClInclude Include="..\..\external\ldl\Include\ldl.h" />
     <ClInclude Include="..\..\external\SuiteSparse_config\SuiteSparse_config.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\external\ldl\src\ldl.c" />
+    <ClCompile Include="..\..\external\ldl\Source\ldl.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/vstudio/LDL/LDL.vcxproj.filters b/vstudio/LDL/LDL.vcxproj.filters
@@ -11,15 +11,15 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\external\ldl\include\ldl.h">
+    <ClInclude Include="..\..\external\SuiteSparse_config\SuiteSparse_config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\external\SuiteSparse_config\SuiteSparse_config.h">
+    <ClInclude Include="..\..\external\ldl\Include\ldl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\external\ldl\src\ldl.c">
+    <ClCompile Include="..\..\external\ldl\Source\ldl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>