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

Adding support for proprty sheets

File:
1 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>
Note: See TracChangeset for help on using the changeset viewer.