Skip to content

Commit

Permalink
Add Projects: TEST_ECOS, ECOS_BB, TEST_ECOS_BB for VS2017
Browse files Browse the repository at this point in the history
  • Loading branch information
souvikdas95 committed Aug 21, 2017
1 parent 341e015 commit 429218a
Show file tree
Hide file tree
Showing 8 changed files with 569 additions and 15 deletions.
15 changes: 1 addition & 14 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,4 @@ python/dist
python/*.pyc

# VS temp files
*.vs
*.db
*.db-*
*.idb
*.ilk
*.lastbuildstate
*.log
*.obj
*.opendb
*.ipch
*.pdb
*.tlog
*.vcxproj.filters
*.vcxproj.user
*.vs
5 changes: 5 additions & 0 deletions vstudio/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# VS temp files
Debug
Release
*.vcxproj.filters
*.vcxproj.user
35 changes: 35 additions & 0 deletions vstudio/ECOS.sln
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RUNECOSEXP", "RUNECOSEXP\RU
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SuiteSparse_config", "SuiteSparse_config\SuiteSparse_config.vcxproj", "{CA776687-65F0-47CA-8578-45160B8D9AA6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TEST_ECOS", "TEST_ECOS\TEST_ECOS.vcxproj", "{87755E44-8CEC-4B20-A4B9-73AD1D2F190B}"
ProjectSection(ProjectDependencies) = postProject
{530A3224-506F-4C26-853B-475E069FDDD6} = {530A3224-506F-4C26-853B-475E069FDDD6}
{724D412D-5DA9-4FB0-A5C9-AD28AC037305} = {724D412D-5DA9-4FB0-A5C9-AD28AC037305}
{CA776687-65F0-47CA-8578-45160B8D9AA6} = {CA776687-65F0-47CA-8578-45160B8D9AA6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TEST_ECOS_BB", "TEST_ECOS_BB\TEST_ECOS_BB.vcxproj", "{D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ECOS_BB", "ECOS_BB\ECOS_BB.vcxproj", "{D4850429-67BC-4051-AD8D-B6D72EEB51DB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Expand Down Expand Up @@ -74,6 +85,30 @@ Global
{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
{87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Debug|Win32.ActiveCfg = Debug|Win32
{87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Debug|Win32.Build.0 = Debug|Win32
{87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Debug|x64.ActiveCfg = Debug|x64
{87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Debug|x64.Build.0 = Debug|x64
{87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Release|Win32.ActiveCfg = Release|Win32
{87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Release|Win32.Build.0 = Release|Win32
{87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Release|x64.ActiveCfg = Release|x64
{87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Release|x64.Build.0 = Release|x64
{D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Debug|Win32.ActiveCfg = Debug|Win32
{D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Debug|Win32.Build.0 = Debug|Win32
{D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Debug|x64.ActiveCfg = Debug|x64
{D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Debug|x64.Build.0 = Debug|x64
{D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Release|Win32.ActiveCfg = Release|Win32
{D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Release|Win32.Build.0 = Release|Win32
{D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Release|x64.ActiveCfg = Release|x64
{D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Release|x64.Build.0 = Release|x64
{D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Debug|Win32.ActiveCfg = Debug|Win32
{D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Debug|Win32.Build.0 = Debug|Win32
{D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Debug|x64.ActiveCfg = Debug|x64
{D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Debug|x64.Build.0 = Debug|x64
{D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Release|Win32.ActiveCfg = Release|Win32
{D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Release|Win32.Build.0 = Release|Win32
{D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Release|x64.ActiveCfg = Release|x64
{D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
4 changes: 4 additions & 0 deletions vstudio/ECOS/ECOS.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{BD19D8A4-021F-440D-9C95-5CB13F20CBD9}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>ECOS</RootNamespace>
<WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down Expand Up @@ -163,6 +164,9 @@
<ProjectReference Include="..\LDL\LDL.vcxproj">
<Project>{724d412d-5da9-4fb0-a5c9-ad28ac037305}</Project>
</ProjectReference>
<ProjectReference Include="..\SuiteSparse_config\SuiteSparse_config.vcxproj">
<Project>{CA776687-65F0-47CA-8578-45160B8D9AA6}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
177 changes: 177 additions & 0 deletions vstudio/ECOS_BB/ECOS_BB.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D4850429-67BC-4051-AD8D-B6D72EEB51DB}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>ECOS_BB</RootNamespace>
<WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<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>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<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>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<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>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<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>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\ecos_bb\ecos_bb.c" />
<ClCompile Include="..\..\ecos_bb\ecos_bb_preproc.c" />
<ClCompile Include="..\..\src\cone.c" />
<ClCompile Include="..\..\src\ctrlc.c" />
<ClCompile Include="..\..\src\ecos.c" />
<ClCompile Include="..\..\src\equil.c" />
<ClCompile Include="..\..\src\expcone.c" />
<ClCompile Include="..\..\src\kkt.c" />
<ClCompile Include="..\..\src\preproc.c" />
<ClCompile Include="..\..\src\spla.c" />
<ClCompile Include="..\..\src\splamm.c" />
<ClCompile Include="..\..\src\timer.c" />
<ClCompile Include="..\..\src\wright_omega.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\cone.h" />
<ClInclude Include="..\..\include\ctrlc.h" />
<ClInclude Include="..\..\include\ecos.h" />
<ClInclude Include="..\..\include\ecos_bb.h" />
<ClInclude Include="..\..\include\equil.h" />
<ClInclude Include="..\..\include\expcone.h" />
<ClInclude Include="..\..\include\glblopts.h" />
<ClInclude Include="..\..\include\kkt.h" />
<ClInclude Include="..\..\include\spla.h" />
<ClInclude Include="..\..\include\splamm.h" />
<ClInclude Include="..\..\include\timer.h" />
<ClInclude Include="..\..\include\wright_omega.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AMD\AMD.vcxproj">
<Project>{530a3224-506f-4c26-853b-475e069fddd6}</Project>
</ProjectReference>
<ProjectReference Include="..\LDL\LDL.vcxproj">
<Project>{724d412d-5da9-4fb0-a5c9-ad28ac037305}</Project>
</ProjectReference>
<ProjectReference Include="..\SuiteSparse_config\SuiteSparse_config.vcxproj">
<Project>{CA776687-65F0-47CA-8578-45160B8D9AA6}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
2 changes: 1 addition & 1 deletion vstudio/RUNECOS/RUNECOS.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{8DAB4734-3693-4430-848F-68AA005565B3}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>ConsoleApplication1</RootNamespace>
<RootNamespace>RUNECOS</RootNamespace>
<ProjectName>RUNECOS</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
Expand Down
Loading

0 comments on commit 429218a

Please sign in to comment.