Changeset 1740


Ignore:
Timestamp:
Apr 28, 2013 11:06:38 PM (6 years ago)
Author:
tkr
Message:

Merging r1735:1738 from trunk

Location:
Alps/stable/1.4/Alps
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Alps/stable/1.4/Alps

  • Alps/stable/1.4/Alps/MSVisualStudio/v10/libAlps.vcxproj

    r1730 r1740  
    3131  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3232    <ConfigurationType>StaticLibrary</ConfigurationType>
     33    <PlatformToolset>v100</PlatformToolset>
    3334  </PropertyGroup>
    3435  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3536    <ConfigurationType>StaticLibrary</ConfigurationType>
    36     <PlatformToolset>v90</PlatformToolset>
    3737  </PropertyGroup>
    3838  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     
    7575      <AdditionalIncludeDirectories>..\..\..\BuildTools\headers;..\..\..\CoinUtils\src;..\..\..\Alps\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    7676      <PreprocessorDefinitions>ALPS_BUILD;WIN32;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    77       <MinimalRebuild>true</MinimalRebuild>
    78       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    7977      <PrecompiledHeader>
    8078      </PrecompiledHeader>
    81       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    8279      <DisableSpecificWarnings>4996;4065;%(DisableSpecificWarnings)</DisableSpecificWarnings>
    8380    </ClCompile>
     
    104101      <AdditionalIncludeDirectories>..\..\..\BuildTools\headers;..\..\..\CoinUtils\src;..\..\..\Osi\src;..\..\..\Osi\src\OsiCbc;..\..\..\Osi\src\OsiSpx;..\..\..\Osi\src\OsiVol;..\..\..\Osi\src\OsiOsl;..\..\..\Osi\src\OsiXpr;..\..\..\Osi\src\OsiCpx;..\..\..\Osi\src\OsiClp;..\..\..\Cgl\src;..\..\..\Cgl\src\CglTwomir;..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\Cgl\src\CglFlowCover;..\..\..\Cgl\src\CglClique;..\..\..\Cgl\src\CglOddHole;..\..\..\Cgl\src\CglKnapsackCover;..\..\..\Cgl\src\CglGomory;..\..\..\Cgl\src\CglPreProcess;..\..\..\Cgl\src\CglProbing;..\..\..\Clp\src;..\..\..\Alps\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    105102      <PreprocessorDefinitions>ALPS_BUILD;WIN32;_SCL_SECURE_NO_WARNINGS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    106       <StringPooling>true</StringPooling>
    107103      <PrecompiledHeader>
    108104      </PrecompiledHeader>
Note: See TracChangeset for help on using the changeset viewer.