Changeset 1775


Ignore:
Timestamp:
May 17, 2012 11:34:55 AM (7 years ago)
Author:
tkr
Message:

Adding support for proprty sheets

Location:
trunk/Cbc/MSVisualStudio/v10
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/MSVisualStudio/v10/cbc/cbc.vcxproj

    r1697 r1775  
    2929    <CharacterSet>MultiByte</CharacterSet>
    3030    <WholeProgramOptimization>true</WholeProgramOptimization>
     31    <PlatformToolset>v90</PlatformToolset>
    3132  </PropertyGroup>
    3233  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     
    3435    <UseOfMfc>false</UseOfMfc>
    3536    <CharacterSet>MultiByte</CharacterSet>
     37    <PlatformToolset>v100</PlatformToolset>
    3638  </PropertyGroup>
    3739  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     
    4042    <CharacterSet>MultiByte</CharacterSet>
    4143    <WholeProgramOptimization>true</WholeProgramOptimization>
     44    <PlatformToolset>v100</PlatformToolset>
    4245  </PropertyGroup>
    4346  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     
    4548    <UseOfMfc>false</UseOfMfc>
    4649    <CharacterSet>MultiByte</CharacterSet>
     50    <PlatformToolset>v100</PlatformToolset>
    4751  </PropertyGroup>
    4852  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    5256    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5357    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     58    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     59    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
    5460  </ImportGroup>
    5561  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5662    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5763    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     64    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     65    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
    5866  </ImportGroup>
    5967  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    6068    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6169    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     70    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     71    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
    6272  </ImportGroup>
    6373  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6474    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6575    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     76    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     77    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
    6678  </ImportGroup>
    6779  <PropertyGroup Label="UserMacros" />
    6880  <PropertyGroup>
    6981    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    70     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    71     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    7282    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
    73     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    74     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    7583    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    76     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    77     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    7884    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
    79     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    80     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    8185    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    8286    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     
    100104    </Midl>
    101105    <ClCompile>
    102       <Optimization>Disabled</Optimization>
    103106      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    104107      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    105       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    106       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    107108      <RuntimeTypeInfo>true</RuntimeTypeInfo>
    108109      <PrecompiledHeader>
     
    140141    <ClCompile>
    141142      <Optimization>MaxSpeed</Optimization>
    142       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     143      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
    143144      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    144145      <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    145       <StringPooling>true</StringPooling>
    146       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    147146      <FunctionLevelLinking>true</FunctionLevelLinking>
    148147      <RuntimeTypeInfo>true</RuntimeTypeInfo>
     
    179178    </Midl>
    180179    <ClCompile>
    181       <Optimization>Disabled</Optimization>
    182180      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    183181      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    184       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    185       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    186182      <RuntimeTypeInfo>true</RuntimeTypeInfo>
    187183      <PrecompiledHeader>
     
    220216    <ClCompile>
    221217      <Optimization>MaxSpeed</Optimization>
    222       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     218      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
    223219      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    224220      <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    225       <StringPooling>true</StringPooling>
    226       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    227221      <FunctionLevelLinking>true</FunctionLevelLinking>
    228222      <RuntimeTypeInfo>true</RuntimeTypeInfo>
  • trunk/Cbc/MSVisualStudio/v10/libCbc/libCbc.vcxproj

    r1774 r1775  
    2828    <UseOfMfc>false</UseOfMfc>
    2929    <CharacterSet>MultiByte</CharacterSet>
     30    <PlatformToolset>v90</PlatformToolset>
    3031  </PropertyGroup>
    3132  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     
    3334    <UseOfMfc>false</UseOfMfc>
    3435    <CharacterSet>MultiByte</CharacterSet>
     36    <PlatformToolset>v100</PlatformToolset>
    3537  </PropertyGroup>
    3638  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     
    3840    <UseOfMfc>false</UseOfMfc>
    3941    <CharacterSet>MultiByte</CharacterSet>
     42    <PlatformToolset>v100</PlatformToolset>
    4043  </PropertyGroup>
    4144  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     
    4346    <UseOfMfc>false</UseOfMfc>
    4447    <CharacterSet>MultiByte</CharacterSet>
     48    <PlatformToolset>v100</PlatformToolset>
    4549  </PropertyGroup>
    4650  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    5054    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5155    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     56    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     57    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
    5258  </ImportGroup>
    5359  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5460    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5561    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     62    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     63    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
    5664  </ImportGroup>
    5765  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5866    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5967    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     68    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     69    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
    6070  </ImportGroup>
    6171  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6272    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6373    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     74    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     75    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
    6476  </ImportGroup>
    6577  <PropertyGroup Label="UserMacros" />
    6678  <PropertyGroup>
    6779    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    68     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    69     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    70     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    71     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    72     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    73     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    74     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    75     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    7680    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    7781    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     
    8993  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    9094    <ClCompile>
    91       <Optimization>Disabled</Optimization>
    9295      <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\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\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9396      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    9497      <MinimalRebuild>true</MinimalRebuild>
    9598      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    96       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    9799      <RuntimeTypeInfo>true</RuntimeTypeInfo>
    98100      <PrecompiledHeader>
     
    115117    <ClCompile>
    116118      <Optimization>MaxSpeed</Optimization>
    117       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    118119      <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\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\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    119120      <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    120121      <StringPooling>true</StringPooling>
    121       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    122122      <FunctionLevelLinking>true</FunctionLevelLinking>
    123123      <RuntimeTypeInfo>true</RuntimeTypeInfo>
     
    141141    </Midl>
    142142    <ClCompile>
    143       <Optimization>Disabled</Optimization>
    144143      <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\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\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    145144      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    146145      <MinimalRebuild>true</MinimalRebuild>
    147146      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    148       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    149147      <RuntimeTypeInfo>true</RuntimeTypeInfo>
    150148      <PrecompiledHeader>
     
    170168    <ClCompile>
    171169      <Optimization>MaxSpeed</Optimization>
    172       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     170      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
    173171      <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\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\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    174172      <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    175173      <StringPooling>true</StringPooling>
    176       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    177174      <FunctionLevelLinking>true</FunctionLevelLinking>
    178175      <RuntimeTypeInfo>true</RuntimeTypeInfo>
  • trunk/Cbc/MSVisualStudio/v10/libCbcSolver/libCbcSolver.vcxproj

    r1738 r1775  
    3030    <CLRSupport>false</CLRSupport>
    3131    <WholeProgramOptimization>false</WholeProgramOptimization>
     32    <PlatformToolset>v90</PlatformToolset>
    3233  </PropertyGroup>
    3334  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     
    3536    <CharacterSet>Unicode</CharacterSet>
    3637    <CLRSupport>false</CLRSupport>
     38    <PlatformToolset>v100</PlatformToolset>
    3739  </PropertyGroup>
    3840  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     
    4143    <CLRSupport>false</CLRSupport>
    4244    <WholeProgramOptimization>false</WholeProgramOptimization>
     45    <PlatformToolset>v100</PlatformToolset>
    4346  </PropertyGroup>
    4447  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     
    4649    <CharacterSet>Unicode</CharacterSet>
    4750    <CLRSupport>false</CLRSupport>
     51    <PlatformToolset>v100</PlatformToolset>
    4852  </PropertyGroup>
    4953  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    5256  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    5357    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     58    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     59    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
    5460  </ImportGroup>
    5561  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5662    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     63    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     64    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
    5765  </ImportGroup>
    5866  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5967    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     68    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     69    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
    6070  </ImportGroup>
    6171  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6272    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     73    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     74    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
    6375  </ImportGroup>
    6476  <PropertyGroup Label="UserMacros" />
    6577  <PropertyGroup>
    6678    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    67     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    68     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    69     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    70     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    71     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    72     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    73     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    74     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    7579    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    7680    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     
    8892  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    8993    <ClCompile>
    90       <Optimization>Disabled</Optimization>
    9194      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9295      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    93       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    9496      <PrecompiledHeader>
    9597      </PrecompiledHeader>
     
    102104      <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\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\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    103105      <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    104       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    105106      <PrecompiledHeader>
    106107      </PrecompiledHeader>
     
    114115    </Midl>
    115116    <ClCompile>
    116       <Optimization>Disabled</Optimization>
    117117      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    118118      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    119       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    120119      <PrecompiledHeader>
    121120      </PrecompiledHeader>
     
    131130      <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\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\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    132131      <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    133       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    134132      <PrecompiledHeader>
    135133      </PrecompiledHeader>
    136134      <WarningLevel>Level3</WarningLevel>
    137135      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     136      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
    138137    </ClCompile>
    139138  </ItemDefinitionGroup>
  • trunk/Cbc/MSVisualStudio/v10/libOsiCbc/libOsiCbc.vcxproj

    r1738 r1775  
    3030    <CLRSupport>false</CLRSupport>
    3131    <WholeProgramOptimization>false</WholeProgramOptimization>
     32    <PlatformToolset>v90</PlatformToolset>
    3233  </PropertyGroup>
    3334  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     
    3536    <CharacterSet>Unicode</CharacterSet>
    3637    <CLRSupport>false</CLRSupport>
     38    <PlatformToolset>v100</PlatformToolset>
    3739  </PropertyGroup>
    3840  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     
    4143    <CLRSupport>false</CLRSupport>
    4244    <WholeProgramOptimization>false</WholeProgramOptimization>
     45    <PlatformToolset>v100</PlatformToolset>
    4346  </PropertyGroup>
    4447  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     
    4649    <CharacterSet>Unicode</CharacterSet>
    4750    <CLRSupport>false</CLRSupport>
     51    <PlatformToolset>v100</PlatformToolset>
    4852  </PropertyGroup>
    4953  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    5256  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    5357    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     58    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     59    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
    5460  </ImportGroup>
    5561  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5662    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     63    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     64    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
    5765  </ImportGroup>
    5866  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5967    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     68    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     69    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
    6070  </ImportGroup>
    6171  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6272    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     73    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
     74    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
    6375  </ImportGroup>
    6476  <PropertyGroup Label="UserMacros" />
    6577  <PropertyGroup>
    6678    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    67     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    68     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    69     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    70     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    71     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    72     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    73     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    74     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    7579    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    7680    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     
    8892  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    8993    <ClCompile>
    90       <Optimization>Disabled</Optimization>
    9194      <AdditionalIncludeDirectories>..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9295      <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    93       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    9496      <PrecompiledHeader>
    9597      </PrecompiledHeader>
     
    102104      <AdditionalIncludeDirectories>..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    103105      <PreprocessorDefinitions>WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    104       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    105106      <PrecompiledHeader>
    106107      </PrecompiledHeader>
     
    114115    </Midl>
    115116    <ClCompile>
    116       <Optimization>Disabled</Optimization>
    117117      <AdditionalIncludeDirectories>..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    118118      <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    119       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    120119      <PrecompiledHeader>
    121120      </PrecompiledHeader>
     
    131130      <AdditionalIncludeDirectories>..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    132131      <PreprocessorDefinitions>WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    133       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    134132      <PrecompiledHeader>
    135133      </PrecompiledHeader>
    136134      <WarningLevel>Level3</WarningLevel>
    137135      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     136      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
    138137    </ClCompile>
    139138  </ItemDefinitionGroup>
Note: See TracChangeset for help on using the changeset viewer.