Changeset 1873 for stable/2.8/Cbc
- Timestamp:
- Feb 13, 2013 12:45:47 PM (8 years ago)
- Location:
- stable/2.8/Cbc
- Files:
-
- 7 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
stable/2.8/Cbc
- Property svn:mergeinfo changed
/trunk/Cbc (added) merged: 1857,1859-1860,1862-1864,1866-1869,1871
- Property svn:mergeinfo changed
-
stable/2.8/Cbc/MSVisualStudio/v10/cbc/cbc.vcxproj
r1777 r1873 30 30 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 31 31 <ConfigurationType>Application</ConfigurationType> 32 <PlatformToolset>v 100</PlatformToolset>32 <PlatformToolset>v90</PlatformToolset> 33 33 </PropertyGroup> 34 34 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 35 35 <ConfigurationType>Application</ConfigurationType> 36 <PlatformToolset>v100</PlatformToolset>37 36 </PropertyGroup> 38 37 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> … … 96 95 <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 97 96 <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 98 <RuntimeTypeInfo>true</RuntimeTypeInfo>99 97 <PrecompiledHeader> 100 98 </PrecompiledHeader> … … 130 128 </Midl> 131 129 <ClCompile> 132 <Optimization>MaxSpeed</Optimization>133 <InlineFunctionExpansion>Default</InlineFunctionExpansion>134 130 <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 135 131 <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 136 132 <FunctionLevelLinking>true</FunctionLevelLinking> 137 <RuntimeTypeInfo>true</RuntimeTypeInfo> 138 <PrecompiledHeader> 139 </PrecompiledHeader> 140 <WarningLevel>Level3</WarningLevel> 141 <SuppressStartupBanner>true</SuppressStartupBanner> 133 <PrecompiledHeader> 134 </PrecompiledHeader> 142 135 <CompileAs>Default</CompileAs> 143 136 </ClCompile> … … 170 163 <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 171 164 <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 172 <RuntimeTypeInfo>true</RuntimeTypeInfo>173 165 <PrecompiledHeader> 174 166 </PrecompiledHeader> … … 205 197 </Midl> 206 198 <ClCompile> 207 <Optimization>MaxSpeed</Optimization>208 <InlineFunctionExpansion>Default</InlineFunctionExpansion>209 199 <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 210 200 <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 211 <FunctionLevelLinking>true</FunctionLevelLinking> 212 <RuntimeTypeInfo>true</RuntimeTypeInfo> 213 <PrecompiledHeader> 214 </PrecompiledHeader> 215 <WarningLevel>Level3</WarningLevel> 216 <SuppressStartupBanner>true</SuppressStartupBanner> 217 <CompileAs>Default</CompileAs> 201 <PrecompiledHeader> 202 </PrecompiledHeader> 218 203 </ClCompile> 219 204 <ResourceCompile> -
stable/2.8/Cbc/MSVisualStudio/v10/libCbc/libCbc.vcxproj
r1777 r1873 30 30 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 31 31 <ConfigurationType>StaticLibrary</ConfigurationType> 32 <PlatformToolset>v 100</PlatformToolset>32 <PlatformToolset>v90</PlatformToolset> 33 33 </PropertyGroup> 34 34 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 35 35 <ConfigurationType>StaticLibrary</ConfigurationType> 36 <PlatformToolset>v100</PlatformToolset>37 36 </PropertyGroup> 38 37 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> … … 89 88 <MinimalRebuild>true</MinimalRebuild> 90 89 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> 91 <RuntimeTypeInfo>true</RuntimeTypeInfo>92 90 <PrecompiledHeader> 93 91 </PrecompiledHeader> 94 <WarningLevel>Level3</WarningLevel>95 <SuppressStartupBanner>true</SuppressStartupBanner>96 92 <DebugInformationFormat>EditAndContinue</DebugInformationFormat> 97 <CompileAs>Default</CompileAs>98 93 <ShowIncludes>false</ShowIncludes> 99 94 </ClCompile> … … 108 103 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 109 104 <ClCompile> 110 <Optimization>MaxSpeed</Optimization>111 105 <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 112 106 <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 113 107 <StringPooling>true</StringPooling> 114 108 <FunctionLevelLinking>true</FunctionLevelLinking> 115 <RuntimeTypeInfo>true</RuntimeTypeInfo>116 109 <PrecompiledHeader> 117 110 </PrecompiledHeader> 118 <WarningLevel>Level3</WarningLevel>119 <SuppressStartupBanner>true</SuppressStartupBanner>120 <CompileAs>Default</CompileAs>121 111 </ClCompile> 122 112 <ResourceCompile> … … 137 127 <MinimalRebuild>true</MinimalRebuild> 138 128 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> 139 <RuntimeTypeInfo>true</RuntimeTypeInfo>140 129 <PrecompiledHeader> 141 130 </PrecompiledHeader> 142 <WarningLevel>Level3</WarningLevel>143 <SuppressStartupBanner>true</SuppressStartupBanner>144 131 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 145 <CompileAs>Default</CompileAs>146 132 <ShowIncludes>false</ShowIncludes> 147 133 </ClCompile> … … 159 145 </Midl> 160 146 <ClCompile> 161 <Optimization>MaxSpeed</Optimization>162 147 <InlineFunctionExpansion>Default</InlineFunctionExpansion> 163 148 <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 164 149 <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 165 <StringPooling>true</StringPooling>166 <FunctionLevelLinking>true</FunctionLevelLinking>167 <RuntimeTypeInfo>true</RuntimeTypeInfo>168 150 <PrecompiledHeader> 169 151 </PrecompiledHeader> 170 <WarningLevel>Level3</WarningLevel>171 <SuppressStartupBanner>true</SuppressStartupBanner>172 <CompileAs>Default</CompileAs>173 152 </ClCompile> 174 153 <ResourceCompile> -
stable/2.8/Cbc/MSVisualStudio/v10/libCbcSolver/libCbcSolver.vcxproj
r1777 r1873 31 31 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 32 32 <ConfigurationType>StaticLibrary</ConfigurationType> 33 <PlatformToolset>v 100</PlatformToolset>33 <PlatformToolset>v90</PlatformToolset> 34 34 </PropertyGroup> 35 35 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 36 36 <ConfigurationType>StaticLibrary</ConfigurationType> 37 <PlatformToolset>v100</PlatformToolset>38 37 </PropertyGroup> 39 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> … … 82 81 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 83 82 <ClCompile> 84 <AdditionalIncludeDirectories>..\..\..\src ;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>83 <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 85 84 <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 86 85 <PrecompiledHeader> … … 92 91 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 93 92 <ClCompile> 94 <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\ Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>93 <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 95 94 <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 96 95 <PrecompiledHeader> … … 105 104 </Midl> 106 105 <ClCompile> 107 <AdditionalIncludeDirectories>..\..\..\src ;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>106 <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 108 107 <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 109 108 <PrecompiledHeader> … … 118 117 </Midl> 119 118 <ClCompile> 120 <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\ Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>119 <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 121 120 <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 122 121 <PrecompiledHeader> -
stable/2.8/Cbc/MSVisualStudio/v10/libOsiCbc/libOsiCbc.vcxproj
r1777 r1873 27 27 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 28 28 <ConfigurationType>StaticLibrary</ConfigurationType> 29 <PlatformToolset>v100</PlatformToolset>30 29 </PropertyGroup> 31 30 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 32 31 <ConfigurationType>StaticLibrary</ConfigurationType> 33 <PlatformToolset>v 100</PlatformToolset>32 <PlatformToolset>v90</PlatformToolset> 34 33 </PropertyGroup> 35 34 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 36 35 <ConfigurationType>StaticLibrary</ConfigurationType> 37 <PlatformToolset>v100</PlatformToolset>38 36 </PropertyGroup> 39 37 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 40 38 <ConfigurationType>StaticLibrary</ConfigurationType> 41 <PlatformToolset>v100</PlatformToolset>42 39 </PropertyGroup> 43 40 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
stable/2.8/Cbc/src/CbcModel.cpp
r1845 r1873 7351 7351 if (thisCut->violated(cbcColSolution_) > primalTolerance || 7352 7352 thisCut->effectiveness() == COIN_DBL_MAX) { 7353 #if ndef NDEBUG7353 #if 0 //ndef NDEBUG 7354 7354 printf("Global cut added - violation %g\n", 7355 7355 thisCut->violated(cbcColSolution_)) ; -
stable/2.8/Cbc/src/Cbc_ampl.cpp
r1750 r1873 145 145 static Option_Info Oinfo = { 146 146 const_cast<char*>("cbc"), 147 const_cast<char*>("CBC trunk"),147 const_cast<char*>("CBC " CBC_VERSION), 148 148 const_cast<char*>("cbc_options"), 149 149 keywds, 150 150 nkeywds, 151 151 0, 152 const_cast<char*>(""),152 0, 153 153 0, 154 154 decodePhrase,
Note: See TracChangeset
for help on using the changeset viewer.