Ignore:
Timestamp:
Aug 2, 2011 1:00:21 PM (8 years ago)
Author:
tkr
Message:

Merging r1775 from stable/1.14

Location:
trunk/Clp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp

  • trunk/Clp/MSVisualStudio/v10/ClpExamplesTestBarrier/ClpExamplesTestBarrier.vcxproj

    r1704 r1776  
    66      <Platform>Win32</Platform>
    77    </ProjectConfiguration>
     8    <ProjectConfiguration Include="Debug|x64">
     9      <Configuration>Debug</Configuration>
     10      <Platform>x64</Platform>
     11    </ProjectConfiguration>
    812    <ProjectConfiguration Include="Release|Win32">
    913      <Configuration>Release</Configuration>
    1014      <Platform>Win32</Platform>
     15    </ProjectConfiguration>
     16    <ProjectConfiguration Include="Release|x64">
     17      <Configuration>Release</Configuration>
     18      <Platform>x64</Platform>
    1119    </ProjectConfiguration>
    1220  </ItemGroup>
     
    2129    <CharacterSet>MultiByte</CharacterSet>
    2230  </PropertyGroup>
     31  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     32    <ConfigurationType>Application</ConfigurationType>
     33    <UseOfMfc>false</UseOfMfc>
     34    <CharacterSet>MultiByte</CharacterSet>
     35  </PropertyGroup>
    2336  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2437    <ConfigurationType>Application</ConfigurationType>
     
    2639    <CharacterSet>MultiByte</CharacterSet>
    2740  </PropertyGroup>
     41  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     42    <ConfigurationType>Application</ConfigurationType>
     43    <UseOfMfc>false</UseOfMfc>
     44    <CharacterSet>MultiByte</CharacterSet>
     45  </PropertyGroup>
    2846  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    2947  <ImportGroup Label="ExtensionSettings">
     
    3351    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
    3452  </ImportGroup>
     53  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     54    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     55    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     56  </ImportGroup>
    3557  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    3658    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    3759    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
    3860  </ImportGroup>
     61  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     62    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     63    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     64  </ImportGroup>
    3965  <PropertyGroup Label="UserMacros" />
    4066  <PropertyGroup>
    4167    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    42     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    43     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
     68    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     69    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     70    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     71    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    4472    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    45     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    46     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
     73    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     74    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     75    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     76    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     77    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    4778    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
     79    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
    4880    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     81    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
    4982    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     83    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
    5084    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     85    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
    5186    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     87    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
    5288    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
     89    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    5390    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
     91    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    5492  </PropertyGroup>
    5593  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     
    70108      <PrecompiledHeader>
    71109      </PrecompiledHeader>
    72       <PrecompiledHeaderOutputFile>.\Release/ClpExamplesTestBarrier.pch</PrecompiledHeaderOutputFile>
    73       <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
    74       <ObjectFileName>.\Release/</ObjectFileName>
    75       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
     110      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
     111      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     112      <ObjectFileName>$(IntDir)</ObjectFileName>
     113      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    76114      <WarningLevel>Level3</WarningLevel>
    77115      <SuppressStartupBanner>true</SuppressStartupBanner>
     
    91129      </DataExecutionPrevention>
    92130      <TargetMachine>MachineX86</TargetMachine>
    93       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     131      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     132      <AdditionalDependencies>libCoinUtils.lib;libClp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     133    </Link>
     134    <ProjectReference>
     135      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     136    </ProjectReference>
     137  </ItemDefinitionGroup>
     138  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     139    <Midl>
     140      <TypeLibraryName>.\Release/ClpExamplesTestBarrier.tlb</TypeLibraryName>
     141      <HeaderFileName>
     142      </HeaderFileName>
     143    </Midl>
     144    <ClCompile>
     145      <Optimization>MaxSpeed</Optimization>
     146      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     147      <AdditionalIncludeDirectories>..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     148      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample\\\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
     149      <StringPooling>true</StringPooling>
     150      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     151      <FunctionLevelLinking>true</FunctionLevelLinking>
     152      <RuntimeTypeInfo>true</RuntimeTypeInfo>
     153      <PrecompiledHeader>
     154      </PrecompiledHeader>
     155      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
     156      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     157      <ObjectFileName>$(IntDir)</ObjectFileName>
     158      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
     159      <WarningLevel>Level3</WarningLevel>
     160      <SuppressStartupBanner>true</SuppressStartupBanner>
     161      <CompileAs>Default</CompileAs>
     162    </ClCompile>
     163    <ResourceCompile>
     164      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     165      <Culture>0x0409</Culture>
     166    </ResourceCompile>
     167    <Link>
     168      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     169      <SuppressStartupBanner>true</SuppressStartupBanner>
     170      <ProgramDatabaseFile>.\Release/ClpExamplesTestBarrier.pdb</ProgramDatabaseFile>
     171      <SubSystem>Console</SubSystem>
     172      <RandomizedBaseAddress>false</RandomizedBaseAddress>
     173      <DataExecutionPrevention>
     174      </DataExecutionPrevention>
     175      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    94176      <AdditionalDependencies>libCoinUtils.lib;libClp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    95177    </Link>
     
    113195      <PrecompiledHeader>
    114196      </PrecompiledHeader>
    115       <PrecompiledHeaderOutputFile>.\Debug/ClpExamplesTestBarrier.pch</PrecompiledHeaderOutputFile>
    116       <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
    117       <ObjectFileName>.\Debug/</ObjectFileName>
    118       <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
     197      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
     198      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     199      <ObjectFileName>$(IntDir)</ObjectFileName>
     200      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    119201      <WarningLevel>Level3</WarningLevel>
    120202      <SuppressStartupBanner>true</SuppressStartupBanner>
     
    136218      </DataExecutionPrevention>
    137219      <TargetMachine>MachineX86</TargetMachine>
    138       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     220      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    139221      <AdditionalDependencies>libCoinUtils.lib;libClp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    140222    </Link>
     
    143225    </ProjectReference>
    144226  </ItemDefinitionGroup>
     227  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     228    <Midl>
     229      <TypeLibraryName>.\Debug/ClpExamplesTestBarrier.tlb</TypeLibraryName>
     230      <HeaderFileName>
     231      </HeaderFileName>
     232    </Midl>
     233    <ClCompile>
     234      <Optimization>Disabled</Optimization>
     235      <AdditionalIncludeDirectories>..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     236      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample\\\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
     237      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     238      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     239      <RuntimeTypeInfo>true</RuntimeTypeInfo>
     240      <PrecompiledHeader>
     241      </PrecompiledHeader>
     242      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
     243      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     244      <ObjectFileName>$(IntDir)</ObjectFileName>
     245      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
     246      <WarningLevel>Level3</WarningLevel>
     247      <SuppressStartupBanner>true</SuppressStartupBanner>
     248      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     249      <CompileAs>Default</CompileAs>
     250    </ClCompile>
     251    <ResourceCompile>
     252      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     253      <Culture>0x0409</Culture>
     254    </ResourceCompile>
     255    <Link>
     256      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     257      <SuppressStartupBanner>true</SuppressStartupBanner>
     258      <GenerateDebugInformation>true</GenerateDebugInformation>
     259      <ProgramDatabaseFile>.\Debug/ClpExamplesTestBarrier.pdb</ProgramDatabaseFile>
     260      <SubSystem>Console</SubSystem>
     261      <RandomizedBaseAddress>false</RandomizedBaseAddress>
     262      <DataExecutionPrevention>
     263      </DataExecutionPrevention>
     264      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     265      <AdditionalDependencies>libCoinUtils.lib;libClp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     266    </Link>
     267    <ProjectReference>
     268      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     269    </ProjectReference>
     270  </ItemDefinitionGroup>
    145271  <ItemGroup>
    146272    <ClCompile Include="..\..\..\examples\testBarrier.cpp">
    147273      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
     274      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
    148275      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     276      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    149277      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     278      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
    150279      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
     280      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
    151281      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
     282      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
    152283      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     284      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    153285      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     286      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
    154287    </ClCompile>
    155288  </ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.