Ignore:
Timestamp:
Apr 10, 2013 12:58:16 PM (6 years ago)
Author:
stefan
Message:

sync with trunk rev 1901

Location:
stable/2.8/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc

  • stable/2.8/Cbc/MSVisualStudio/v10/cbcCInterfaceDll/cbcCInterfaceDll.vcxproj

    r1873 r1902  
    2727  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2828    <ConfigurationType>DynamicLibrary</ConfigurationType>
    29     <CharacterSet>MultiByte</CharacterSet>
    3029  </PropertyGroup>
    3130  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3231    <ConfigurationType>DynamicLibrary</ConfigurationType>
    33     <CharacterSet>MultiByte</CharacterSet>
    3432  </PropertyGroup>
    3533  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3634    <ConfigurationType>DynamicLibrary</ConfigurationType>
    37     <CharacterSet>MultiByte</CharacterSet>
    3835  </PropertyGroup>
    3936  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    4037    <ConfigurationType>DynamicLibrary</ConfigurationType>
    41     <CharacterSet>MultiByte</CharacterSet>
    4238  </PropertyGroup>
    4339  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    4743    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    4844    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     45    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
     46    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    4947  </ImportGroup>
    5048  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5149    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5250    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     51    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
     52    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5353  </ImportGroup>
    5454  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5555    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5656    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     57    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
     58    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5759  </ImportGroup>
    5860  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    5961    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6062    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     63    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
     64    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    6165  </ImportGroup>
    6266  <PropertyGroup Label="UserMacros" />
    6367  <PropertyGroup>
    6468    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    65     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    66     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    6769    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    68     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    69     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    7070    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    71     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    72     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    7371    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    74     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    75     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    7672    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    7773    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
Note: See TracChangeset for help on using the changeset viewer.