Changeset 1900


Ignore:
Timestamp:
Apr 7, 2013 11:43:05 AM (9 years ago)
Author:
tkr
Message:

Updates to MSVC++ v10 files

Location:
trunk/Osi/MSVisualStudio/v10
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Osi/MSVisualStudio/v10/libOsi/libOsi.vcxproj

    r1888 r1900  
    2828  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    2929    <ConfigurationType>StaticLibrary</ConfigurationType>
    30     <PlatformToolset>v90</PlatformToolset>
    3130  </PropertyGroup>
    3231  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     
    8786      <PrecompiledHeader>
    8887      </PrecompiledHeader>
    89       <WarningLevel>Level3</WarningLevel>
    90       <SuppressStartupBanner>true</SuppressStartupBanner>
    91       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    9288    </ClCompile>
    9389    <ResourceCompile>
  • trunk/Osi/MSVisualStudio/v10/libOsiCommonTest/libOsiCommonTest.vcxproj

    r1887 r1900  
    2626  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2727    <ConfigurationType>StaticLibrary</ConfigurationType>
    28     <CharacterSet>Unicode</CharacterSet>
    29     <CLRSupport>false</CLRSupport>
    3028    <WholeProgramOptimization>false</WholeProgramOptimization>
    3129  </PropertyGroup>
    3230  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3331    <ConfigurationType>StaticLibrary</ConfigurationType>
    34     <CharacterSet>Unicode</CharacterSet>
    35     <CLRSupport>false</CLRSupport>
    3632  </PropertyGroup>
    3733  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3834    <ConfigurationType>StaticLibrary</ConfigurationType>
    39     <CharacterSet>Unicode</CharacterSet>
    40     <CLRSupport>false</CLRSupport>
    4135    <WholeProgramOptimization>false</WholeProgramOptimization>
    4236  </PropertyGroup>
    4337  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    4438    <ConfigurationType>StaticLibrary</ConfigurationType>
    45     <CharacterSet>Unicode</CharacterSet>
    46     <CLRSupport>false</CLRSupport>
    4739  </PropertyGroup>
    4840  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    5143  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    5244    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     45    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
     46    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5347  </ImportGroup>
    5448  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5549    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     50    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
     51    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5652  </ImportGroup>
    5753  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5854    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     55    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
     56    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5957  </ImportGroup>
    6058  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6159    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     60    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
     61    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    6262  </ImportGroup>
    6363  <PropertyGroup Label="UserMacros" />
    6464  <PropertyGroup>
    6565    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    66     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    67     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    68     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    69     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(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)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    73     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    7466    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    7567    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     
    8779  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    8880    <ClCompile>
    89       <Optimization>Disabled</Optimization>
    9081      <AdditionalIncludeDirectories>..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Osi\src\Osi;..\..\..\..\Osi\src\OsiCommonTest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9182      <PreprocessorDefinitions>OSI_BUILD;WIN32;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     
    10596    </Midl>
    10697    <ClCompile>
    107       <Optimization>Disabled</Optimization>
    10898      <AdditionalIncludeDirectories>..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Osi\src\Osi;..\..\..\..\Osi\src\OsiCommonTest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    10999      <PreprocessorDefinitions>OSI_BUILD;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Note: See TracChangeset for help on using the changeset viewer.