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/ClpExamplesMinimum/ClpExamplesMinimum.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>
     
    2028    <CharacterSet>MultiByte</CharacterSet>
    2129  </PropertyGroup>
     30  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     31    <ConfigurationType>Application</ConfigurationType>
     32    <UseOfMfc>false</UseOfMfc>
     33    <CharacterSet>MultiByte</CharacterSet>
     34  </PropertyGroup>
    2235  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    2336    <ConfigurationType>Application</ConfigurationType>
     
    2538    <CharacterSet>MultiByte</CharacterSet>
    2639  </PropertyGroup>
     40  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     41    <ConfigurationType>Application</ConfigurationType>
     42    <UseOfMfc>false</UseOfMfc>
     43    <CharacterSet>MultiByte</CharacterSet>
     44  </PropertyGroup>
    2745  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    2846  <ImportGroup Label="ExtensionSettings">
     
    3250    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
    3351  </ImportGroup>
     52  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     53    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     54    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     55  </ImportGroup>
    3456  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    3557    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    3658    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
    3759  </ImportGroup>
     60  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     61    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     62    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     63  </ImportGroup>
    3864  <PropertyGroup Label="UserMacros" />
    3965  <PropertyGroup>
    4066    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    41     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    42     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
     67    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     68    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     69    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     70    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    4371    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
    44     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    45     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
     72    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
     73    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     74    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     75    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     76    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    4677    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     78    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    4779    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     80    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
    4881    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     82    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
    4983    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     84    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
    5085    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     86    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
    5187    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
     88    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    5289    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
     90    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    5391  </PropertyGroup>
    5492  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     
    67105      <PrecompiledHeader>
    68106      </PrecompiledHeader>
    69       <PrecompiledHeaderOutputFile>.\Debug/ClpExamplesMinimum.pch</PrecompiledHeaderOutputFile>
    70       <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
    71       <ObjectFileName>.\Debug/</ObjectFileName>
    72       <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
     107      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
     108      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     109      <ObjectFileName>$(IntDir)</ObjectFileName>
     110      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    73111      <WarningLevel>Level3</WarningLevel>
    74112      <SuppressStartupBanner>true</SuppressStartupBanner>
     
    90128      </DataExecutionPrevention>
    91129      <TargetMachine>MachineX86</TargetMachine>
    92       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     130      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     131      <AdditionalDependencies>libCoinUtils.lib;libClp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     132    </Link>
     133    <ProjectReference>
     134      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     135    </ProjectReference>
     136  </ItemDefinitionGroup>
     137  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     138    <Midl>
     139      <TypeLibraryName>.\Debug/ClpExamplesMinimum.tlb</TypeLibraryName>
     140      <HeaderFileName>
     141      </HeaderFileName>
     142    </Midl>
     143    <ClCompile>
     144      <Optimization>Disabled</Optimization>
     145      <AdditionalIncludeDirectories>..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     146      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample\\\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
     147      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     148      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     149      <RuntimeTypeInfo>true</RuntimeTypeInfo>
     150      <PrecompiledHeader>
     151      </PrecompiledHeader>
     152      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
     153      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     154      <ObjectFileName>$(IntDir)</ObjectFileName>
     155      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
     156      <WarningLevel>Level3</WarningLevel>
     157      <SuppressStartupBanner>true</SuppressStartupBanner>
     158      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     159      <CompileAs>Default</CompileAs>
     160    </ClCompile>
     161    <ResourceCompile>
     162      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     163      <Culture>0x0409</Culture>
     164    </ResourceCompile>
     165    <Link>
     166      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     167      <SuppressStartupBanner>true</SuppressStartupBanner>
     168      <GenerateDebugInformation>true</GenerateDebugInformation>
     169      <ProgramDatabaseFile>.\Debug/ClpExamplesMinimum.pdb</ProgramDatabaseFile>
     170      <SubSystem>Console</SubSystem>
     171      <RandomizedBaseAddress>false</RandomizedBaseAddress>
     172      <DataExecutionPrevention>
     173      </DataExecutionPrevention>
     174      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    93175      <AdditionalDependencies>libCoinUtils.lib;libClp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    94176    </Link>
     
    114196      <PrecompiledHeader>
    115197      </PrecompiledHeader>
    116       <PrecompiledHeaderOutputFile>.\Release/ClpExamplesMinimum.pch</PrecompiledHeaderOutputFile>
    117       <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
    118       <ObjectFileName>.\Release/</ObjectFileName>
    119       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
     198      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
     199      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     200      <ObjectFileName>$(IntDir)</ObjectFileName>
     201      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    120202      <WarningLevel>Level3</WarningLevel>
    121203      <SuppressStartupBanner>true</SuppressStartupBanner>
     
    135217      </DataExecutionPrevention>
    136218      <TargetMachine>MachineX86</TargetMachine>
    137       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     219      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    138220      <AdditionalDependencies>libCoinUtils.lib;libClp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    139221    </Link>
     
    142224    </ProjectReference>
    143225  </ItemDefinitionGroup>
     226  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     227    <Midl>
     228      <TypeLibraryName>.\Release/ClpExamplesMinimum.tlb</TypeLibraryName>
     229      <HeaderFileName>
     230      </HeaderFileName>
     231    </Midl>
     232    <ClCompile>
     233      <Optimization>MaxSpeed</Optimization>
     234      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     235      <AdditionalIncludeDirectories>..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     236      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample\\\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
     237      <StringPooling>true</StringPooling>
     238      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     239      <FunctionLevelLinking>true</FunctionLevelLinking>
     240      <RuntimeTypeInfo>true</RuntimeTypeInfo>
     241      <PrecompiledHeader>
     242      </PrecompiledHeader>
     243      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
     244      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     245      <ObjectFileName>$(IntDir)</ObjectFileName>
     246      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
     247      <WarningLevel>Level3</WarningLevel>
     248      <SuppressStartupBanner>true</SuppressStartupBanner>
     249      <CompileAs>Default</CompileAs>
     250    </ClCompile>
     251    <ResourceCompile>
     252      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     253      <Culture>0x0409</Culture>
     254    </ResourceCompile>
     255    <Link>
     256      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     257      <SuppressStartupBanner>true</SuppressStartupBanner>
     258      <ProgramDatabaseFile>.\Release/ClpExamplesMinimum.pdb</ProgramDatabaseFile>
     259      <SubSystem>Console</SubSystem>
     260      <RandomizedBaseAddress>false</RandomizedBaseAddress>
     261      <DataExecutionPrevention>
     262      </DataExecutionPrevention>
     263      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     264      <AdditionalDependencies>libCoinUtils.lib;libClp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     265    </Link>
     266    <ProjectReference>
     267      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     268    </ProjectReference>
     269  </ItemDefinitionGroup>
    144270  <ItemGroup>
    145271    <ClCompile Include="..\..\..\examples\minimum.cpp">
    146272      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
     273      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
    147274      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     275      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    148276      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     277      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
    149278      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
     279      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
    150280      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
     281      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
    151282      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     283      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    152284      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     285      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
    153286    </ClCompile>
    154287  </ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.