Changeset 1812 for stable


Ignore:
Timestamp:
Nov 21, 2012 1:48:55 PM (6 years ago)
Author:
stefan
Message:

reverse merge 1777:1774 from trunk: property sheets are not for this stable

Location:
stable/2.8/Cbc/MSVisualStudio/v10
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc/MSVisualStudio/v10/cbc/cbc.vcxproj

    r1777 r1812  
    2626  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2727    <ConfigurationType>Application</ConfigurationType>
    28     <PlatformToolset>v100</PlatformToolset>
     28    <UseOfMfc>false</UseOfMfc>
     29    <CharacterSet>MultiByte</CharacterSet>
     30    <WholeProgramOptimization>true</WholeProgramOptimization>
    2931  </PropertyGroup>
    3032  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3133    <ConfigurationType>Application</ConfigurationType>
    32     <PlatformToolset>v100</PlatformToolset>
     34    <UseOfMfc>false</UseOfMfc>
     35    <CharacterSet>MultiByte</CharacterSet>
    3336  </PropertyGroup>
    3437  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3538    <ConfigurationType>Application</ConfigurationType>
    36     <PlatformToolset>v100</PlatformToolset>
     39    <UseOfMfc>false</UseOfMfc>
     40    <CharacterSet>MultiByte</CharacterSet>
     41    <WholeProgramOptimization>true</WholeProgramOptimization>
    3742  </PropertyGroup>
    3843  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    3944    <ConfigurationType>Application</ConfigurationType>
    40     <PlatformToolset>v100</PlatformToolset>
     45    <UseOfMfc>false</UseOfMfc>
     46    <CharacterSet>MultiByte</CharacterSet>
    4147  </PropertyGroup>
    4248  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    4652    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    4753    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
    48     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    49     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
    5054  </ImportGroup>
    5155  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    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" />
    54     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    55     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
    5658  </ImportGroup>
    5759  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5860    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5961    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
    60     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    61     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
    6262  </ImportGroup>
    6363  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6464    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6565    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
    66     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    67     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
    6866  </ImportGroup>
    6967  <PropertyGroup Label="UserMacros" />
    7068  <PropertyGroup>
    7169    <_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>
    7272    <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>
    7375    <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>
    7478    <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>
    7581    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    7682    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     
    94100    </Midl>
    95101    <ClCompile>
     102      <Optimization>Disabled</Optimization>
    96103      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    97104      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     105      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     106      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    98107      <RuntimeTypeInfo>true</RuntimeTypeInfo>
    99108      <PrecompiledHeader>
     
    131140    <ClCompile>
    132141      <Optimization>MaxSpeed</Optimization>
    133       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
     142      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    134143      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    135144      <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>
    136147      <FunctionLevelLinking>true</FunctionLevelLinking>
    137148      <RuntimeTypeInfo>true</RuntimeTypeInfo>
     
    168179    </Midl>
    169180    <ClCompile>
     181      <Optimization>Disabled</Optimization>
    170182      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    171183      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     184      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     185      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    172186      <RuntimeTypeInfo>true</RuntimeTypeInfo>
    173187      <PrecompiledHeader>
     
    206220    <ClCompile>
    207221      <Optimization>MaxSpeed</Optimization>
    208       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
     222      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    209223      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    210224      <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>
    211227      <FunctionLevelLinking>true</FunctionLevelLinking>
    212228      <RuntimeTypeInfo>true</RuntimeTypeInfo>
  • stable/2.8/Cbc/MSVisualStudio/v10/libCbc/libCbc.vcxproj

    r1777 r1812  
    2626  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2727    <ConfigurationType>StaticLibrary</ConfigurationType>
    28     <PlatformToolset>v100</PlatformToolset>
     28    <UseOfMfc>false</UseOfMfc>
     29    <CharacterSet>MultiByte</CharacterSet>
    2930  </PropertyGroup>
    3031  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3132    <ConfigurationType>StaticLibrary</ConfigurationType>
    32     <PlatformToolset>v100</PlatformToolset>
     33    <UseOfMfc>false</UseOfMfc>
     34    <CharacterSet>MultiByte</CharacterSet>
    3335  </PropertyGroup>
    3436  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3537    <ConfigurationType>StaticLibrary</ConfigurationType>
    36     <PlatformToolset>v100</PlatformToolset>
     38    <UseOfMfc>false</UseOfMfc>
     39    <CharacterSet>MultiByte</CharacterSet>
    3740  </PropertyGroup>
    3841  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    3942    <ConfigurationType>StaticLibrary</ConfigurationType>
    40     <PlatformToolset>v100</PlatformToolset>
     43    <UseOfMfc>false</UseOfMfc>
     44    <CharacterSet>MultiByte</CharacterSet>
    4145  </PropertyGroup>
    4246  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    4650    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    4751    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
    48     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    49     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
    5052  </ImportGroup>
    5153  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5254    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5355    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
    54     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    55     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
    5656  </ImportGroup>
    5757  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5858    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5959    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
    60     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    61     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
    6260  </ImportGroup>
    6361  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6462    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6563    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
    66     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    67     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
    6864  </ImportGroup>
    6965  <PropertyGroup Label="UserMacros" />
    7066  <PropertyGroup>
    7167    <_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>
    7276    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    7377    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     
    8589  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    8690    <ClCompile>
     91      <Optimization>Disabled</Optimization>
    8792      <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>
    8893      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8994      <MinimalRebuild>true</MinimalRebuild>
    9095      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     96      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    9197      <RuntimeTypeInfo>true</RuntimeTypeInfo>
    9298      <PrecompiledHeader>
     
    109115    <ClCompile>
    110116      <Optimization>MaxSpeed</Optimization>
     117      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    111118      <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>
    112119      <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>
    113120      <StringPooling>true</StringPooling>
     121      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    114122      <FunctionLevelLinking>true</FunctionLevelLinking>
    115123      <RuntimeTypeInfo>true</RuntimeTypeInfo>
     
    133141    </Midl>
    134142    <ClCompile>
     143      <Optimization>Disabled</Optimization>
    135144      <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>
    136145      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    137146      <MinimalRebuild>true</MinimalRebuild>
    138147      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     148      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    139149      <RuntimeTypeInfo>true</RuntimeTypeInfo>
    140150      <PrecompiledHeader>
     
    160170    <ClCompile>
    161171      <Optimization>MaxSpeed</Optimization>
    162       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
     172      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    163173      <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>
    164174      <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>
    165175      <StringPooling>true</StringPooling>
     176      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    166177      <FunctionLevelLinking>true</FunctionLevelLinking>
    167178      <RuntimeTypeInfo>true</RuntimeTypeInfo>
  • stable/2.8/Cbc/MSVisualStudio/v10/libCbcSolver/libCbcSolver.vcxproj

    r1777 r1812  
    2727  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2828    <ConfigurationType>StaticLibrary</ConfigurationType>
    29     <PlatformToolset>v100</PlatformToolset>
     29    <CharacterSet>MultiByte</CharacterSet>
     30    <CLRSupport>false</CLRSupport>
     31    <WholeProgramOptimization>false</WholeProgramOptimization>
    3032  </PropertyGroup>
    3133  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3234    <ConfigurationType>StaticLibrary</ConfigurationType>
    33     <PlatformToolset>v100</PlatformToolset>
     35    <CharacterSet>Unicode</CharacterSet>
     36    <CLRSupport>false</CLRSupport>
    3437  </PropertyGroup>
    3538  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3639    <ConfigurationType>StaticLibrary</ConfigurationType>
    37     <PlatformToolset>v100</PlatformToolset>
     40    <CharacterSet>MultiByte</CharacterSet>
     41    <CLRSupport>false</CLRSupport>
     42    <WholeProgramOptimization>false</WholeProgramOptimization>
    3843  </PropertyGroup>
    3944  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    4045    <ConfigurationType>StaticLibrary</ConfigurationType>
    41     <PlatformToolset>v100</PlatformToolset>
     46    <CharacterSet>Unicode</CharacterSet>
     47    <CLRSupport>false</CLRSupport>
    4248  </PropertyGroup>
    4349  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    4652  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    4753    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    48     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    49     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
    5054  </ImportGroup>
    5155  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5256    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    53     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    54     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
    5557  </ImportGroup>
    5658  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5759    <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" />
    6060  </ImportGroup>
    6161  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6262    <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" />
    6563  </ImportGroup>
    6664  <PropertyGroup Label="UserMacros" />
    6765  <PropertyGroup>
    6866    <_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>
    6975    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    7076    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     
    8288  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    8389    <ClCompile>
     90      <Optimization>Disabled</Optimization>
    8491      <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>
    8592      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     93      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    8694      <PrecompiledHeader>
    8795      </PrecompiledHeader>
     
    94102      <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>
    95103      <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>
    96105      <PrecompiledHeader>
    97106      </PrecompiledHeader>
     
    105114    </Midl>
    106115    <ClCompile>
     116      <Optimization>Disabled</Optimization>
    107117      <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>
    108118      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     119      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    109120      <PrecompiledHeader>
    110121      </PrecompiledHeader>
     
    120131      <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>
    121132      <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>
    122134      <PrecompiledHeader>
    123135      </PrecompiledHeader>
    124136      <WarningLevel>Level3</WarningLevel>
    125137      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    126       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
    127138    </ClCompile>
    128139  </ItemDefinitionGroup>
  • stable/2.8/Cbc/MSVisualStudio/v10/libOsiCbc/libOsiCbc.vcxproj

    r1777 r1812  
    2727  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2828    <ConfigurationType>StaticLibrary</ConfigurationType>
    29     <PlatformToolset>v100</PlatformToolset>
     29    <CharacterSet>MultiByte</CharacterSet>
     30    <CLRSupport>false</CLRSupport>
     31    <WholeProgramOptimization>false</WholeProgramOptimization>
    3032  </PropertyGroup>
    3133  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3234    <ConfigurationType>StaticLibrary</ConfigurationType>
    33     <PlatformToolset>v100</PlatformToolset>
     35    <CharacterSet>Unicode</CharacterSet>
     36    <CLRSupport>false</CLRSupport>
    3437  </PropertyGroup>
    3538  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3639    <ConfigurationType>StaticLibrary</ConfigurationType>
    37     <PlatformToolset>v100</PlatformToolset>
     40    <CharacterSet>MultiByte</CharacterSet>
     41    <CLRSupport>false</CLRSupport>
     42    <WholeProgramOptimization>false</WholeProgramOptimization>
    3843  </PropertyGroup>
    3944  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    4045    <ConfigurationType>StaticLibrary</ConfigurationType>
    41     <PlatformToolset>v100</PlatformToolset>
     46    <CharacterSet>Unicode</CharacterSet>
     47    <CLRSupport>false</CLRSupport>
    4248  </PropertyGroup>
    4349  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    4652  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    4753    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    48     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    49     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
    5054  </ImportGroup>
    5155  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5256    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    53     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    54     <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
    5557  </ImportGroup>
    5658  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5759    <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" />
    6060  </ImportGroup>
    6161  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6262    <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" />
    6563  </ImportGroup>
    6664  <PropertyGroup Label="UserMacros" />
    6765  <PropertyGroup>
    6866    <_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>
    6975    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    7076    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     
    8288  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    8389    <ClCompile>
     90      <Optimization>Disabled</Optimization>
    8491      <AdditionalIncludeDirectories>..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8592      <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     93      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    8694      <PrecompiledHeader>
    8795      </PrecompiledHeader>
     
    94102      <AdditionalIncludeDirectories>..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    95103      <PreprocessorDefinitions>WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     104      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    96105      <PrecompiledHeader>
    97106      </PrecompiledHeader>
     
    105114    </Midl>
    106115    <ClCompile>
     116      <Optimization>Disabled</Optimization>
    107117      <AdditionalIncludeDirectories>..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    108118      <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     119      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    109120      <PrecompiledHeader>
    110121      </PrecompiledHeader>
     
    120131      <AdditionalIncludeDirectories>..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    121132      <PreprocessorDefinitions>WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     133      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    122134      <PrecompiledHeader>
    123135      </PrecompiledHeader>
    124136      <WarningLevel>Level3</WarningLevel>
    125137      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    126       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
    127138    </ClCompile>
    128139  </ItemDefinitionGroup>
Note: See TracChangeset for help on using the changeset viewer.