Changeset 1776


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:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp

  • trunk/Clp/MSVisualStudio/v10/Clp.sln

    r1704 r1776  
    88EndProject
    99Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clp", "clp\clp.vcxproj", "{0E9135A7-CB30-48D9-A83D-0F49EC3B601B}"
     10        ProjectSection(ProjectDependencies) = postProject
     11                {C4867F15-438D-4FF8-8388-62FBAAA9786C} = {C4867F15-438D-4FF8-8388-62FBAAA9786C}
     12                {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994} = {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}
     13        EndProjectSection
    1014EndProject
    1115Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libClp", "libClp\libClp.vcxproj", "{4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}"
     
    3034        GlobalSection(ProjectConfigurationPlatforms) = postSolution
    3135                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Debug|Win32.ActiveCfg = Debug|Win32
    32                 {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Debug|x64.ActiveCfg = Debug|Win32
     36                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Debug|Win32.Build.0 = Debug|Win32
     37                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Debug|x64.ActiveCfg = Debug|x64
     38                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Debug|x64.Build.0 = Debug|x64
    3339                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Release|Win32.ActiveCfg = Release|Win32
    34                 {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Release|x64.ActiveCfg = Release|Win32
     40                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Release|Win32.Build.0 = Release|Win32
     41                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Release|x64.ActiveCfg = Release|x64
     42                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Release|x64.Build.0 = Release|x64
    3543                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Debug|Win32.ActiveCfg = Debug|Win32
    36                 {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Debug|x64.ActiveCfg = Debug|Win32
     44                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Debug|Win32.Build.0 = Debug|Win32
     45                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Debug|x64.ActiveCfg = Debug|x64
     46                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Debug|x64.Build.0 = Debug|x64
    3747                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Release|Win32.ActiveCfg = Release|Win32
    38                 {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Release|x64.ActiveCfg = Release|Win32
     48                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Release|Win32.Build.0 = Release|Win32
     49                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Release|x64.ActiveCfg = Release|x64
     50                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Release|x64.Build.0 = Release|x64
    3951                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Debug|Win32.ActiveCfg = Debug|Win32
    40                 {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Debug|x64.ActiveCfg = Debug|Win32
     52                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Debug|Win32.Build.0 = Debug|Win32
     53                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Debug|x64.ActiveCfg = Debug|x64
     54                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Debug|x64.Build.0 = Debug|x64
    4155                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Release|Win32.ActiveCfg = Release|Win32
    42                 {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Release|x64.ActiveCfg = Release|Win32
     56                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Release|Win32.Build.0 = Release|Win32
     57                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Release|x64.ActiveCfg = Release|x64
     58                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Release|x64.Build.0 = Release|x64
    4359                {0E9135A7-CB30-48D9-A83D-0F49EC3B601B}.Debug|Win32.ActiveCfg = Debug|Win32
    4460                {0E9135A7-CB30-48D9-A83D-0F49EC3B601B}.Debug|Win32.Build.0 = Debug|Win32
  • 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>
  • 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>
  • trunk/Clp/MSVisualStudio/v10/ClpExamplesTestQP/ClpExamplesTestQP.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/ClpExamplesTestQP.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/ClpExamplesTestQP.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/ClpExamplesTestQP.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/ClpExamplesTestQP.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/ClpExamplesTestQP.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/ClpExamplesTestQP.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\testQP.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>
  • trunk/Clp/src

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.