Changeset 307


Ignore:
Timestamp:
Mar 21, 2012 1:57:06 PM (7 years ago)
Author:
kulshres
Message:

Merge branch 'svn' into svn-stab

Location:
stable/2.3
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • stable/2.3/ADOL-C/examples/adolc_examples.sln

    r187 r307  
    22Microsoft Visual Studio Solution File, Format Version 11.00
    33# Visual Studio 2010
    4 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adolc", "..\..\windows\adolc.vcxproj", "{8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}"
     4Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adolc", "..\..\MSVisualStudio\v10\adolc.vcxproj", "{43459339-26DA-B162-0783-4ED235513520}"
     5        ProjectSection(ProjectDependencies) = postProject
     6                {C960E4D8-CE08-FDD2-02FD-6394A67739EA} = {C960E4D8-CE08-FDD2-02FD-6394A67739EA}
     7        EndProjectSection
    58EndProject
    6 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ColPack", "..\..\ThirdParty\ColPack\ColPack.vcxproj", "{E15FF863-18E9-E567-5F8B-225D07C68E05}"
     9Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ColPack", "..\..\MSVisualStudio\v10\ColPack\ColPack.vcxproj", "{C960E4D8-CE08-FDD2-02FD-6394A67739EA}"
    710EndProject
    811Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "detexam", "detexam.vcxproj", "{6CE9090C-04DC-7E4E-7467-F305FA21EF94}"
    912        ProjectSection(ProjectDependencies) = postProject
    10                 {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE} = {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}
     13                {43459339-26DA-B162-0783-4ED235513520} = {43459339-26DA-B162-0783-4ED235513520}
    1114        EndProjectSection
    1215EndProject
    1316Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odexam", "odexam.vcxproj", "{9E9CADB9-BFA1-6178-7679-6BB8495565A5}"
    1417        ProjectSection(ProjectDependencies) = postProject
    15                 {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE} = {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}
     18                {43459339-26DA-B162-0783-4ED235513520} = {43459339-26DA-B162-0783-4ED235513520}
    1619        EndProjectSection
    1720EndProject
    1821Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "powexam", "powexam.vcxproj", "{1098784F-EC9E-ABB1-82E1-E06ABFF7478F}"
    1922        ProjectSection(ProjectDependencies) = postProject
    20                 {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE} = {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}
     23                {43459339-26DA-B162-0783-4ED235513520} = {43459339-26DA-B162-0783-4ED235513520}
    2124        EndProjectSection
    2225EndProject
    2326Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speelpenning", "speelpenning.vcxproj", "{93451EA1-D8E6-FE67-0D00-5E591FEE771C}"
    2427        ProjectSection(ProjectDependencies) = postProject
    25                 {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE} = {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}
     28                {43459339-26DA-B162-0783-4ED235513520} = {43459339-26DA-B162-0783-4ED235513520}
    2629        EndProjectSection
    2730EndProject
    2831Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tapeless_scalar", "tapeless_scalar.vcxproj", "{5BBECE46-5467-9A31-7E5E-3DBBA59C611F}"
    2932        ProjectSection(ProjectDependencies) = postProject
    30                 {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE} = {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}
     33                {43459339-26DA-B162-0783-4ED235513520} = {43459339-26DA-B162-0783-4ED235513520}
    3134        EndProjectSection
    3235EndProject
    3336Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tapeless_vector", "tapeless_vector.vcxproj", "{869E4942-ABB6-64D9-910C-7127B9BD4C17}"
    3437        ProjectSection(ProjectDependencies) = postProject
    35                 {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE} = {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}
     38                {43459339-26DA-B162-0783-4ED235513520} = {43459339-26DA-B162-0783-4ED235513520}
    3639        EndProjectSection
    3740EndProject
     
    4447        EndGlobalSection
    4548        GlobalSection(ProjectConfigurationPlatforms) = postSolution
    46                 {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.nosparse|Win32.ActiveCfg = nosparse|Win32
    47                 {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.nosparse|Win32.Build.0 = nosparse|Win32
    48                 {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.nosparse|x64.ActiveCfg = nosparse|x64
    49                 {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.nosparse|x64.Build.0 = nosparse|x64
    50                 {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.sparse|Win32.ActiveCfg = sparse|Win32
    51                 {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.sparse|Win32.Build.0 = sparse|Win32
    52                 {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.sparse|x64.ActiveCfg = sparse|x64
    53                 {8BFBD9F9-2EFE-2966-8961-46A7ED1320FE}.sparse|x64.Build.0 = sparse|x64
    54                 {E15FF863-18E9-E567-5F8B-225D07C68E05}.nosparse|Win32.ActiveCfg = sparse|Win32
    55                 {E15FF863-18E9-E567-5F8B-225D07C68E05}.nosparse|Win32.Build.0 = sparse|Win32
    56                 {E15FF863-18E9-E567-5F8B-225D07C68E05}.nosparse|x64.ActiveCfg = sparse|x64
    57                 {E15FF863-18E9-E567-5F8B-225D07C68E05}.nosparse|x64.Build.0 = sparse|x64
    58                 {E15FF863-18E9-E567-5F8B-225D07C68E05}.sparse|Win32.ActiveCfg = sparse|Win32
    59                 {E15FF863-18E9-E567-5F8B-225D07C68E05}.sparse|Win32.Build.0 = sparse|Win32
    60                 {E15FF863-18E9-E567-5F8B-225D07C68E05}.sparse|x64.ActiveCfg = sparse|x64
    61                 {E15FF863-18E9-E567-5F8B-225D07C68E05}.sparse|x64.Build.0 = sparse|x64
     49                {43459339-26DA-B162-0783-4ED235513520}.nosparse|Win32.ActiveCfg = nosparse|Win32
     50                {43459339-26DA-B162-0783-4ED235513520}.nosparse|Win32.Build.0 = nosparse|Win32
     51                {43459339-26DA-B162-0783-4ED235513520}.nosparse|x64.ActiveCfg = nosparse|x64
     52                {43459339-26DA-B162-0783-4ED235513520}.nosparse|x64.Build.0 = nosparse|x64
     53                {43459339-26DA-B162-0783-4ED235513520}.sparse|Win32.ActiveCfg = sparse|Win32
     54                {43459339-26DA-B162-0783-4ED235513520}.sparse|Win32.Build.0 = sparse|Win32
     55                {43459339-26DA-B162-0783-4ED235513520}.sparse|x64.ActiveCfg = sparse|x64
     56                {43459339-26DA-B162-0783-4ED235513520}.sparse|x64.Build.0 = sparse|x64
     57                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.nosparse|Win32.ActiveCfg = sparse|Win32
     58                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.nosparse|Win32.Build.0 = sparse|Win32
     59                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.nosparse|x64.ActiveCfg = sparse|x64
     60                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.nosparse|x64.Build.0 = sparse|x64
     61                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.sparse|Win32.ActiveCfg = sparse|Win32
     62                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.sparse|Win32.Build.0 = sparse|Win32
     63                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.sparse|x64.ActiveCfg = sparse|x64
     64                {C960E4D8-CE08-FDD2-02FD-6394A67739EA}.sparse|x64.Build.0 = sparse|x64
    6265                {6CE9090C-04DC-7E4E-7467-F305FA21EF94}.nosparse|Win32.ActiveCfg = nosparse|Win32
    6366                {6CE9090C-04DC-7E4E-7467-F305FA21EF94}.nosparse|Win32.Build.0 = nosparse|Win32
  • stable/2.3/ADOL-C/examples/detexam.vcxproj

    r187 r307  
    136136      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
    137137    </ProjectReference>
     138    <ProjectReference Include="..\..\MSVisualStudio\v10\adolc.vcxproj">
     139      <Project>{43459339-26da-b162-0783-4ed235513520}</Project>
     140      <Private>true</Private>
     141      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     142      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
     143      <LinkLibraryDependencies>true</LinkLibraryDependencies>
     144      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     145    </ProjectReference>
    138146  </ItemGroup>
    139147  <ItemGroup>
  • stable/2.3/ADOL-C/examples/odexam.vcxproj

    r187 r307  
    149149      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
    150150    </ProjectReference>
     151    <ProjectReference Include="..\..\MSVisualStudio\v10\adolc.vcxproj">
     152      <Project>{43459339-26da-b162-0783-4ed235513520}</Project>
     153    </ProjectReference>
    151154  </ItemGroup>
    152155  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  • stable/2.3/ADOL-C/examples/powexam.vcxproj

    r187 r307  
    139139      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
    140140    </ProjectReference>
     141    <ProjectReference Include="..\..\MSVisualStudio\v10\adolc.vcxproj">
     142      <Project>{43459339-26da-b162-0783-4ed235513520}</Project>
     143    </ProjectReference>
    141144  </ItemGroup>
    142145  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  • stable/2.3/ADOL-C/examples/speelpenning.vcxproj

    r187 r307  
    139139      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
    140140    </ProjectReference>
     141    <ProjectReference Include="..\..\MSVisualStudio\v10\adolc.vcxproj">
     142      <Project>{43459339-26da-b162-0783-4ed235513520}</Project>
     143    </ProjectReference>
    141144  </ItemGroup>
    142145  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  • stable/2.3/ADOL-C/examples/tapeless_scalar.vcxproj

    r187 r307  
    139139      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
    140140    </ProjectReference>
     141    <ProjectReference Include="..\..\MSVisualStudio\v10\adolc.vcxproj">
     142      <Project>{43459339-26da-b162-0783-4ed235513520}</Project>
     143    </ProjectReference>
    141144  </ItemGroup>
    142145  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  • stable/2.3/ADOL-C/examples/tapeless_vector.vcxproj

    r187 r307  
    139139      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
    140140    </ProjectReference>
     141    <ProjectReference Include="..\..\MSVisualStudio\v10\adolc.vcxproj">
     142      <Project>{43459339-26da-b162-0783-4ed235513520}</Project>
     143    </ProjectReference>
    141144  </ItemGroup>
    142145  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  • stable/2.3/MSVisualStudio/v10/ColPack.vcxproj

    r296 r307  
    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" />
  • stable/2.3/MSVisualStudio/v10/ColPack_Readme_VC++.txt

    r296 r307  
    1 In order to compile the ColPack sources from the tarball with VC++ using
    2 the project file ColPack.vcxproj please apply the following patch:
    3 
    4 colpack_vcxcompile.patch
    5 
    61The complete steps are as follows
    72
    8 1. Go to directory ThirdParty/
     31. Unpack the ColPack sources
    94
    10 tar -xzf ColPack.tar.gz
     5tar -xzf ColPack-$VERSION.tar.gz
    116
    12 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
    1310
    14112. In Visual Studio open the solution file
    1512
    16 windows/adolc.sln
     13adolc.sln
    1714
    18 select the solution 'adolc' in the Solution Explorer, from the toolbar select
    19 the build configuration sparse and from Build menu select Build Solution
    20 (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).
    2121
    2222This will build ColPack and link it with the sparse version of adolc.dll
    23 
  • stable/2.3/MSVisualStudio/v10/Readme_VC++.txt

    r200 r307  
    1515     junction src adolc
    1616
    17 The solution file windows/adolc.sln can build both the sparse as well as
     17The solution file adolc.sln can build both the sparse as well as
    1818the nosparse versions of adolc.dll. In visual studio open this solution file
    1919and select the solution 'adolc' in the Solution Explorer, from the toolbar
     
    2222
    2323In order to build the nosparse version nothing further is needed. For the
    24 sparse version the source code of ColPack must be extracted into the
    25 ThirdParty/ directory. Read the Readme_VC++.txt file in ThirdParty/ColPack
    26 for further instructions.
     24sparse version the source code of ColPack must be extracted into
     25this directory. Read the ColPack Readme_VC++.txt file for further
     26instructions.
  • stable/2.3/MSVisualStudio/v10/adolc.sln

    r212 r307  
    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
  • stable/2.3/MSVisualStudio/v10/adolc.vcxproj

    r212 r307  
    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.