Changeset 305 for trunk/MSVisualStudio


Ignore:
Timestamp:
Mar 21, 2012 1:50:44 PM (9 years ago)
Author:
kulshres
Message:

Update windows visual studio build files

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

Location:
trunk/MSVisualStudio/v10
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MSVisualStudio/v10/ColPack.vcxproj

    r296 r305  
    6363    </Link>
    6464    <CustomBuildStep>
    65       <Command>mkdir "$(IntDir)\include" &amp; copy "Main\*.h" "$(IntDir)\include" &amp; copy "Utilities\*.h" "$(IntDir)\include" &amp; copy "GraphColoring\*.h" "$(IntDir)\include" &amp; copy "BipartiteGraphBicoloring\*.h" "$(IntDir)\include" &amp; copy "BipartiteGraphPartialColoring\*.h" "$(IntDir)\include" &amp; copy "Recovery\*.h" "$(IntDir)\include"</Command>
    66       <Outputs>$(IntDir)\include\ColPackHeaders.h;%(Outputs)</Outputs>
     65      <Command>mkdir "$(IntDir)\include" &amp; mkdir "$(IntDir)\include\ColPack" &amp; copy "Main\*.h" "$(IntDir)\include\ColPack" &amp; copy "Utilities\*.h" "$(IntDir)\include\ColPack" &amp; copy "GraphColoring\*.h" "$(IntDir)\include\ColPack" &amp; copy "BipartiteGraphBicoloring\*.h" "$(IntDir)\include\ColPack" &amp; copy "BipartiteGraphPartialColoring\*.h" "$(IntDir)\include\ColPack" &amp; copy "Recovery\*.h" "$(IntDir)\include\ColPack"</Command>
     66      <Outputs>$(IntDir)\include\ColPack\ColPackHeaders.h;%(Outputs)</Outputs>
    6767    </CustomBuildStep>
    6868  </ItemDefinitionGroup>
     
    8282    </Link>
    8383    <CustomBuildStep>
    84       <Command>mkdir "$(IntDir)\include" &amp; copy "Main\*.h" "$(IntDir)\include" &amp; copy "Utilities\*.h" "$(IntDir)\include" &amp; copy "GraphColoring\*.h" "$(IntDir)\include" &amp; copy "BipartiteGraphBicoloring\*.h" "$(IntDir)\include" &amp; copy "BipartiteGraphPartialColoring\*.h" "$(IntDir)\include" &amp; copy "Recovery\*.h" "$(IntDir)\include"</Command>
    85       <Outputs>$(IntDir)\include\ColPackHeaders.h;%(Outputs)</Outputs>
     84      <Command>mkdir "$(IntDir)\include" &amp; mkdir "$(IntDir)\include\ColPack" &amp; copy "Main\*.h" "$(IntDir)\include\ColPack" &amp; copy "Utilities\*.h" "$(IntDir)\include\ColPack" &amp; copy "GraphColoring\*.h" "$(IntDir)\include\ColPack" &amp; copy "BipartiteGraphBicoloring\*.h" "$(IntDir)\include\ColPack" &amp; copy "BipartiteGraphPartialColoring\*.h" "$(IntDir)\include\ColPack" &amp; copy "Recovery\*.h" "$(IntDir)\include\ColPack"</Command>
     85      <Outputs>$(IntDir)\include\ColPack\ColPackHeaders.h;%(Outputs)</Outputs>
    8686    </CustomBuildStep>
    8787  </ItemDefinitionGroup>
     
    115115    <ClCompile Include="recovery\JacobianRecovery2D.cpp" />
    116116    <ClCompile Include="recovery\RecoveryCore.cpp" />
     117    <ClCompile Include="Utilities\CoutLock.cpp" />
    117118    <ClCompile Include="Utilities\current_time.cpp" />
    118119    <ClCompile Include="utilities\DisjointSets.cpp" />
     
    147148    <ClInclude Include="recovery\RecoveryCore.h" />
    148149    <ClInclude Include="utilities\command_line_parameter_processor.h" />
     150    <ClInclude Include="Utilities\CoutLock.h" />
    149151    <ClInclude Include="utilities\current_time.h" />
    150152    <ClInclude Include="utilities\DisjointSets.h" />
  • trunk/MSVisualStudio/v10/ColPack_Readme_VC++.txt

    r304 r305  
    55tar -xzf ColPack-$VERSION.tar.gz
    66
    7 or use your favourite extraction utility under windows.
     7or use your favourite extraction utility under windows. Rename the
     8subdirectory to be simply ColPack. Then move the file ColPack.vcxproj into
     9this subdirectory
    810
    9112. In Visual Studio open the solution file
     
    1113adolc.sln
    1214
    13 select the solution 'adolc' in the Solution Explorer, from the toolbar select
    14 the build configuration sparse and from Build menu select Build Solution
    15 (shortcut key F7).
     15select the solution 'adolc' in the Solution Explorer, rightclick and select
     16Add -> Existing project and then choose the ColPack.vcxproj project from the
     17ColPack subdirectory. Right click on adolc and select Project Dependencies
     18and tick the check mark on ColPack. Then select from the toolbar select
     19the build onfiguration sparse and from Build menu select Build Solution
     20(shortcut F7).
    1621
    1722This will build ColPack and link it with the sparse version of adolc.dll
  • trunk/MSVisualStudio/v10/adolc.sln

    r212 r305  
    22Microsoft Visual Studio Solution File, Format Version 11.00
    33# Visual Studio 2010
    4 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adolc", "adolc.vcxproj", "{88779F63-E2E6-6271-B922-86A37128E03A}"
     4Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adolc", "adolc.vcxproj", "{43459339-26DA-B162-0783-4ED235513520}"
    55        ProjectSection(ProjectDependencies) = postProject
    6                 {B1CA0278-1333-DA5D-6345-382C8E825B36} = {B1CA0278-1333-DA5D-6345-382C8E825B36}
     6                {C960E4D8-CE08-FDD2-02FD-6394A67739EA} = {C960E4D8-CE08-FDD2-02FD-6394A67739EA}
    77        EndProjectSection
    88EndProject
    9 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ColPack", "..\..\ThirdParty\ColPack\ColPack.vcxproj", "{B1CA0278-1333-DA5D-6345-382C8E825B36}"
     9Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ColPack", "ColPack\ColPack.vcxproj", "{C960E4D8-CE08-FDD2-02FD-6394A67739EA}"
    1010EndProject
    1111Global
     
    1717        EndGlobalSection
    1818        GlobalSection(ProjectConfigurationPlatforms) = postSolution
    19                 {88779F63-E2E6-6271-B922-86A37128E03A}.nosparse|Win32.ActiveCfg = nosparse|Win32
    20                 {88779F63-E2E6-6271-B922-86A37128E03A}.nosparse|Win32.Build.0 = nosparse|Win32
    21                 {88779F63-E2E6-6271-B922-86A37128E03A}.nosparse|x64.ActiveCfg = nosparse|x64
    22                 {88779F63-E2E6-6271-B922-86A37128E03A}.nosparse|x64.Build.0 = nosparse|x64
    23                 {88779F63-E2E6-6271-B922-86A37128E03A}.sparse|Win32.ActiveCfg = sparse|Win32
    24                 {88779F63-E2E6-6271-B922-86A37128E03A}.sparse|Win32.Build.0 = sparse|Win32
    25                 {88779F63-E2E6-6271-B922-86A37128E03A}.sparse|x64.ActiveCfg = sparse|x64
    26                 {88779F63-E2E6-6271-B922-86A37128E03A}.sparse|x64.Build.0 = sparse|x64
    27                 {B1CA0278-1333-DA5D-6345-382C8E825B36}.nosparse|Win32.ActiveCfg = sparse|Win32
    28                 {B1CA0278-1333-DA5D-6345-382C8E825B36}.nosparse|Win32.Build.0 = sparse|Win32
    29                 {B1CA0278-1333-DA5D-6345-382C8E825B36}.nosparse|x64.ActiveCfg = sparse|x64
    30                 {B1CA0278-1333-DA5D-6345-382C8E825B36}.nosparse|x64.Build.0 = sparse|x64
    31                 {B1CA0278-1333-DA5D-6345-382C8E825B36}.sparse|Win32.ActiveCfg = sparse|Win32
    32                 {B1CA0278-1333-DA5D-6345-382C8E825B36}.sparse|Win32.Build.0 = sparse|Win32
    33                 {B1CA0278-1333-DA5D-6345-382C8E825B36}.sparse|x64.ActiveCfg = sparse|x64
    34                 {B1CA0278-1333-DA5D-6345-382C8E825B36}.sparse|x64.Build.0 = sparse|x64
     19                {43459339-26DA-B162-0783-4ED235513520}.nosparse|Win32.ActiveCfg = nosparse|Win32
     20                {43459339-26DA-B162-0783-4ED235513520}.nosparse|Win32.Build.0 = nosparse|Win32
     21                {43459339-26DA-B162-0783-4ED235513520}.nosparse|x64.ActiveCfg = nosparse|x64
     22                {43459339-26DA-B162-0783-4ED235513520}.nosparse|x64.Build.0 = nosparse|x64
     23                {43459339-26DA-B162-0783-4ED235513520}.sparse|Win32.ActiveCfg = sparse|Win32
     24                {43459339-26DA-B162-0783-4ED235513520}.sparse|Win32.Build.0 = sparse|Win32
     25                {43459339-26DA-B162-0783-4ED235513520}.sparse|x64.ActiveCfg = sparse|x64
     26                {43459339-26DA-B162-0783-4ED235513520}.sparse|x64.Build.0 = sparse|x64
     27                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.nosparse|Win32.ActiveCfg = sparse|Win32
     28                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.nosparse|Win32.Build.0 = sparse|Win32
     29                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.nosparse|x64.ActiveCfg = sparse|x64
     30                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.nosparse|x64.Build.0 = sparse|x64
     31                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.sparse|Win32.ActiveCfg = sparse|Win32
     32                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.sparse|Win32.Build.0 = sparse|Win32
     33                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.sparse|x64.ActiveCfg = sparse|x64
     34                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.sparse|x64.Build.0 = sparse|x64
    3535        EndGlobalSection
    3636        GlobalSection(SolutionProperties) = preSolution
  • trunk/MSVisualStudio/v10/adolc.vcxproj

    r212 r305  
    7070    <ClCompile>
    7171      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;ADOLC_DLL;ADOLC_INTERNAL=1;HAVE_CONFIG_H;SPARSE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    72       <AdditionalIncludeDirectories>$(IntDir);$(ProjectDir)..\..\ThirdParty\ColPack\$(IntDir)include;$(ProjectDir)..\..\ADOL-C;$(ProjectDir)..\..\ADOL-C\src;$(ProjectDir)..\ThirdParty\ColPack\$(IntDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     72      <AdditionalIncludeDirectories>$(IntDir);$(ProjectDir)\ColPack\$(IntDir)\include;$(ProjectDir)..\..\ADOL-C;$(ProjectDir)..\..\ADOL-C\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    7373      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    7474      <WarningLevel>Level3</WarningLevel>
     
    9393    <ClCompile>
    9494      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;ADOLC_DLL;ADOLC_INTERNAL=1;HAVE_CONFIG_H;SPARSE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    95       <AdditionalIncludeDirectories>$(IntDir);$(ProjectDir)..\..\ThirdParty\ColPack\$(IntDir)include;$(ProjectDir)..\..\ADOL-C;$(ProjectDir)..\..\ADOL-C\src;$(ProjectDir)..\ThirdParty\ColPack\$(IntDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     95      <AdditionalIncludeDirectories>$(IntDir);$(ProjectDir)\ColPack\$(IntDir)\include;$(ProjectDir)..\..\ADOL-C;$(ProjectDir)..\..\ADOL-C\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9696      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    9797      <WarningLevel>Level3</WarningLevel>
Note: See TracChangeset for help on using the changeset viewer.